From 216cc297fd40dc067b159f39b47cd1887f5a97f6 Mon Sep 17 00:00:00 2001
From: Francis Dupont <fdupont@isc.org>
Date: Mon, 15 Jan 2018 23:06:29 +0100
Subject: [PATCH] [master] Reordered get_config_unittest.cc includes to avoid
 boost 1.66.0 / Ubuntu 16.04 LTS issue

---
 src/bin/dhcp4/tests/get_config_unittest.cc      | 6 +++---
 src/bin/dhcp4/tests/get_config_unittest.cc.skel | 6 +++---
 src/bin/dhcp6/tests/get_config_unittest.cc      | 6 +++---
 src/bin/dhcp6/tests/get_config_unittest.cc.skel | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/bin/dhcp4/tests/get_config_unittest.cc b/src/bin/dhcp4/tests/get_config_unittest.cc
index 06056faedb..1f6833d25f 100644
--- a/src/bin/dhcp4/tests/get_config_unittest.cc
+++ b/src/bin/dhcp4/tests/get_config_unittest.cc
@@ -13,12 +13,12 @@
 #include <testutils/user_context_utils.h>
 #include <dhcp/tests/iface_mgr_test_config.h>
 #include <dhcpsrv/cfgmgr.h>
-#include <dhcp4/tests/dhcp4_test_utils.h>
-#include <dhcp4/tests/get_config_unittest.h>
+#include <dhcpsrv/parsers/simple_parser4.h>
 #include <dhcp4/dhcp4_srv.h>
 #include <dhcp4/ctrl_dhcp4_srv.h>
 #include <dhcp4/json_config_parser.h>
-#include <dhcpsrv/parsers/simple_parser4.h>
+#include <dhcp4/tests/dhcp4_test_utils.h>
+#include <dhcp4/tests/get_config_unittest.h>
 
 #include <boost/algorithm/string.hpp>
 #include <gtest/gtest.h>
diff --git a/src/bin/dhcp4/tests/get_config_unittest.cc.skel b/src/bin/dhcp4/tests/get_config_unittest.cc.skel
index 4a0242c7d6..97a1dae3b7 100644
--- a/src/bin/dhcp4/tests/get_config_unittest.cc.skel
+++ b/src/bin/dhcp4/tests/get_config_unittest.cc.skel
@@ -13,12 +13,12 @@
 #include <testutils/user_context_utils.h>
 #include <dhcp/tests/iface_mgr_test_config.h>
 #include <dhcpsrv/cfgmgr.h>
-#include <dhcp4/tests/dhcp4_test_utils.h>
-#include <dhcp4/tests/get_config_unittest.h>
+#include <dhcpsrv/parsers/simple_parser4.h>
 #include <dhcp4/dhcp4_srv.h>
 #include <dhcp4/ctrl_dhcp4_srv.h>
 #include <dhcp4/json_config_parser.h>
-#include <dhcpsrv/parsers/simple_parser4.h>
+#include <dhcp4/tests/dhcp4_test_utils.h>
+#include <dhcp4/tests/get_config_unittest.h>
 
 #include <boost/algorithm/string.hpp>
 #include <gtest/gtest.h>
diff --git a/src/bin/dhcp6/tests/get_config_unittest.cc b/src/bin/dhcp6/tests/get_config_unittest.cc
index 24b3529bfc..ec436977f0 100644
--- a/src/bin/dhcp6/tests/get_config_unittest.cc
+++ b/src/bin/dhcp6/tests/get_config_unittest.cc
@@ -14,12 +14,12 @@
 #include <testutils/user_context_utils.h>
 #include <dhcp/tests/iface_mgr_test_config.h>
 #include <dhcpsrv/cfgmgr.h>
-#include <dhcp6/tests/dhcp6_test_utils.h>
-#include <dhcp6/tests/get_config_unittest.h>
+#include <dhcpsrv/parsers/simple_parser6.h>
 #include <dhcp6/dhcp6_srv.h>
 #include <dhcp6/ctrl_dhcp6_srv.h>
 #include <dhcp6/json_config_parser.h>
-#include <dhcpsrv/parsers/simple_parser6.h>
+#include <dhcp6/tests/dhcp6_test_utils.h>
+#include <dhcp6/tests/get_config_unittest.h>
 
 #include <boost/algorithm/string.hpp>
 #include <gtest/gtest.h>
diff --git a/src/bin/dhcp6/tests/get_config_unittest.cc.skel b/src/bin/dhcp6/tests/get_config_unittest.cc.skel
index 50c71cd53d..e17b6288c8 100644
--- a/src/bin/dhcp6/tests/get_config_unittest.cc.skel
+++ b/src/bin/dhcp6/tests/get_config_unittest.cc.skel
@@ -14,12 +14,12 @@
 #include <testutils/user_context_utils.h>
 #include <dhcp/tests/iface_mgr_test_config.h>
 #include <dhcpsrv/cfgmgr.h>
-#include <dhcp6/tests/dhcp6_test_utils.h>
-#include <dhcp6/tests/get_config_unittest.h>
+#include <dhcpsrv/parsers/simple_parser6.h>
 #include <dhcp6/dhcp6_srv.h>
 #include <dhcp6/ctrl_dhcp6_srv.h>
 #include <dhcp6/json_config_parser.h>
-#include <dhcpsrv/parsers/simple_parser6.h>
+#include <dhcp6/tests/dhcp6_test_utils.h>
+#include <dhcp6/tests/get_config_unittest.h>
 
 #include <boost/algorithm/string.hpp>
 #include <gtest/gtest.h>
-- 
2.47.2