From: Thomas Markwalder <tmark@isc.org>
Date: Tue, 20 May 2014 11:27:22 +0000 (-0400)
Subject: [3432] Fixed compilation error in d2_cfg_mgr.cc
X-Git-Tag: trac3434_base~30^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0387d65f6d395b5f69f514731f4ff628e5df6828;p=thirdparty%2Fkea.git

[3432] Fixed compilation error in d2_cfg_mgr.cc

Minor compilation error incurred after review changes.
---

diff --git a/examples/m4/ax_isc_rpath.m4 b/examples/m4/ax_isc_rpath.m4
index ee1e472e14..ce8d3226f1 100644
--- a/examples/m4/ax_isc_rpath.m4
+++ b/examples/m4/ax_isc_rpath.m4
@@ -41,8 +41,12 @@ if test x$rpath != xno; then
             ISC_RPATH_FLAG=-Wl,-R
         ],[ AC_MSG_RESULT(no)
             AC_MSG_CHECKING([whether -R flag is available in linker])
-            CXXFLAGS="$CXXFLAGS_SAVED -R"
-            CCFLAGS="$CCFLAGS_SAVED -R"
+
+	    # Apple clang 5.1 is now considers unknown parameters passed to linker (ld) as errors.
+	    # However, the same unknown parameters passed to compiler (g++ ) are merely threated
+	    # as warnings. To make sure that we pick those up, is to use -Werror.
+            CXXFLAGS="$CXXFLAGS_SAVED -R/usr/lib"
+            CCFLAGS="$CCFLAGS_SAVED -R/usr/lib"
         AC_TRY_LINK([], [],
             [ AC_MSG_RESULT([yes; note that -R is more sensitive about the position in option arguments])
                 ISC_RPATH_FLAG=-R
diff --git a/src/bin/d2/d2_cfg_mgr.cc b/src/bin/d2/d2_cfg_mgr.cc
index 28796f54dc..536c9cfa24 100644
--- a/src/bin/d2/d2_cfg_mgr.cc
+++ b/src/bin/d2/d2_cfg_mgr.cc
@@ -204,12 +204,12 @@ D2CfgMgr::buildParams(isc::data::ConstElementPtr params_config) {
 
     // Fetch the parameters from the context to create the D2Params.
     D2CfgContextPtr context = getD2CfgContext();
-    isc::dhcp::StringStoragePtr& strings = context->getStringStorage();
+    isc::dhcp::StringStoragePtr strings = context->getStringStorage();
     asiolink::IOAddress ip_address(strings->
                                    getOptionalParam("ip_address",
                                                     D2Params::DFT_IP_ADDRESS));
 
-    isc::dhcp::Uint32StoragePtr& ints = context->getUint32Storage();
+    isc::dhcp::Uint32StoragePtr ints = context->getUint32Storage();
     uint32_t port = ints->getOptionalParam("port", D2Params::DFT_PORT);
 
     uint32_t dns_server_timeout
diff --git a/src/bin/d2/tests/nc_test_utils.cc b/src/bin/d2/tests/nc_test_utils.cc
index 2f633abc52..69e766fa0a 100644
--- a/src/bin/d2/tests/nc_test_utils.cc
+++ b/src/bin/d2/tests/nc_test_utils.cc
@@ -31,7 +31,7 @@ namespace d2 {
 const char* TEST_DNS_SERVER_IP = "127.0.0.1";
 size_t TEST_DNS_SERVER_PORT = 5301;
 
-const bool HAS_RDATA = true;
+//const bool HAS_RDATA = true;
 const bool NO_RDATA = false;
 
 //*************************** FauxServer class ***********************
diff --git a/src/lib/dns/tests/labelsequence_unittest.cc b/src/lib/dns/tests/labelsequence_unittest.cc
index c211a4b897..63ae464de3 100644
--- a/src/lib/dns/tests/labelsequence_unittest.cc
+++ b/src/lib/dns/tests/labelsequence_unittest.cc
@@ -649,6 +649,7 @@ const char* const root_servers[] = {
     "j.root-servers.net", "k.root-servers.net", "l.root-servers.net",
     "m.root-servers.net", NULL
 };
+#if 0
 const char* const gtld_servers[] = {
     "a.gtld-servers.net", "b.gtld-servers.net", "c.gtld-servers.net",
     "d.gtld-servers.net", "e.gtld-servers.net", "f.gtld-servers.net",
@@ -656,6 +657,7 @@ const char* const gtld_servers[] = {
     "j.gtld-servers.net", "k.gtld-servers.net", "l.gtld-servers.net",
     "m.gtld-servers.net", NULL
 };
+#endif
 const char* const jp_servers[] = {
     "a.dns.jp", "b.dns.jp", "c.dns.jp", "d.dns.jp", "e.dns.jp",
     "f.dns.jp", "g.dns.jp", NULL