From: Francis Dupont <fdupont@isc.org>
Date: Fri, 9 Dec 2016 15:05:09 +0000 (+0100)
Subject: [master] Replaced a NULL not accepted by old GCC in C++0x mode by a cast
X-Git-Tag: trac5077_base~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22d0c2205a336565421044a44d6fcadb352c1fcf;p=thirdparty%2Fkea.git

[master] Replaced a NULL not accepted by old GCC in C++0x mode by a cast
---

diff --git a/src/lib/util/memory_segment_local.cc b/src/lib/util/memory_segment_local.cc
index 67625dc3d6..b0ac0869ab 100644
--- a/src/lib/util/memory_segment_local.cc
+++ b/src/lib/util/memory_segment_local.cc
@@ -50,7 +50,7 @@ MemorySegmentLocal::getNamedAddressImpl(const char* name) const {
     if (found != named_addrs_.end()) {
         return (NamedAddressResult(true, found->second));
     }
-    return (NamedAddressResult(false, NULL));
+    return (NamedAddressResult(false, static_cast<void*>(0)));
 }
 
 bool