From: Tomek Mrugalski Date: Thu, 10 May 2012 17:41:44 +0000 (+0200) Subject: [1968] Namespaces in iface_mgr_(os).cc fixed. X-Git-Tag: trac2351_base~226^2~146^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=90a1b131d672d476cdc1dd30d32f1554f45f98ce;p=thirdparty%2Fkea.git [1968] Namespaces in iface_mgr_(os).cc fixed. --- diff --git a/src/lib/dhcp/iface_mgr_bsd.cc b/src/lib/dhcp/iface_mgr_bsd.cc index aa6dd5b2d3..e3f11a1edc 100644 --- a/src/lib/dhcp/iface_mgr_bsd.cc +++ b/src/lib/dhcp/iface_mgr_bsd.cc @@ -25,6 +25,7 @@ using namespace isc::asiolink; using namespace isc::dhcp; namespace isc { +namespace dhcp { void IfaceMgr::detectIfaces() { @@ -48,6 +49,7 @@ bool IfaceMgr::os_receive4(struct msghdr& /*m*/, Pkt4Ptr& /*pkt*/) { return (true); // pretend that we have everything set up for reception. } -} +} // end of isc::dhcp namespace +} // end of dhcp namespace #endif diff --git a/src/lib/dhcp/iface_mgr_linux.cc b/src/lib/dhcp/iface_mgr_linux.cc index 3faac02897..90431dead2 100644 --- a/src/lib/dhcp/iface_mgr_linux.cc +++ b/src/lib/dhcp/iface_mgr_linux.cc @@ -410,7 +410,6 @@ void Netlink::release_list(NetlinkMessages& messages) { } // end of anonymous namespace namespace isc { - namespace dhcp { /// @brief Detect available interfaces on Linux systems. diff --git a/src/lib/dhcp/iface_mgr_sun.cc b/src/lib/dhcp/iface_mgr_sun.cc index 50721ba248..8b017af43b 100644 --- a/src/lib/dhcp/iface_mgr_sun.cc +++ b/src/lib/dhcp/iface_mgr_sun.cc @@ -25,6 +25,7 @@ using namespace isc::asiolink; using namespace isc::dhcp; namespace isc { +namespace isc::dhcp { void IfaceMgr::detectIfaces() { @@ -48,6 +49,7 @@ bool IfaceMgr::os_receive4(struct msghdr& /*m*/, Pkt4Ptr& /*pkt*/) { return (true); // pretend that we have everything set up for reception. } -} +} // end of isc::dhcp namespace +} // end of dhcp namespace #endif