From 05485a47ea107737ada8b0941a7a066c6a075f40 Mon Sep 17 00:00:00 2001
From: Bernard Normier <bernard@zeroc.com>
Date: Wed, 11 Jan 2017 17:48:15 -0500
Subject: Replace NULL by ICE_NULLPTR

---
 cpp/src/slice2confluence/ConfluenceOutput.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cpp/src/slice2confluence/ConfluenceOutput.cpp')

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());
-- 
cgit v1.2.3