BIND 10 trac2475, updated. 3ba0299ad2b5151e9c822977ec0d1b4df00dbf52 [2475] Put #include directives in correct order
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Nov 16 14:17:59 UTC 2012
The branch, trac2475 has been updated
via 3ba0299ad2b5151e9c822977ec0d1b4df00dbf52 (commit)
from d2551c3b2bddcc80c496a59e85e390687776c24d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3ba0299ad2b5151e9c822977ec0d1b4df00dbf52
Author: Stephen Morris <stephen at isc.org>
Date: Fri Nov 16 14:15:45 2012 +0000
[2475] Put #include directives in correct order
Also fix some issues from the review.
-----------------------------------------------------------------------
Summary of changes:
src/bin/dhcp4/ctrl_dhcp4_srv.cc | 9 ++++----
src/bin/dhcp4/ctrl_dhcp4_srv.h | 4 ++--
src/bin/dhcp4/dhcp4_log.cc | 2 +-
src/bin/dhcp4/dhcp4_log.h | 2 +-
src/bin/dhcp4/dhcp4_srv.cc | 8 +++----
src/bin/dhcp4/dhcp4_srv.h | 4 +++-
src/bin/dhcp4/main.cc | 7 ++++---
src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc | 14 +++++++------
src/bin/dhcp4/tests/dhcp4_srv_unittest.cc | 16 +++++++-------
src/bin/dhcp4/tests/dhcp4_unittests.cc | 4 ++--
src/bin/dhcp6/config_parser.h | 9 ++++----
src/bin/dhcp6/ctrl_dhcp6_srv.cc | 10 ++++-----
src/bin/dhcp6/ctrl_dhcp6_srv.h | 4 ++--
src/bin/dhcp6/dhcp6_log.cc | 2 +-
src/bin/dhcp6/dhcp6_log.h | 4 ++--
src/bin/dhcp6/dhcp6_srv.h | 5 ++---
src/bin/dhcp6/main.cc | 7 ++++---
src/bin/dhcp6/tests/config_parser_unittest.cc | 2 +-
src/bin/dhcp6/tests/dhcp6_srv_unittest.cc | 2 +-
src/lib/dhcp/duid.cc | 10 +++++----
src/lib/dhcp/duid.h | 2 ++
src/lib/dhcp/iface_mgr.cc | 21 ++++++++++++-------
src/lib/dhcp/iface_mgr.h | 12 ++++++-----
src/lib/dhcp/iface_mgr_linux.cc | 11 +++++-----
src/lib/dhcp/libdhcp++.cc | 16 +++++++-------
src/lib/dhcp/libdhcp++.h | 7 ++++---
src/lib/dhcp/option.cc | 17 ++++++++-------
src/lib/dhcp/option.h | 14 +++++++------
src/lib/dhcp/option4_addrlst.cc | 16 +++++++-------
src/lib/dhcp/option4_addrlst.h | 20 ++++++++++--------
src/lib/dhcp/option6_addrlst.cc | 17 ++++++++-------
src/lib/dhcp/option6_addrlst.h | 9 ++++----
src/lib/dhcp/option6_ia.cc | 12 +++++------
src/lib/dhcp/option6_ia.h | 9 ++++----
src/lib/dhcp/option6_iaaddr.cc | 17 ++++++++-------
src/lib/dhcp/option6_iaaddr.h | 10 ++++-----
src/lib/dhcp/option6_int.h | 6 +++---
src/lib/dhcp/option6_int_array.h | 6 +++---
src/lib/dhcp/option_data_types.h | 6 +++---
src/lib/dhcp/option_definition.cc | 2 +-
src/lib/dhcp/option_definition.h | 15 ++++++-------
src/lib/dhcp/pkt4.cc | 7 ++++---
src/lib/dhcp/pkt4.h | 15 +++++++------
src/lib/dhcp/pkt6.cc | 4 ++--
src/lib/dhcp/pkt6.h | 13 +++++++-----
src/lib/dhcp/tests/duid_unittest.cc | 14 ++++++++-----
src/lib/dhcp/tests/iface_mgr_unittest.cc | 20 ++++++++++--------
src/lib/dhcp/tests/libdhcp++_unittest.cc | 17 ++++++++-------
src/lib/dhcp/tests/option4_addrlst_unittest.cc | 12 +++++++----
src/lib/dhcp/tests/option6_addrlst_unittest.cc | 12 +++++++----
src/lib/dhcp/tests/option6_ia_unittest.cc | 12 ++++++-----
src/lib/dhcp/tests/option6_iaaddr_unittest.cc | 12 ++++++-----
src/lib/dhcp/tests/option6_int_array_unittest.cc | 3 ++-
src/lib/dhcp/tests/option6_int_unittest.cc | 3 ++-
src/lib/dhcp/tests/option_definition_unittest.cc | 6 +++---
src/lib/dhcp/tests/option_unittest.cc | 16 +++++++-------
src/lib/dhcp/tests/pkt4_unittest.cc | 22 ++++++++++++--------
src/lib/dhcp/tests/pkt6_unittest.cc | 15 +++++++------
src/lib/dhcp/tests/run_unittests.cc | 3 ++-
src/lib/dhcpsrv/alloc_engine.cc | 1 +
src/lib/dhcpsrv/mysql_lease_mgr.h | 2 +-
src/lib/dhcpsrv/tests/addr_utilities_unittest.cc | 10 +++++----
src/lib/dhcpsrv/tests/alloc_engine_unittest.cc | 3 +--
src/lib/dhcpsrv/tests/cfgmgr_unittest.cc | 4 +++-
.../dhcpsrv/tests/lease_mgr_factory_unittest.cc | 3 ++-
src/lib/dhcpsrv/tests/lease_mgr_unittest.cc | 3 ++-
.../dhcpsrv/tests/memfile_lease_mgr_unittest.cc | 3 ++-
src/lib/dhcpsrv/tests/mysql_lease_mgr_unittest.cc | 5 +++--
src/lib/dhcpsrv/tests/pool_unittest.cc | 3 ++-
src/lib/dhcpsrv/tests/run_unittests.cc | 2 +-
src/lib/dhcpsrv/tests/triplet_unittest.cc | 3 ++-
71 files changed, 350 insertions(+), 268 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
index 4bd3103..b02bf72 100644
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
@@ -14,21 +14,20 @@
#include <config.h>
-#include <cassert>
-#include <iostream>
-
#include <asiolink/asiolink.h>
#include <cc/data.h>
#include <cc/session.h>
-#include <cc/session.h>
#include <config/ccsession.h>
+#include <dhcp/iface_mgr.h>
#include <dhcp4/ctrl_dhcp4_srv.h>
#include <dhcp4/dhcp4_log.h>
#include <dhcp4/spec_config.h>
-#include <dhcp/iface_mgr.h>
#include <exceptions/exceptions.h>
#include <util/buffer.h>
+#include <cassert>
+#include <iostream>
+
using namespace isc::asiolink;
using namespace isc::cc;
using namespace isc::config;
diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.h b/src/bin/dhcp4/ctrl_dhcp4_srv.h
index 688b1db..9fd7668 100644
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.h
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.h
@@ -15,11 +15,11 @@
#ifndef CTRL_DHCPV4_SRV_H
#define CTRL_DHCPV4_SRV_H
-#include <dhcp4/dhcp4_srv.h>
#include <asiolink/asiolink.h>
+#include <cc/data.h>
#include <cc/session.h>
#include <config/ccsession.h>
-#include <cc/data.h>
+#include <dhcp4/dhcp4_srv.h>
namespace isc {
namespace dhcp {
diff --git a/src/bin/dhcp4/dhcp4_log.cc b/src/bin/dhcp4/dhcp4_log.cc
index 678223b..32c5a47 100644
--- a/src/bin/dhcp4/dhcp4_log.cc
+++ b/src/bin/dhcp4/dhcp4_log.cc
@@ -14,7 +14,7 @@
/// Defines the logger used by the top-level component of b10-dhcp4.
-#include "dhcp4_log.h"
+#include <dhcp4/dhcp4_log.h>
namespace isc {
namespace dhcp {
diff --git a/src/bin/dhcp4/dhcp4_log.h b/src/bin/dhcp4/dhcp4_log.h
index b042ea4..07d009a 100644
--- a/src/bin/dhcp4/dhcp4_log.h
+++ b/src/bin/dhcp4/dhcp4_log.h
@@ -15,8 +15,8 @@
#ifndef DHCP4_LOG_H
#define DHCP4_LOG_H
-#include <log/macros.h>
#include <log/logger_support.h>
+#include <log/macros.h>
#include <dhcp4/dhcp4_messages.h>
namespace isc {
diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index 67943c5..59edc01 100644
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -12,13 +12,13 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
+#include <asiolink/io_address.h>
#include <dhcp/dhcp4.h>
-#include <dhcp/pkt4.h>
#include <dhcp/iface_mgr.h>
-#include <dhcp4/dhcp4_srv.h>
-#include <dhcp4/dhcp4_log.h>
-#include <asiolink/io_address.h>
#include <dhcp/option4_addrlst.h>
+#include <dhcp/pkt4.h>
+#include <dhcp4/dhcp4_log.h>
+#include <dhcp4/dhcp4_srv.h>
using namespace isc;
using namespace isc::asiolink;
diff --git a/src/bin/dhcp4/dhcp4_srv.h b/src/bin/dhcp4/dhcp4_srv.h
index f677259..48ccde6 100644
--- a/src/bin/dhcp4/dhcp4_srv.h
+++ b/src/bin/dhcp4/dhcp4_srv.h
@@ -15,10 +15,12 @@
#ifndef DHCPV4_SRV_H
#define DHCPV4_SRV_H
-#include <boost/noncopyable.hpp>
#include <dhcp/dhcp4.h>
#include <dhcp/pkt4.h>
#include <dhcp/option.h>
+
+#include <boost/noncopyable.hpp>
+
#include <iostream>
namespace isc {
diff --git a/src/bin/dhcp4/main.cc b/src/bin/dhcp4/main.cc
index 31f0b02..bd3be1b 100644
--- a/src/bin/dhcp4/main.cc
+++ b/src/bin/dhcp4/main.cc
@@ -13,14 +13,15 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
-#include <iostream>
-
-#include <boost/lexical_cast.hpp>
#include <dhcp4/ctrl_dhcp4_srv.h>
#include <dhcp4/dhcp4_log.h>
#include <log/logger_support.h>
+#include <boost/lexical_cast.hpp>
+
+#include <iostream>
+
using namespace isc::dhcp;
using namespace std;
diff --git a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
index 5af0cc9..fd4e90e 100644
--- a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
@@ -13,16 +13,18 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
-#include <iostream>
+
+#include <config/ccsession.h>
+#include <dhcp/dhcp4.h>
+#include <dhcp4/ctrl_dhcp4_srv.h>
+
+#include <gtest/gtest.h>
+
#include <fstream>
+#include <iostream>
#include <sstream>
#include <arpa/inet.h>
-#include <gtest/gtest.h>
-
-#include <dhcp/dhcp4.h>
-#include <dhcp4/ctrl_dhcp4_srv.h>
-#include <config/ccsession.h>
using namespace std;
using namespace isc;
diff --git a/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
index fca06ad..ac6f0bb 100644
--- a/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
@@ -13,17 +13,19 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
-#include <iostream>
-#include <fstream>
#include <sstream>
-#include <arpa/inet.h>
-#include <gtest/gtest.h>
-
+#include <asiolink/io_address.h>
#include <dhcp/dhcp4.h>
-#include <dhcp4/dhcp4_srv.h>
#include <dhcp/option.h>
-#include <asiolink/io_address.h>
+#include <dhcp4/dhcp4_srv.h>
+
+#include <gtest/gtest.h>
+
+#include <fstream>
+#include <iostream>
+
+#include <arpa/inet.h>
using namespace std;
using namespace isc;
diff --git a/src/bin/dhcp4/tests/dhcp4_unittests.cc b/src/bin/dhcp4/tests/dhcp4_unittests.cc
index ebc72fb..0ed61b7 100644
--- a/src/bin/dhcp4/tests/dhcp4_unittests.cc
+++ b/src/bin/dhcp4/tests/dhcp4_unittests.cc
@@ -12,10 +12,10 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#include <stdio.h>
-#include <gtest/gtest.h>
#include <log/logger_support.h>
+#include <gtest/gtest.h>
+
int
main(int argc, char* argv[]) {
diff --git a/src/bin/dhcp6/config_parser.h b/src/bin/dhcp6/config_parser.h
index 6758c99..9f7c3ae 100644
--- a/src/bin/dhcp6/config_parser.h
+++ b/src/bin/dhcp6/config_parser.h
@@ -12,13 +12,14 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#include <string>
-#include <exceptions/exceptions.h>
-#include <cc/data.h>
-
#ifndef DHCP6_CONFIG_PARSER_H
#define DHCP6_CONFIG_PARSER_H
+#include <cc/data.h>
+#include <exceptions/exceptions.h>
+
+#include <string>
+
namespace isc {
namespace dhcp {
diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.cc b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
index 5bcd69e..5d4d990 100644
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.cc
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
@@ -14,22 +14,22 @@
#include <config.h>
-#include <cassert>
-#include <iostream>
-
#include <asiolink/asiolink.h>
#include <cc/data.h>
#include <cc/session.h>
#include <cc/session.h>
#include <config/ccsession.h>
+#include <dhcp/iface_mgr.h>
+#include <dhcp6/config_parser.h>
#include <dhcp6/ctrl_dhcp6_srv.h>
#include <dhcp6/dhcp6_log.h>
#include <dhcp6/spec_config.h>
-#include <dhcp6/config_parser.h>
-#include <dhcp/iface_mgr.h>
#include <exceptions/exceptions.h>
#include <util/buffer.h>
+#include <cassert>
+#include <iostream>
+
using namespace isc::asiolink;
using namespace isc::cc;
using namespace isc::config;
diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.h b/src/bin/dhcp6/ctrl_dhcp6_srv.h
index df3b851..22cb3b6 100644
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.h
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.h
@@ -15,11 +15,11 @@
#ifndef CTRL_DHCPV6_SRV_H
#define CTRL_DHCPV6_SRV_H
-#include <dhcp6/dhcp6_srv.h>
#include <asiolink/asiolink.h>
+#include <cc/data.h>
#include <cc/session.h>
#include <config/ccsession.h>
-#include <cc/data.h>
+#include <dhcp6/dhcp6_srv.h>
namespace isc {
namespace dhcp {
diff --git a/src/bin/dhcp6/dhcp6_log.cc b/src/bin/dhcp6/dhcp6_log.cc
index d893834..875f595 100644
--- a/src/bin/dhcp6/dhcp6_log.cc
+++ b/src/bin/dhcp6/dhcp6_log.cc
@@ -14,7 +14,7 @@
/// Defines the logger used by the top-level component of b10-dhcp6.
-#include "dhcp6_log.h"
+#include <dhcp6/dhcp6_log.h>
namespace isc {
namespace dhcp {
diff --git a/src/bin/dhcp6/dhcp6_log.h b/src/bin/dhcp6/dhcp6_log.h
index fb3c3f9..23202da 100644
--- a/src/bin/dhcp6/dhcp6_log.h
+++ b/src/bin/dhcp6/dhcp6_log.h
@@ -15,9 +15,9 @@
#ifndef DHCP6_LOG_H
#define DHCP6_LOG_H
-#include <log/macros.h>
-#include <log/logger_support.h>
#include <dhcp6/dhcp6_messages.h>
+#include <log/logger_support.h>
+#include <log/macros.h>
namespace isc {
namespace dhcp {
diff --git a/src/bin/dhcp6/dhcp6_srv.h b/src/bin/dhcp6/dhcp6_srv.h
index a3be4f1..b4ce8b1 100644
--- a/src/bin/dhcp6/dhcp6_srv.h
+++ b/src/bin/dhcp6/dhcp6_srv.h
@@ -15,8 +15,6 @@
#ifndef DHCPV6_SRV_H
#define DHCPV6_SRV_H
-#include <iostream>
-
#include <dhcp/dhcp6.h>
#include <dhcp/duid.h>
#include <dhcp/option.h>
@@ -28,8 +26,9 @@
#include <boost/noncopyable.hpp>
-namespace isc {
+#include <iostream>
+namespace isc {
namespace dhcp {
/// @brief DHCPv6 server service.
///
diff --git a/src/bin/dhcp6/main.cc b/src/bin/dhcp6/main.cc
index c216924..ae299e5 100644
--- a/src/bin/dhcp6/main.cc
+++ b/src/bin/dhcp6/main.cc
@@ -13,14 +13,15 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
-#include <iostream>
-
-#include <boost/lexical_cast.hpp>
#include <dhcp6/ctrl_dhcp6_srv.h>
#include <dhcp6/dhcp6_log.h>
#include <log/logger_support.h>
+#include <boost/lexical_cast.hpp>
+
+#include <iostream>
+
using namespace isc::dhcp;
using namespace std;
diff --git a/src/bin/dhcp6/tests/config_parser_unittest.cc b/src/bin/dhcp6/tests/config_parser_unittest.cc
index a5a1f99..2064e72 100644
--- a/src/bin/dhcp6/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp6/tests/config_parser_unittest.cc
@@ -23,13 +23,13 @@
#include <dhcpsrv/subnet.h>
#include <boost/foreach.hpp>
+#include <gtest/gtest.h>
#include <fstream>
#include <iostream>
#include <sstream>
#include <arpa/inet.h>
-#include <gtest/gtest.h>
using namespace std;
using namespace isc;
diff --git a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
index 7036fb6..335fb7b 100644
--- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
@@ -15,7 +15,6 @@
#include <config.h>
#include <asiolink/io_address.h>
-#include <boost/scoped_ptr.hpp>
#include <config/ccsession.h>
#include <dhcp/dhcp6.h>
#include <dhcp/duid.h>
@@ -32,6 +31,7 @@
#include <util/buffer.h>
#include <util/range_utilities.h>
+#include <boost/scoped_ptr.hpp>
#include <gtest/gtest.h>
#include <fstream>
diff --git a/src/lib/dhcp/duid.cc b/src/lib/dhcp/duid.cc
index 01dcfe1..c3f46da 100644
--- a/src/lib/dhcp/duid.cc
+++ b/src/lib/dhcp/duid.cc
@@ -12,13 +12,15 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
+#include <dhcp/duid.h>
#include <exceptions/exceptions.h>
-#include <stdint.h>
#include <util/io_utilities.h>
-#include <dhcp/duid.h>
-#include <vector>
-#include <sstream>
+
#include <iomanip>
+#include <sstream>
+#include <vector>
+
+#include <stdint.h>
namespace isc {
namespace dhcp {
diff --git a/src/lib/dhcp/duid.h b/src/lib/dhcp/duid.h
index be575dd..001e362 100644
--- a/src/lib/dhcp/duid.h
+++ b/src/lib/dhcp/duid.h
@@ -16,7 +16,9 @@
#define DUID_H
#include <asiolink/io_address.h>
+
#include <vector>
+
#include <stdint.h>
#include <unistd.h>
diff --git a/src/lib/dhcp/iface_mgr.cc b/src/lib/dhcp/iface_mgr.cc
index 1c2a11c..2f1199e 100644
--- a/src/lib/dhcp/iface_mgr.cc
+++ b/src/lib/dhcp/iface_mgr.cc
@@ -13,22 +13,27 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
-#include <sstream>
-#include <fstream>
-#include <string.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/select.h>
+
+// This must be included before udp_endpoint.h
#include <asio.hpp>
+#include <asiolink/io_error.h>
+#include <asiolink/udp_endpoint.h>
#include <dhcp/dhcp4.h>
#include <dhcp/dhcp6.h>
#include <dhcp/iface_mgr.h>
#include <exceptions/exceptions.h>
-#include <asiolink/udp_endpoint.h>
-#include <asiolink/io_error.h>
#include <util/io/pktinfo_utilities.h>
+
+#include <fstream>
+#include <sstream>
+
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <string.h>
+#include <sys/select.h>
+
using namespace std;
using namespace isc::asiolink;
using namespace isc::util::io::internal;
diff --git a/src/lib/dhcp/iface_mgr.h b/src/lib/dhcp/iface_mgr.h
index 1b15595..a669a6d 100644
--- a/src/lib/dhcp/iface_mgr.h
+++ b/src/lib/dhcp/iface_mgr.h
@@ -15,16 +15,18 @@
#ifndef IFACE_MGR_H
#define IFACE_MGR_H
-#include <list>
-#include <boost/shared_ptr.hpp>
-#include <boost/scoped_array.hpp>
-#include <boost/noncopyable.hpp>
#include <asiolink/io_address.h>
-#include <dhcp/dhcp6.h>
#include <dhcp/dhcp4.h>
+#include <dhcp/dhcp6.h>
#include <dhcp/pkt4.h>
#include <dhcp/pkt6.h>
+#include <boost/noncopyable.hpp>
+#include <boost/scoped_array.hpp>
+#include <boost/shared_ptr.hpp>
+
+#include <list>
+
namespace isc {
namespace dhcp {
diff --git a/src/lib/dhcp/iface_mgr_linux.cc b/src/lib/dhcp/iface_mgr_linux.cc
index d7ebe1a..38189aa 100644
--- a/src/lib/dhcp/iface_mgr_linux.cc
+++ b/src/lib/dhcp/iface_mgr_linux.cc
@@ -31,18 +31,17 @@
#if defined(OS_LINUX)
+#include <asiolink/io_address.h>
#include <dhcp/iface_mgr.h>
#include <exceptions/exceptions.h>
+#include <util/io/sockaddr_util.h>
+
+#include <boost/array.hpp>
+#include <boost/static_assert.hpp>
#include <stdint.h>
#include <net/if.h>
#include <linux/rtnetlink.h>
-#include <boost/array.hpp>
-#include <boost/static_assert.hpp>
-#include <dhcp/iface_mgr.h>
-#include <exceptions/exceptions.h>
-#include <asiolink/io_address.h>
-#include <util/io/sockaddr_util.h>
using namespace std;
using namespace isc;
diff --git a/src/lib/dhcp/libdhcp++.cc b/src/lib/dhcp/libdhcp++.cc
index 99a3b91..7fb88bf 100644
--- a/src/lib/dhcp/libdhcp++.cc
+++ b/src/lib/dhcp/libdhcp++.cc
@@ -12,19 +12,21 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#include <boost/shared_array.hpp>
-#include <boost/shared_ptr.hpp>
-#include <util/buffer.h>
-#include <exceptions/exceptions.h>
-#include <dhcp/libdhcp++.h>
-#include "config.h"
+#include <config.h>
+
#include <dhcp/dhcp4.h>
#include <dhcp/dhcp6.h>
+#include <dhcp/libdhcp++.h>
#include <dhcp/option.h>
#include <dhcp/option6_ia.h>
#include <dhcp/option6_iaaddr.h>
-#include <dhcp/option_definition.h>
#include <dhcp/option6_int_array.h>
+#include <dhcp/option_definition.h>
+#include <exceptions/exceptions.h>
+#include <util/buffer.h>
+
+#include <boost/shared_array.hpp>
+#include <boost/shared_ptr.hpp>
using namespace std;
using namespace isc::dhcp;
diff --git a/src/lib/dhcp/libdhcp++.h b/src/lib/dhcp/libdhcp++.h
index b848ad3..c773fd7 100644
--- a/src/lib/dhcp/libdhcp++.h
+++ b/src/lib/dhcp/libdhcp++.h
@@ -12,12 +12,13 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#ifndef LIBDHCP_H_
-#define LIBDHCP_H_
+#ifndef LIBDHCP_H
+#define LIBDHCP_H
#include <dhcp/option_definition.h>
#include <dhcp/pkt6.h>
#include <util/buffer.h>
+
#include <iostream>
namespace isc {
@@ -164,4 +165,4 @@ private:
}
}
-#endif
+#endif // LIBDHCP_H
diff --git a/src/lib/dhcp/option.cc b/src/lib/dhcp/option.cc
index fb441f9..d2be1d2 100644
--- a/src/lib/dhcp/option.cc
+++ b/src/lib/dhcp/option.cc
@@ -12,16 +12,17 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#include <string.h>
-#include <stdint.h>
-#include <arpa/inet.h>
-#include <sstream>
+#include <dhcp/libdhcp++.h>
+#include <dhcp/option.h>
+#include <exceptions/exceptions.h>
+#include <util/io_utilities.h>
+
#include <iomanip>
-#include "exceptions/exceptions.h"
-#include "util/io_utilities.h"
+#include <sstream>
-#include "dhcp/option.h"
-#include "dhcp/libdhcp++.h"
+#include <arpa/inet.h>
+#include <stdint.h>
+#include <string.h>
using namespace std;
using namespace isc::util;
diff --git a/src/lib/dhcp/option.h b/src/lib/dhcp/option.h
index 4617c26..920ef13 100644
--- a/src/lib/dhcp/option.h
+++ b/src/lib/dhcp/option.h
@@ -12,14 +12,16 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#ifndef OPTION_H_
-#define OPTION_H_
+#ifndef OPTION_H
+#define OPTION_H
+
+#include <util/buffer.h>
+
+#include <boost/shared_ptr.hpp>
-#include <string>
#include <map>
+#include <string>
#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <util/buffer.h>
namespace isc {
namespace dhcp {
@@ -329,4 +331,4 @@ protected:
} // namespace isc::dhcp
} // namespace isc
-#endif
+#endif // OPTION_H
diff --git a/src/lib/dhcp/option4_addrlst.cc b/src/lib/dhcp/option4_addrlst.cc
index 4b0224f..76341b2 100644
--- a/src/lib/dhcp/option4_addrlst.cc
+++ b/src/lib/dhcp/option4_addrlst.cc
@@ -12,15 +12,17 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#include <string.h>
-#include <stdint.h>
-#include <arpa/inet.h>
-#include <sstream>
-#include <iomanip>
-#include <exceptions/exceptions.h>
#include <asiolink/io_address.h>
-#include <util/io_utilities.h>
#include <dhcp/option4_addrlst.h>
+#include <exceptions/exceptions.h>
+#include <util/io_utilities.h>
+
+#include <iomanip>
+#include <sstream>
+
+#include <arpa/inet.h>
+#include <stdint.h>
+#include <string.h>
using namespace std;
using namespace isc::util;
diff --git a/src/lib/dhcp/option4_addrlst.h b/src/lib/dhcp/option4_addrlst.h
index 01a8a4b..b266cbf 100644
--- a/src/lib/dhcp/option4_addrlst.h
+++ b/src/lib/dhcp/option4_addrlst.h
@@ -12,17 +12,19 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#ifndef OPTION4_ADDRLST_H_
-#define OPTION4_ADDRLST_H_
+#ifndef OPTION4_ADDRLST_H
+#define OPTION4_ADDRLST_H
-#include <string>
-#include <map>
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/shared_array.hpp>
#include <asiolink/io_address.h>
-#include <util/buffer.h>
#include <dhcp/option.h>
+#include <util/buffer.h>
+
+#include <boost/shared_array.hpp>
+#include <boost/shared_ptr.hpp>
+
+#include <map>
+#include <string>
+#include <vector>
namespace isc {
namespace dhcp {
@@ -162,4 +164,4 @@ protected:
} // namespace isc::dhcp
} // namespace isc
-#endif
+#endif // OPTION4_ADDRLST_H
diff --git a/src/lib/dhcp/option6_addrlst.cc b/src/lib/dhcp/option6_addrlst.cc
index d23b700..1af10b5 100644
--- a/src/lib/dhcp/option6_addrlst.cc
+++ b/src/lib/dhcp/option6_addrlst.cc
@@ -12,16 +12,17 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#include <stdint.h>
-#include <arpa/inet.h>
+#include <asiolink/io_address.h>
+#include <dhcp/dhcp6.h>
+#include <dhcp/libdhcp++.h>
+#include <dhcp/option6_addrlst.h>
+#include <exceptions/exceptions.h>
+#include <util/io_utilities.h>
+
#include <sstream>
-#include "exceptions/exceptions.h"
-#include "asiolink/io_address.h"
-#include "util/io_utilities.h"
-#include "dhcp/libdhcp++.h"
-#include "dhcp/option6_addrlst.h"
-#include "dhcp/dhcp6.h"
+#include <arpa/inet.h>
+#include <stdint.h>
using namespace std;
using namespace isc;
diff --git a/src/lib/dhcp/option6_addrlst.h b/src/lib/dhcp/option6_addrlst.h
index 209d2dd..b9c0deb 100644
--- a/src/lib/dhcp/option6_addrlst.h
+++ b/src/lib/dhcp/option6_addrlst.h
@@ -12,13 +12,14 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#ifndef OPTION6_ADDRLST_H_
-#define OPTION6_ADDRLST_H_
+#ifndef OPTION6_ADDRLST_H
+#define OPTION6_ADDRLST_H
-#include <vector>
#include <asiolink/io_address.h>
#include <dhcp/option.h>
+#include <vector>
+
namespace isc {
namespace dhcp {
@@ -96,4 +97,4 @@ protected:
} // isc::dhcp namespace
} // isc namespace
-#endif /* OPTION_ADDRLST_H_ */
+#endif // OPTION_ADDRLST_H
diff --git a/src/lib/dhcp/option6_ia.cc b/src/lib/dhcp/option6_ia.cc
index beba75f..9e4e01e 100644
--- a/src/lib/dhcp/option6_ia.cc
+++ b/src/lib/dhcp/option6_ia.cc
@@ -12,16 +12,16 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#include <stdint.h>
-#include <arpa/inet.h>
-#include <sstream>
-
-#include <exceptions/exceptions.h>
+#include <dhcp/dhcp6.h>
#include <dhcp/libdhcp++.h>
#include <dhcp/option6_ia.h>
-#include <dhcp/dhcp6.h>
+#include <exceptions/exceptions.h>
#include <util/io_utilities.h>
+#include <arpa/inet.h>
+#include <sstream>
+#include <stdint.h>
+
using namespace std;
using namespace isc::util;
diff --git a/src/lib/dhcp/option6_ia.h b/src/lib/dhcp/option6_ia.h
index c2089d4..54624d0 100644
--- a/src/lib/dhcp/option6_ia.h
+++ b/src/lib/dhcp/option6_ia.h
@@ -12,11 +12,12 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#ifndef OPTION_IA_H_
-#define OPTION_IA_H_
+#ifndef OPTION_IA_H
+#define OPTION_IA_H
+
+#include <dhcp/option.h>
#include <stdint.h>
-#include "option.h"
namespace isc {
namespace dhcp {
@@ -112,4 +113,4 @@ protected:
} // isc::dhcp namespace
} // isc namespace
-#endif /* OPTION_IA_H_ */
+#endif // OPTION_IA_H
diff --git a/src/lib/dhcp/option6_iaaddr.cc b/src/lib/dhcp/option6_iaaddr.cc
index 084a5f3..b021ce9 100644
--- a/src/lib/dhcp/option6_iaaddr.cc
+++ b/src/lib/dhcp/option6_iaaddr.cc
@@ -12,16 +12,17 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#include <stdint.h>
-#include <arpa/inet.h>
+#include <asiolink/io_address.h>
+#include <dhcp/dhcp6.h>
+#include <dhcp/libdhcp++.h>
+#include <dhcp/option6_iaaddr.h>
+#include <exceptions/exceptions.h>
+#include <util/io_utilities.h>
+
#include <sstream>
-#include "exceptions/exceptions.h"
-#include "dhcp/libdhcp++.h"
-#include "dhcp/option6_iaaddr.h"
-#include "dhcp/dhcp6.h"
-#include "asiolink/io_address.h"
-#include "util/io_utilities.h"
+#include <stdint.h>
+#include <arpa/inet.h>
using namespace std;
using namespace isc::asiolink;
diff --git a/src/lib/dhcp/option6_iaaddr.h b/src/lib/dhcp/option6_iaaddr.h
index e6e2c16..28c5abc 100644
--- a/src/lib/dhcp/option6_iaaddr.h
+++ b/src/lib/dhcp/option6_iaaddr.h
@@ -12,11 +12,11 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#ifndef OPTION6_IAADDR_H_
-#define OPTION6_IAADDR_H_
+#ifndef OPTION6_IAADDR_H
+#define OPTION6_IAADDR_H
-#include "asiolink/io_address.h"
-#include "dhcp/option.h"
+#include <asiolink/io_address.h>
+#include <dhcp/option.h>
namespace isc {
namespace dhcp {
@@ -120,4 +120,4 @@ protected:
} // isc::dhcp namespace
} // isc namespace
-#endif /* OPTION_IA_H_ */
+#endif // OPTION_IA_H
diff --git a/src/lib/dhcp/option6_int.h b/src/lib/dhcp/option6_int.h
index 5fd5c19..2c51389 100644
--- a/src/lib/dhcp/option6_int.h
+++ b/src/lib/dhcp/option6_int.h
@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#ifndef OPTION6_INT_H_
-#define OPTION6_INT_H_
+#ifndef OPTION6_INT_H
+#define OPTION6_INT_H
#include <dhcp/libdhcp++.h>
#include <dhcp/option.h>
@@ -186,4 +186,4 @@ private:
} // isc::dhcp namespace
} // isc namespace
-#endif /* OPTION6_INT_H_ */
+#endif // OPTION6_INT_H
diff --git a/src/lib/dhcp/option6_int_array.h b/src/lib/dhcp/option6_int_array.h
index 57aad1e..aba05a1 100644
--- a/src/lib/dhcp/option6_int_array.h
+++ b/src/lib/dhcp/option6_int_array.h
@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#ifndef OPTION6_INT_ARRAY_H_
-#define OPTION6_INT_ARRAY_H_
+#ifndef OPTION6_INT_ARRAY_H
+#define OPTION6_INT_ARRAY_H
#include <dhcp/libdhcp++.h>
#include <dhcp/option.h>
@@ -225,4 +225,4 @@ private:
} // isc::dhcp namespace
} // isc namespace
-#endif /* OPTION6_INT_ARRAY_H_ */
+#endif // OPTION6_INT_ARRAY_H
diff --git a/src/lib/dhcp/option_data_types.h b/src/lib/dhcp/option_data_types.h
index 4e8d8a6..0ad14d2 100644
--- a/src/lib/dhcp/option_data_types.h
+++ b/src/lib/dhcp/option_data_types.h
@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#ifndef OPTION_DATA_TYPES_H_
-#define OPTION_DATA_TYPES_H_
+#ifndef OPTION_DATA_TYPES_H
+#define OPTION_DATA_TYPES_H
#include <exceptions/exceptions.h>
@@ -86,4 +86,4 @@ struct OptionDataTypes<uint32_t> {
} // isc::dhcp namespace
} // isc namespace
-#endif /* OPTION_DATA_TYPES_H_ */
+#endif // OPTION_DATA_TYPES_H
diff --git a/src/lib/dhcp/option_definition.cc b/src/lib/dhcp/option_definition.cc
index 87b3216..ea3ced6 100644
--- a/src/lib/dhcp/option_definition.cc
+++ b/src/lib/dhcp/option_definition.cc
@@ -13,13 +13,13 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <dhcp/dhcp6.h>
-#include <dhcp/option_definition.h>
#include <dhcp/option4_addrlst.h>
#include <dhcp/option6_addrlst.h>
#include <dhcp/option6_ia.h>
#include <dhcp/option6_iaaddr.h>
#include <dhcp/option6_int.h>
#include <dhcp/option6_int_array.h>
+#include <dhcp/option_definition.h>
using namespace std;
using namespace isc::util;
diff --git a/src/lib/dhcp/option_definition.h b/src/lib/dhcp/option_definition.h
index 166765f..d9b7f98 100644
--- a/src/lib/dhcp/option_definition.h
+++ b/src/lib/dhcp/option_definition.h
@@ -12,16 +12,17 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#ifndef OPTION_DEFINITION_H_
-#define OPTION_DEFINITION_H_
+#ifndef OPTION_DEFINITION_H
+#define OPTION_DEFINITION_H
-#include <dhcp/option_data_types.h>
#include <dhcp/option.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/multi_index_container.hpp>
+#include <dhcp/option_data_types.h>
+
#include <boost/multi_index/hashed_index.hpp>
-#include <boost/multi_index/sequenced_index.hpp>
#include <boost/multi_index/mem_fun.hpp>
+#include <boost/multi_index/sequenced_index.hpp>
+#include <boost/multi_index_container.hpp>
+#include <boost/shared_ptr.hpp>
namespace isc {
namespace dhcp {
@@ -461,4 +462,4 @@ typedef std::pair<OptionDefContainerTypeIndex::const_iterator,
} // namespace isc::dhcp
} // namespace isc
-#endif
+#endif // OPTION_DEFINITION_H
diff --git a/src/lib/dhcp/pkt4.cc b/src/lib/dhcp/pkt4.cc
index 405277d..5be8211 100644
--- a/src/lib/dhcp/pkt4.cc
+++ b/src/lib/dhcp/pkt4.cc
@@ -12,11 +12,12 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#include <dhcp/pkt4.h>
-#include <dhcp/libdhcp++.h>
+#include <asiolink/io_address.h>
#include <dhcp/dhcp4.h>
+#include <dhcp/libdhcp++.h>
+#include <dhcp/pkt4.h>
#include <exceptions/exceptions.h>
-#include <asiolink/io_address.h>
+
#include <iostream>
#include <sstream>
diff --git a/src/lib/dhcp/pkt4.h b/src/lib/dhcp/pkt4.h
index b72c03e..e09069c 100644
--- a/src/lib/dhcp/pkt4.h
+++ b/src/lib/dhcp/pkt4.h
@@ -15,14 +15,17 @@
#ifndef PKT4_H
#define PKT4_H
+#include <asiolink/io_address.h>
+#include <util/buffer.h>
+#include <dhcp/option.h>
+
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/shared_ptr.hpp>
+
#include <iostream>
-#include <time.h>
#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include "asiolink/io_address.h"
-#include "util/buffer.h"
-#include "dhcp/option.h"
+
+#include <time.h>
namespace isc {
diff --git a/src/lib/dhcp/pkt6.cc b/src/lib/dhcp/pkt6.cc
index 330c97f..12597c3 100644
--- a/src/lib/dhcp/pkt6.cc
+++ b/src/lib/dhcp/pkt6.cc
@@ -12,11 +12,11 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-
#include <dhcp/dhcp6.h>
-#include <dhcp/pkt6.h>
#include <dhcp/libdhcp++.h>
+#include <dhcp/pkt6.h>
#include <exceptions/exceptions.h>
+
#include <iostream>
#include <sstream>
diff --git a/src/lib/dhcp/pkt6.h b/src/lib/dhcp/pkt6.h
index b3a3567..5782737 100644
--- a/src/lib/dhcp/pkt6.h
+++ b/src/lib/dhcp/pkt6.h
@@ -15,13 +15,16 @@
#ifndef PKT6_H
#define PKT6_H
+#include <asiolink/io_address.h>
+#include <dhcp/option.h>
+
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/shared_array.hpp>
+#include <boost/shared_ptr.hpp>
+
#include <iostream>
+
#include <time.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/shared_array.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include "asiolink/io_address.h"
-#include "dhcp/option.h"
namespace isc {
diff --git a/src/lib/dhcp/tests/duid_unittest.cc b/src/lib/dhcp/tests/duid_unittest.cc
index 435d2d2..9db4c35 100644
--- a/src/lib/dhcp/tests/duid_unittest.cc
+++ b/src/lib/dhcp/tests/duid_unittest.cc
@@ -13,14 +13,18 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
+
+#include <asiolink/io_address.h>
+#include <dhcp/duid.h>
+#include <exceptions/exceptions.h>
+
+#include <boost/scoped_ptr.hpp>
+#include <gtest/gtest.h>
+
#include <iostream>
#include <sstream>
+
#include <arpa/inet.h>
-#include <gtest/gtest.h>
-#include <exceptions/exceptions.h>
-#include <boost/scoped_ptr.hpp>
-#include <asiolink/io_address.h>
-#include <dhcp/duid.h>
using namespace std;
using namespace isc;
diff --git a/src/lib/dhcp/tests/iface_mgr_unittest.cc b/src/lib/dhcp/tests/iface_mgr_unittest.cc
index 462910b..11cbf34 100644
--- a/src/lib/dhcp/tests/iface_mgr_unittest.cc
+++ b/src/lib/dhcp/tests/iface_mgr_unittest.cc
@@ -13,19 +13,21 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <unistd.h>
-#include <arpa/inet.h>
+#include <asiolink/io_address.h>
+#include <dhcp/dhcp4.h>
+#include <dhcp/iface_mgr.h>
+#include <dhcp/pkt6.h>
+
#include <boost/scoped_ptr.hpp>
#include <gtest/gtest.h>
-#include <asiolink/io_address.h>
-#include <dhcp/pkt6.h>
-#include <dhcp/iface_mgr.h>
-#include <dhcp/dhcp4.h>
+#include <fstream>
+#include <iostream>
+#include <sstream>
+
+#include <arpa/inet.h>
+#include <unistd.h>
using namespace std;
using namespace isc;
diff --git a/src/lib/dhcp/tests/libdhcp++_unittest.cc b/src/lib/dhcp/tests/libdhcp++_unittest.cc
index 0c9dc89..c8a3271 100644
--- a/src/lib/dhcp/tests/libdhcp++_unittest.cc
+++ b/src/lib/dhcp/tests/libdhcp++_unittest.cc
@@ -13,20 +13,23 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
-#include <iostream>
-#include <sstream>
-#include <arpa/inet.h>
-#include <gtest/gtest.h>
-#include <util/buffer.h>
+
#include <dhcp/dhcp4.h>
#include <dhcp/dhcp6.h>
#include <dhcp/libdhcp++.h>
+#include <dhcp/option6_addrlst.h>
#include <dhcp/option6_ia.h>
#include <dhcp/option6_iaaddr.h>
#include <dhcp/option6_int.h>
#include <dhcp/option6_int_array.h>
-#include <dhcp/option6_addrlst.h>
-#include "config.h"
+#include <util/buffer.h>
+
+#include <gtest/gtest.h>
+
+#include <iostream>
+#include <sstream>
+
+#include <arpa/inet.h>
using namespace std;
using namespace isc;
diff --git a/src/lib/dhcp/tests/option4_addrlst_unittest.cc b/src/lib/dhcp/tests/option4_addrlst_unittest.cc
index d4ecf80..a8e60f6 100644
--- a/src/lib/dhcp/tests/option4_addrlst_unittest.cc
+++ b/src/lib/dhcp/tests/option4_addrlst_unittest.cc
@@ -13,16 +13,20 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
-#include <iostream>
-#include <sstream>
-#include <arpa/inet.h>
-#include <gtest/gtest.h>
+
#include <asiolink/io_address.h>
#include <dhcp/dhcp4.h>
#include <dhcp/option.h>
#include <dhcp/option4_addrlst.h>
#include <util/buffer.h>
+#include <gtest/gtest.h>
+
+#include <iostream>
+#include <sstream>
+
+#include <arpa/inet.h>
+
using namespace std;
using namespace isc;
using namespace isc::dhcp;
diff --git a/src/lib/dhcp/tests/option6_addrlst_unittest.cc b/src/lib/dhcp/tests/option6_addrlst_unittest.cc
index 89d4f7c..96db59c 100644
--- a/src/lib/dhcp/tests/option6_addrlst_unittest.cc
+++ b/src/lib/dhcp/tests/option6_addrlst_unittest.cc
@@ -13,16 +13,20 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
-#include <iostream>
-#include <sstream>
-#include <arpa/inet.h>
-#include <gtest/gtest.h>
+
#include <asiolink/io_address.h>
#include <dhcp/dhcp6.h>
#include <dhcp/option.h>
#include <dhcp/option6_addrlst.h>
#include <util/buffer.h>
+#include <gtest/gtest.h>
+
+#include <iostream>
+#include <sstream>
+
+#include <arpa/inet.h>
+
using namespace std;
using namespace isc;
using namespace isc::dhcp;
diff --git a/src/lib/dhcp/tests/option6_ia_unittest.cc b/src/lib/dhcp/tests/option6_ia_unittest.cc
index 47af50e..bc72242 100644
--- a/src/lib/dhcp/tests/option6_ia_unittest.cc
+++ b/src/lib/dhcp/tests/option6_ia_unittest.cc
@@ -13,11 +13,6 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
-#include <iostream>
-#include <sstream>
-
-#include <arpa/inet.h>
-#include <gtest/gtest.h>
#include <dhcp/dhcp6.h>
#include <dhcp/option.h>
@@ -25,6 +20,13 @@
#include <dhcp/option6_iaaddr.h>
#include <util/buffer.h>
+#include <gtest/gtest.h>
+
+#include <iostream>
+#include <sstream>
+
+#include <arpa/inet.h>
+
using namespace std;
using namespace isc;
using namespace isc::dhcp;
diff --git a/src/lib/dhcp/tests/option6_iaaddr_unittest.cc b/src/lib/dhcp/tests/option6_iaaddr_unittest.cc
index e351d17..8c87d80 100644
--- a/src/lib/dhcp/tests/option6_iaaddr_unittest.cc
+++ b/src/lib/dhcp/tests/option6_iaaddr_unittest.cc
@@ -13,17 +13,19 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
-#include <iostream>
-#include <sstream>
-
-#include <arpa/inet.h>
-#include <gtest/gtest.h>
#include <dhcp/dhcp6.h>
#include <dhcp/option.h>
#include <dhcp/option6_iaaddr.h>
#include <util/buffer.h>
+#include <gtest/gtest.h>
+
+#include <iostream>
+#include <sstream>
+
+#include <arpa/inet.h>
+
using namespace std;
using namespace isc;
using namespace isc::dhcp;
diff --git a/src/lib/dhcp/tests/option6_int_array_unittest.cc b/src/lib/dhcp/tests/option6_int_array_unittest.cc
index 581d4e1..3a8640a 100644
--- a/src/lib/dhcp/tests/option6_int_array_unittest.cc
+++ b/src/lib/dhcp/tests/option6_int_array_unittest.cc
@@ -13,10 +13,11 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
+
#include <dhcp/dhcp6.h>
#include <dhcp/option.h>
-#include <dhcp/option6_int_array.h>
#include <dhcp/option6_iaaddr.h>
+#include <dhcp/option6_int_array.h>
#include <util/buffer.h>
#include <boost/pointer_cast.hpp>
diff --git a/src/lib/dhcp/tests/option6_int_unittest.cc b/src/lib/dhcp/tests/option6_int_unittest.cc
index 3d39a1a..c9eac9c 100644
--- a/src/lib/dhcp/tests/option6_int_unittest.cc
+++ b/src/lib/dhcp/tests/option6_int_unittest.cc
@@ -13,10 +13,11 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
+
#include <dhcp/dhcp6.h>
#include <dhcp/option.h>
-#include <dhcp/option6_int.h>
#include <dhcp/option6_iaaddr.h>
+#include <dhcp/option6_int.h>
#include <util/buffer.h>
#include <boost/pointer_cast.hpp>
diff --git a/src/lib/dhcp/tests/option_definition_unittest.cc b/src/lib/dhcp/tests/option_definition_unittest.cc
index 7e92680..bdf3edf 100644
--- a/src/lib/dhcp/tests/option_definition_unittest.cc
+++ b/src/lib/dhcp/tests/option_definition_unittest.cc
@@ -14,7 +14,6 @@
#include <config.h>
-#include <exceptions/exceptions.h>
#include <asiolink/io_address.h>
#include <dhcp/dhcp4.h>
#include <dhcp/dhcp6.h>
@@ -25,10 +24,11 @@
#include <dhcp/option6_int.h>
#include <dhcp/option6_int_array.h>
#include <dhcp/option_definition.h>
+#include <exceptions/exceptions.h>
-#include <gtest/gtest.h>
-#include <boost/shared_ptr.hpp>
#include <boost/pointer_cast.hpp>
+#include <boost/shared_ptr.hpp>
+#include <gtest/gtest.h>
using namespace std;
using namespace isc;
diff --git a/src/lib/dhcp/tests/option_unittest.cc b/src/lib/dhcp/tests/option_unittest.cc
index 9b046f0..50d143f 100644
--- a/src/lib/dhcp/tests/option_unittest.cc
+++ b/src/lib/dhcp/tests/option_unittest.cc
@@ -13,17 +13,19 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
-#include <iostream>
-#include <sstream>
-#include <arpa/inet.h>
-#include <gtest/gtest.h>
-#include <boost/shared_ptr.hpp>
+#include <dhcp/dhcp6.h>
+#include <dhcp/option.h>
#include <exceptions/exceptions.h>
#include <util/buffer.h>
-#include "dhcp/dhcp6.h"
-#include "dhcp/option.h"
+#include <boost/shared_ptr.hpp>
+#include <gtest/gtest.h>
+
+#include <iostream>
+#include <sstream>
+
+#include <arpa/inet.h>
using namespace std;
using namespace isc;
diff --git a/src/lib/dhcp/tests/pkt4_unittest.cc b/src/lib/dhcp/tests/pkt4_unittest.cc
index 9c8cc05..37af9c6 100644
--- a/src/lib/dhcp/tests/pkt4_unittest.cc
+++ b/src/lib/dhcp/tests/pkt4_unittest.cc
@@ -13,18 +13,22 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
-#include <iostream>
-#include <sstream>
-#include <arpa/inet.h>
-#include <gtest/gtest.h>
-#include <boost/static_assert.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/shared_array.hpp>
-#include <util/buffer.h>
+
#include <asiolink/io_address.h>
-#include <dhcp/pkt4.h>
#include <dhcp/dhcp4.h>
+#include <dhcp/pkt4.h>
#include <exceptions/exceptions.h>
+#include <util/buffer.h>
+
+#include <boost/shared_array.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/static_assert.hpp>
+#include <gtest/gtest.h>
+
+#include <iostream>
+#include <sstream>
+
+#include <arpa/inet.h>
using namespace std;
using namespace isc;
diff --git a/src/lib/dhcp/tests/pkt6_unittest.cc b/src/lib/dhcp/tests/pkt6_unittest.cc
index d6ca9b1..b2dd16a 100644
--- a/src/lib/dhcp/tests/pkt6_unittest.cc
+++ b/src/lib/dhcp/tests/pkt6_unittest.cc
@@ -13,16 +13,19 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
-#include <iostream>
-#include <sstream>
-#include <arpa/inet.h>
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include <gtest/gtest.h>
#include <asiolink/io_address.h>
+#include <dhcp/dhcp6.h>
#include <dhcp/option.h>
#include <dhcp/pkt6.h>
-#include <dhcp/dhcp6.h>
+
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <gtest/gtest.h>
+
+#include <iostream>
+#include <sstream>
+
+#include <arpa/inet.h>
using namespace std;
using namespace isc;
diff --git a/src/lib/dhcp/tests/run_unittests.cc b/src/lib/dhcp/tests/run_unittests.cc
index 0126645..bd32c4d 100644
--- a/src/lib/dhcp/tests/run_unittests.cc
+++ b/src/lib/dhcp/tests/run_unittests.cc
@@ -12,9 +12,10 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#include <gtest/gtest.h>
#include <log/logger_support.h>
+#include <gtest/gtest.h>
+
int
main(int argc, char* argv[]) {
::testing::InitGoogleTest(&argc, argv);
diff --git a/src/lib/dhcpsrv/alloc_engine.cc b/src/lib/dhcpsrv/alloc_engine.cc
index 7fb3471..4f20276 100644
--- a/src/lib/dhcpsrv/alloc_engine.cc
+++ b/src/lib/dhcpsrv/alloc_engine.cc
@@ -16,6 +16,7 @@
#include <dhcpsrv/lease_mgr_factory.h>
#include <cstring>
+
#include <string.h>
using namespace isc::asiolink;
diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.h b/src/lib/dhcpsrv/mysql_lease_mgr.h
index 642d3ed..1884da6 100644
--- a/src/lib/dhcpsrv/mysql_lease_mgr.h
+++ b/src/lib/dhcpsrv/mysql_lease_mgr.h
@@ -18,7 +18,7 @@
#include <dhcpsrv/lease_mgr.h>
#include <boost/scoped_ptr.hpp>
-#include <mysql.h>
+#include <mysql/mysql.h>
#include <time.h>
diff --git a/src/lib/dhcpsrv/tests/addr_utilities_unittest.cc b/src/lib/dhcpsrv/tests/addr_utilities_unittest.cc
index 9e08034..19f08a9 100644
--- a/src/lib/dhcpsrv/tests/addr_utilities_unittest.cc
+++ b/src/lib/dhcpsrv/tests/addr_utilities_unittest.cc
@@ -1,5 +1,5 @@
-// Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
@@ -14,13 +14,15 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
-#include <stdint.h>
-#include <stdlib.h>
+
+#include <dhcpsrv/addr_utilities.h>
#include <gtest/gtest.h>
+
#include <vector>
-#include <dhcpsrv/addr_utilities.h>
+#include <stdint.h>
+#include <stdlib.h>
using namespace std;
using namespace isc::dhcp;
diff --git a/src/lib/dhcpsrv/tests/alloc_engine_unittest.cc b/src/lib/dhcpsrv/tests/alloc_engine_unittest.cc
index 9fd8e6c..dcfb68b 100644
--- a/src/lib/dhcpsrv/tests/alloc_engine_unittest.cc
+++ b/src/lib/dhcpsrv/tests/alloc_engine_unittest.cc
@@ -24,13 +24,12 @@
#include <boost/shared_ptr.hpp>
#include <boost/scoped_ptr.hpp>
+#include <gtest/gtest.h>
#include <iostream>
#include <sstream>
#include <map>
-#include <gtest/gtest.h>
-
using namespace std;
using namespace isc;
using namespace isc::asiolink;
diff --git a/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc b/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc
index 166c08d..7b23bcf 100644
--- a/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc
@@ -17,10 +17,12 @@
#include <dhcpsrv/cfgmgr.h>
#include <exceptions/exceptions.h>
+#include <gtest/gtest.h>
+
#include <iostream>
#include <sstream>
+
#include <arpa/inet.h>
-#include <gtest/gtest.h>
using namespace std;
using namespace isc::asiolink;
diff --git a/src/lib/dhcpsrv/tests/lease_mgr_factory_unittest.cc b/src/lib/dhcpsrv/tests/lease_mgr_factory_unittest.cc
index 8c30306..40ecba3 100644
--- a/src/lib/dhcpsrv/tests/lease_mgr_factory_unittest.cc
+++ b/src/lib/dhcpsrv/tests/lease_mgr_factory_unittest.cc
@@ -17,9 +17,10 @@
#include <asiolink/io_address.h>
#include <dhcpsrv/lease_mgr_factory.h>
+#include <gtest/gtest.h>
+
#include <iostream>
#include <sstream>
-#include <gtest/gtest.h>
using namespace std;
using namespace isc::dhcp;
diff --git a/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc
index bf47867..74a0fb4 100644
--- a/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc
@@ -17,9 +17,10 @@
#include <asiolink/io_address.h>
#include <dhcpsrv/lease_mgr.h>
+#include <gtest/gtest.h>
+
#include <iostream>
#include <sstream>
-#include <gtest/gtest.h>
using namespace std;
using namespace isc;
diff --git a/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
index 721289b..0f026f2 100644
--- a/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
@@ -19,9 +19,10 @@
#include <dhcpsrv/lease_mgr.h>
#include <dhcpsrv/memfile_lease_mgr.h>
+#include <gtest/gtest.h>
+
#include <iostream>
#include <sstream>
-#include <gtest/gtest.h>
using namespace std;
using namespace isc;
diff --git a/src/lib/dhcpsrv/tests/mysql_lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/mysql_lease_mgr_unittest.cc
index 5e57090..930bc06 100644
--- a/src/lib/dhcpsrv/tests/mysql_lease_mgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/mysql_lease_mgr_unittest.cc
@@ -18,11 +18,12 @@
#include <dhcpsrv/lease_mgr_factory.h>
#include <dhcpsrv/mysql_lease_mgr.h>
+#include <gtest/gtest.h>
+
#include <iostream>
#include <sstream>
-#include <utility>
#include <string>
-#include <gtest/gtest.h>
+#include <utility>
using namespace isc;
using namespace isc::asiolink;
diff --git a/src/lib/dhcpsrv/tests/pool_unittest.cc b/src/lib/dhcpsrv/tests/pool_unittest.cc
index 8a9f825..4e18a3c 100644
--- a/src/lib/dhcpsrv/tests/pool_unittest.cc
+++ b/src/lib/dhcpsrv/tests/pool_unittest.cc
@@ -17,10 +17,11 @@
#include <asiolink/io_address.h>
#include <dhcpsrv/pool.h>
+#include <gtest/gtest.h>
+
#include <iostream>
#include <vector>
#include <sstream>
-#include <gtest/gtest.h>
using boost::scoped_ptr;
using namespace isc;
diff --git a/src/lib/dhcpsrv/tests/run_unittests.cc b/src/lib/dhcpsrv/tests/run_unittests.cc
index bd32c4d..d333a6f 100644
--- a/src/lib/dhcpsrv/tests/run_unittests.cc
+++ b/src/lib/dhcpsrv/tests/run_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
diff --git a/src/lib/dhcpsrv/tests/triplet_unittest.cc b/src/lib/dhcpsrv/tests/triplet_unittest.cc
index 8edf4fa..e80177e 100644
--- a/src/lib/dhcpsrv/tests/triplet_unittest.cc
+++ b/src/lib/dhcpsrv/tests/triplet_unittest.cc
@@ -17,9 +17,10 @@
#include <dhcpsrv/triplet.h>
#include <exceptions/exceptions.h>
-#include <stdint.h>
#include <gtest/gtest.h>
+#include <stdint.h>
+
using namespace isc::dhcp;
using namespace isc;
More information about the bind10-changes
mailing list