Skip to content

Commit

Permalink
Merge pull request sass#1660 from saper/nullptr
Browse files Browse the repository at this point in the history
Use NULL instead of 0 where it's ambiguous
  • Loading branch information
xzyfer committed Oct 28, 2015
2 parents 56b30d6 + fb79a20 commit 19a5921
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ namespace Sass {

// convert the extracted hex string to code point value
// ToDo: Maybe we could do this without creating a substring
uint32_t cp = strtol(s.substr (i + 1, len - 1).c_str(), 0, 16);
uint32_t cp = strtol(s.substr (i + 1, len - 1).c_str(), NULL, 16);

if (cp == 0) cp = 0xFFFD;

Expand Down Expand Up @@ -401,7 +401,7 @@ namespace Sass {

// convert the extracted hex string to code point value
// ToDo: Maybe we could do this without creating a substring
uint32_t cp = strtol(s.substr (i + 1, len - 1).c_str(), 0, 16);
uint32_t cp = strtol(s.substr (i + 1, len - 1).c_str(), NULL, 16);

if (s[i + len] == ' ') ++ len;

Expand Down

0 comments on commit 19a5921

Please sign in to comment.