[4024] Fixed c++11 detected errors

diff --git a/src/bin/d2/tests/d_test_stubs.h b/src/bin/d2/tests/d_test_stubs.h
index a125eb540aed59ba78ee20b44941c549c2c2af45..dd561d17e2e27c5046b276414f17cd1a4ecbece8 100644 (file)
--- a/src/bin/d2/tests/d_test_stubs.h
+++ b/src/bin/d2/tests/d_test_stubs.h
@@ -408,14 +408,14 @@ public:
     ///
     /// @return returns true if the process instance exists.
     bool checkProcess() {
-        return (getController()->process_);
+        return (getController()->process_.get() != 0);
     }
 
     /// @brief Tests the existence of the Controller's IOService.
     ///
     /// @return returns true if the IOService exists.
     bool checkIOService() {
-        return (getController()->io_service_);
+        return (getController()->io_service_.get() != 0);
     }
 
     /// @brief Gets the Controller's IOService.

diff --git a/src/bin/d2/tests/nc_add_unittests.cc b/src/bin/d2/tests/nc_add_unittests.cc
index 824cd37fdf096239145ebe4f22c0513ccd3e6384..e389ae70da3210b1f7e968a84509b35a265926e4 100644 (file)
--- a/src/bin/d2/tests/nc_add_unittests.cc
+++ b/src/bin/d2/tests/nc_add_unittests.cc
@@ -136,7 +136,7 @@ public:
         if (getForwardDomain()) {
             initServerSelection(getForwardDomain());
             selectNextServer();
-            return (getCurrentServer());
+            return (getCurrentServer().get() != 0);
         }
 
         return (false);
@@ -150,7 +150,7 @@ public:
         if (getReverseDomain()) {
             initServerSelection(getReverseDomain());
             selectNextServer();
-            return (getCurrentServer());
+            return (getCurrentServer().get() != 0);
         }
 
         return (false);

diff --git a/src/bin/d2/tests/nc_remove_unittests.cc b/src/bin/d2/tests/nc_remove_unittests.cc
index bf7219f059f8a68c9b10be4f27528e48de56b3b1..510b8ee48fa2000be5e7f0df4ae3a1f8b86efbbe 100644 (file)
--- a/src/bin/d2/tests/nc_remove_unittests.cc
+++ b/src/bin/d2/tests/nc_remove_unittests.cc
@@ -136,7 +136,7 @@ public:
         if (getForwardDomain()) {
             initServerSelection(getForwardDomain());
             selectNextServer();
-            return (getCurrentServer());
+            return (getCurrentServer().get() != 0);
         }
 
         return (false);
@@ -150,7 +150,7 @@ public:
         if (getReverseDomain()) {
             initServerSelection(getReverseDomain());
             selectNextServer();
-            return (getCurrentServer());
+            return (getCurrentServer().get() != 0);
         }
 
         return (false);

diff --git a/src/bin/d2/tests/nc_trans_unittests.cc b/src/bin/d2/tests/nc_trans_unittests.cc
index 0df4a14e0728f9ac59654aadbe793fb2fe4ac098..434a8e4241d5796d43eae893068a570278a8b170 100644 (file)
--- a/src/bin/d2/tests/nc_trans_unittests.cc
+++ b/src/bin/d2/tests/nc_trans_unittests.cc
@@ -99,7 +99,7 @@ public:
         if (getForwardDomain()) {
             initServerSelection(getForwardDomain());
             selectNextServer();
-            return (getCurrentServer());
+            return (getCurrentServer().get() != 0);
         }
 
         return (false);

diff --git a/src/bin/dhcp4/tests/dhcp4_client.cc b/src/bin/dhcp4/tests/dhcp4_client.cc
index 750e6657b24a4b089b9eba5594c6ce002e409fcc..8dbc7071db68b1a63af4e829986d79d854eb3a7b 100644 (file)
--- a/src/bin/dhcp4/tests/dhcp4_client.cc
+++ b/src/bin/dhcp4/tests/dhcp4_client.cc
@@ -194,7 +194,7 @@ void
 Dhcp4Client::createLease(const asiolink::IOAddress& addr,
                          const uint32_t valid_lft) {
     Lease4 lease(addr, hwaddr_, 0, 0, valid_lft, valid_lft / 2, valid_lft,
-                 time(NULL), false, false, "");
+                 time(NULL), 0, false, false, "");
     config_.lease_ = lease;
 }
 

diff --git a/src/bin/dhcp4/tests/dhcp4_test_utils.cc b/src/bin/dhcp4/tests/dhcp4_test_utils.cc
index 2fdd22f1650739d7188d583f2f9623132f0aaeb7..8fa1b63a814a21ddfc845d256439925c891590aa 100644 (file)
--- a/src/bin/dhcp4/tests/dhcp4_test_utils.cc
+++ b/src/bin/dhcp4/tests/dhcp4_test_utils.cc
@@ -146,23 +146,23 @@ Dhcpv4SrvTest::basicOptionsPresent(const Pkt4Ptr& pkt) {
     errmsg << "option missing in the response";
     if (!pkt->getOption(DHO_DOMAIN_NAME)) {
         return (::testing::AssertionFailure(::testing::Message()
-                                            << "domain-name " << errmsg));
+                                            << "domain-name " << errmsg.str()));
 
     } else if (!pkt->getOption(DHO_DOMAIN_NAME_SERVERS)) {
         return (::testing::AssertionFailure(::testing::Message()
-                                            << "dns-servers " << errmsg));
+                                            << "dns-servers " << errmsg.str()));
 
     } else if (!pkt->getOption(DHO_SUBNET_MASK)) {
         return (::testing::AssertionFailure(::testing::Message()
-                                            << "subnet-mask " << errmsg));
+                                            << "subnet-mask " << errmsg.str()));
 
     } else if (!pkt->getOption(DHO_ROUTERS)) {
         return (::testing::AssertionFailure(::testing::Message() << "routers "
-                                            << errmsg));
+                                            << errmsg.str()));
 
     } else if (!pkt->getOption(DHO_DHCP_LEASE_TIME)) {
         return (::testing::AssertionFailure(::testing::Message() <<
-                                            "dhcp-lease-time " << errmsg));
+                                            "dhcp-lease-time " << errmsg.str()));
 
     }
     return (::testing::AssertionSuccess());
@@ -175,23 +175,23 @@ Dhcpv4SrvTest::noBasicOptions(const Pkt4Ptr& pkt) {
     errmsg << "option present in the response";
     if (pkt->getOption(DHO_DOMAIN_NAME)) {
         return (::testing::AssertionFailure(::testing::Message()
-                                            << "domain-name " << errmsg));
+                                            << "domain-name " << errmsg.str()));
 
     } else if (pkt->getOption(DHO_DOMAIN_NAME_SERVERS)) {
         return (::testing::AssertionFailure(::testing::Message()
-                                            << "dns-servers " << errmsg));
+                                            << "dns-servers " << errmsg.str()));
 
     } else if (pkt->getOption(DHO_SUBNET_MASK)) {
         return (::testing::AssertionFailure(::testing::Message()
-                                            << "subnet-mask " << errmsg));
+                                            << "subnet-mask " << errmsg.str()));
 
     } else if (pkt->getOption(DHO_ROUTERS)) {
         return (::testing::AssertionFailure(::testing::Message() << "routers "
-                                            << errmsg));
+                                            << errmsg.str()));
 
     } else if (pkt->getOption(DHO_DHCP_LEASE_TIME)) {
         return (::testing::AssertionFailure(::testing::Message()
-                                            << "dhcp-lease-time " << errmsg));
+                                            << "dhcp-lease-time " << errmsg.str()));
 
     }
     return (::testing::AssertionSuccess());
@@ -203,11 +203,11 @@ Dhcpv4SrvTest::requestedOptionsPresent(const Pkt4Ptr& pkt) {
     errmsg << "option missing in the response";
     if (!pkt->getOption(DHO_LOG_SERVERS)) {
         return (::testing::AssertionFailure(::testing::Message()
-                                            << "log-servers " << errmsg));
+                                            << "log-servers " << errmsg.str()));
 
     } else if (!pkt->getOption(DHO_COOKIE_SERVERS)) {
         return (::testing::AssertionFailure(::testing::Message()
-                                            << "cookie-servers " << errmsg));
+                                            << "cookie-servers " << errmsg.str()));
 
     }
     return (::testing::AssertionSuccess());
@@ -219,11 +219,11 @@ Dhcpv4SrvTest::noRequestedOptions(const Pkt4Ptr& pkt) {
     errmsg << "option present in the response";
     if (pkt->getOption(DHO_LOG_SERVERS)) {
         return (::testing::AssertionFailure(::testing::Message()
-                                            << "log-servers " << errmsg));
+                                            << "log-servers " << errmsg.str()));
 
     } else if (pkt->getOption(DHO_COOKIE_SERVERS)) {
         return (::testing::AssertionFailure(::testing::Message()
-                                            << "cookie-servers " << errmsg));
+                                            << "cookie-servers " << errmsg.str()));
 
     }
     return (::testing::AssertionSuccess());

diff --git a/src/lib/dhcp/pkt_filter_bpf.cc b/src/lib/dhcp/pkt_filter_bpf.cc
index 69ef245d062bda682bcc3eff5f54d919b728b85f..84c202339d3fa06855a301440af2375a3df3baff 100644 (file)
--- a/src/lib/dhcp/pkt_filter_bpf.cc
+++ b/src/lib/dhcp/pkt_filter_bpf.cc
@@ -261,7 +261,8 @@ PktFilterBPF::openSocket(Iface& iface,
             // All other errors are fatal, so close the fallback socket
             // and throw.
             close(fallback);
-            isc_throw(SocketConfigError, "Failed to open BPF device " << s);
+            isc_throw(SocketConfigError,
+                      "Failed to open BPF device " << s.str());
         }
     }
 

diff --git a/src/lib/dhcpsrv/cfg_hosts.cc b/src/lib/dhcpsrv/cfg_hosts.cc
index c1dd769ece80f04a28a3f50de0798a9112511bb8..dd5c2b7d4e7b2e27bcc76698218aa6deabd2426b 100644 (file)
--- a/src/lib/dhcpsrv/cfg_hosts.cc
+++ b/src/lib/dhcpsrv/cfg_hosts.cc
@@ -469,7 +469,7 @@ CfgHosts::add4(const HostPtr& host) {
         } else if (duid) {
             s << "for HW address: " << duid->toText();
         }
-        isc_throw(BadValue, "specified reservation " << s
+        isc_throw(BadValue, "specified reservation " << s.str()
                   << " must include at least one resource, i.e. "
                   "hostname, IPv4 address or IPv6 address/prefix");
     }

diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.cc b/src/lib/dhcpsrv/memfile_lease_mgr.cc
index 6bde95e93fab09a2af713bcd8331351b70ba7da2..16ace39e2090a02073a169b859850c808135ed28 100644 (file)
--- a/src/lib/dhcpsrv/memfile_lease_mgr.cc
+++ b/src/lib/dhcpsrv/memfile_lease_mgr.cc
@@ -220,6 +220,10 @@ LFCSetup::getExitStatus() const {
     return (process_->getExitStatus(pid_));
 }
 
+// Explicit definition of class static constants.  Values are given in the
+// declaration so they're not needed here.
+const int Memfile_LeaseMgr::MAJOR_VERSION;
+const int Memfile_LeaseMgr::MINOR_VERSION;
 
 Memfile_LeaseMgr::Memfile_LeaseMgr(const ParameterMap& parameters)
     : LeaseMgr(parameters),

diff --git a/src/lib/util/tests/socketsession_unittest.cc b/src/lib/util/tests/socketsession_unittest.cc
index 6f4a9d172a129999568ff90f56dff65400451e49..3285c5c808637c14e3144d9054ea11c46e974cea 100644 (file)
--- a/src/lib/util/tests/socketsession_unittest.cc
+++ b/src/lib/util/tests/socketsession_unittest.cc
@@ -201,7 +201,7 @@ protected:
             isc_throw(isc::Unexpected, "failed to create UNIX domain socket" <<
                       strerror(errno));
         }
-        if (bind(listen_fd_, convertSockAddr(&test_un_), test_un_len_) == -1) {
+        if (::bind(listen_fd_, convertSockAddr(&test_un_), test_un_len_) == -1) {
             isc_throw(isc::Unexpected, "failed to bind UNIX domain socket" <<
                       strerror(errno));
         }