From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 23 Mar 2016 15:43:55 +0000 (+1300)
Subject: Fix build errors from nullptr
X-Git-Tag: SQUID_3_5_16~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49c71dfa46916d99fc69902bdf204f1c6d77af26;p=thirdparty%2Fsquid.git

Fix build errors from nullptr
---

diff --git a/src/HttpMsg.cc b/src/HttpMsg.cc
index 885055c29a..c8ec9dcd36 100644
--- a/src/HttpMsg.cc
+++ b/src/HttpMsg.cc
@@ -34,7 +34,7 @@ HttpMsg::putCc(const HttpHdrCc *otherCc)
     // get rid of the old CC, if any
     if (cache_control) {
         delete cache_control;
-        cache_control = nullptr;
+        cache_control = NULL;
         if (!otherCc)
             header.delById(HDR_CACHE_CONTROL);
         // else it will be deleted inside putCc() below
diff --git a/src/clients/FtpRelay.cc b/src/clients/FtpRelay.cc
index acd6061064..ed498b42bc 100644
--- a/src/clients/FtpRelay.cc
+++ b/src/clients/FtpRelay.cc
@@ -42,7 +42,7 @@ protected:
     void serverState(const Ftp::ServerState newState);
 
     /* Ftp::Client API */
-    virtual void failed(err_type error = ERR_NONE, int xerrno = 0, ErrorState *ftperr = nullptr);
+    virtual void failed(err_type error = ERR_NONE, int xerrno = 0, ErrorState *ftperr = NULL);
     virtual void dataChannelConnected(const CommConnectCbParams &io);
 
     /* Client API */
diff --git a/src/servers/FtpServer.cc b/src/servers/FtpServer.cc
index f25ee73d2e..babdd16118 100644
--- a/src/servers/FtpServer.cc
+++ b/src/servers/FtpServer.cc
@@ -1723,9 +1723,9 @@ Ftp::Server::stopWaitingForOrigin(int originStatus)
     waitingForOrigin = false;
 
     // if we have already decided how to respond, respond now
-    if (delayedReply != nullptr) {
+    if (delayedReply != NULL) {
         HttpReply::Pointer reply = delayedReply;
-        delayedReply = nullptr;
+        delayedReply = NULL;
         writeForwardedReply(reply.getRaw());
         return; // do not completeDataDownload() after an earlier response
     }