diff options
author | Bernard Normier <bernard@zeroc.com> | 2017-01-11 17:48:15 -0500 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2017-01-11 17:48:15 -0500 |
commit | 05485a47ea107737ada8b0941a7a066c6a075f40 (patch) | |
tree | 8bf8a5fee750b20a631f02f60e6db21788ecc14f /cpp/src/slice2confluence | |
parent | Moved UniquePtr to IceInternal (diff) | |
download | ice-05485a47ea107737ada8b0941a7a066c6a075f40.tar.bz2 ice-05485a47ea107737ada8b0941a7a066c6a075f40.tar.xz ice-05485a47ea107737ada8b0941a7a066c6a075f40.zip |
Replace NULL by ICE_NULLPTR
Diffstat (limited to 'cpp/src/slice2confluence')
-rw-r--r-- | cpp/src/slice2confluence/ConfluenceOutput.cpp | 4 | ||||
-rw-r--r-- | cpp/src/slice2confluence/Main.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/slice2confluence/ConfluenceOutput.cpp b/cpp/src/slice2confluence/ConfluenceOutput.cpp index cac2dc645e4..0c2135d869c 100644 --- a/cpp/src/slice2confluence/ConfluenceOutput.cpp +++ b/cpp/src/slice2confluence/ConfluenceOutput.cpp @@ -138,7 +138,7 @@ Confluence::ConfluenceOutput::escapeComment(string comment) // For each position of a found escape character while(pos != string::npos) { - pair<unsigned int,unsigned int> *region = NULL; + pair<unsigned int,unsigned int> *region = ICE_NULLPTR; // Is this pos in an escaped section? for(list<pair<unsigned int,unsigned int> >::iterator i = escaperLimits.begin(); i != escaperLimits.end(); @@ -151,7 +151,7 @@ Confluence::ConfluenceOutput::escapeComment(string comment) } } - if(region == NULL) + if(region == ICE_NULLPTR) { comment.replace(pos, c.size(), replacement); pos = comment.find(c, pos + replacement.size()); diff --git a/cpp/src/slice2confluence/Main.cpp b/cpp/src/slice2confluence/Main.cpp index 38a38ff8d87..8eeca1c303b 100644 --- a/cpp/src/slice2confluence/Main.cpp +++ b/cpp/src/slice2confluence/Main.cpp @@ -283,7 +283,7 @@ compile(const vector<string>& argv) if(preprocess) { char buf[4096]; - while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != NULL) + while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != ICE_NULLPTR) { if(fputs(buf, stdout) == EOF) { |