Ignore:
Timestamp:
Feb 26, 2013, 2:43:45 PM (7 years ago)
Author:
sam
Message:

base: start removing occurrences of NULL on our long journey to nullptr.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/easymesh/easymesh-scanner.l

    r2410 r2506  
    111111
    112112#[0-9a-fA-F]{3} {
    113         uint32_t tmp = std::strtol(yytext + 1, NULL, 16);
     113        uint32_t tmp = std::strtol(yytext + 1, nullptr, 16);
    114114        yylval->u32val = 0x11000000u * (tmp >> 8)
    115115                       | 0x00110000u * ((tmp >> 4) & 0xf)
     
    118118        return token::COLOR; }
    119119#[0-9a-fA-F]{4} {
    120         uint32_t tmp = std::strtol(yytext + 1, NULL, 16);
     120        uint32_t tmp = std::strtol(yytext + 1, nullptr, 16);
    121121        yylval->u32val = 0x11000000u * (tmp >> 12)
    122122                       | 0x00110000u * ((tmp >> 8) & 0xf)
     
    126126#[0-9a-fA-F]{6} {
    127127        yylval->u32val = 0xffu
    128                        | 0x100u * (uint32_t)std::strtol(yytext + 1, NULL, 16);
     128                       | 0x100u * (uint32_t)std::strtol(yytext + 1, nullptr, 16);
    129129        return token::COLOR; }
    130130#[0-9a-fA-F]{8} {
    131         yylval->u32val = (uint32_t)std::strtol(yytext + 1, NULL, 16);
     131        yylval->u32val = (uint32_t)std::strtol(yytext + 1, nullptr, 16);
    132132        return token::COLOR; }
    133133[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)? {
Note: See TracChangeset for help on using the changeset viewer.