From: Andrei Pavel <andrei.pavel@qualitance.com>
Date: Thu, 17 Aug 2017 17:54:15 +0000 (+0300)
Subject: Merge branch 'isc-master' into config-h
X-Git-Tag: trac5458_base~2^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a8f6403d1b44f62ebb3dd3085e401b46767003a0;p=thirdparty%2Fkea.git

Merge branch 'isc-master' into config-h
---

a8f6403d1b44f62ebb3dd3085e401b46767003a0
diff --cc src/lib/cc/tests/data_unittests.cc
index aa1ea68b07,e1455ec56f..4031356db6
--- a/src/lib/cc/tests/data_unittests.cc
+++ b/src/lib/cc/tests/data_unittests.cc
@@@ -4,10 -4,9 +4,11 @@@
  // License, v. 2.0. If a copy of the MPL was not distributed with this
  // file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
 +#include <config.h>
 +
  #include <gtest/gtest.h>
  #include <boost/foreach.hpp>
+ #include <boost/pointer_cast.hpp>
  #include <boost/assign/std/vector.hpp>
  #include <climits>
  
diff --cc src/lib/config/command_mgr.cc
index df6496aaf7,bd1c04b1cb..88b3dd801f
--- a/src/lib/config/command_mgr.cc
+++ b/src/lib/config/command_mgr.cc
@@@ -4,12 -4,16 +4,18 @@@
  // License, v. 2.0. If a copy of the MPL was not distributed with this
  // file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
 +#include <config.h>
 +
+ #include <asiolink/asio_wrapper.h>
+ #include <asiolink/interval_timer.h>
+ #include <asiolink/io_service.h>
+ #include <asiolink/unix_domain_socket.h>
+ #include <asiolink/unix_domain_socket_acceptor.h>
+ #include <asiolink/unix_domain_socket_endpoint.h>
  #include <config/command_mgr.h>
- #include <config/command_socket_factory.h>
  #include <cc/data.h>
  #include <cc/command_interpreter.h>
+ #include <cc/json_feed.h>
  #include <dhcp/iface_mgr.h>
  #include <config/config_log.h>
  #include <boost/bind.hpp>
diff --cc src/lib/config/tests/command_mgr_unittests.cc
index 0b2fbbea4b,59682cd84f..b589c1902b
--- a/src/lib/config/tests/command_mgr_unittests.cc
+++ b/src/lib/config/tests/command_mgr_unittests.cc
@@@ -4,15 -4,23 +4,25 @@@
  // License, v. 2.0. If a copy of the MPL was not distributed with this
  // file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
 +#include <config.h>
 +
  #include <gtest/gtest.h>
  
+ #include <asiolink/io_service.h>
+ #include <config/base_command_mgr.h>
  #include <config/command_mgr.h>
+ #include <config/hooked_command_mgr.h>
  #include <cc/command_interpreter.h>
+ #include <hooks/hooks_manager.h>
+ #include <hooks/callout_handle.h>
+ #include <hooks/library_handle.h>
+ #include <string>
+ #include <vector>
  
- using namespace isc::data;
+ using namespace isc::asiolink;
  using namespace isc::config;
+ using namespace isc::data;
+ using namespace isc::hooks;
  using namespace std;
  
  // Test class for Command Manager
diff --cc src/lib/dhcpsrv/cfg_rsoo.cc
index a08652c2c7,b54262e57f..30f02e67c2
--- a/src/lib/dhcpsrv/cfg_rsoo.cc
+++ b/src/lib/dhcpsrv/cfg_rsoo.cc
@@@ -4,10 -4,11 +4,13 @@@
  // License, v. 2.0. If a copy of the MPL was not distributed with this
  // file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
 +#include <config.h>
 +
  #include <dhcp/dhcp6.h>
  #include <dhcpsrv/cfg_rsoo.h>
+ #include <boost/lexical_cast.hpp>
+ 
+ using namespace isc::data;
  
  namespace isc {
  namespace dhcp {
diff --cc src/lib/dhcpsrv/client_class_def.cc
index bdce904174,135982d708..d2bd3468b9
--- a/src/lib/dhcpsrv/client_class_def.cc
+++ b/src/lib/dhcpsrv/client_class_def.cc
@@@ -4,11 -4,12 +4,15 @@@
  // License, v. 2.0. If a copy of the MPL was not distributed with this
  // file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
 +#include <config.h>
 +
 +#include "client_class_def.h"
+ #include <dhcpsrv/client_class_def.h>
+ #include <dhcpsrv/cfgmgr.h>
  #include <boost/foreach.hpp>
  
+ using namespace isc::data;
+ 
  namespace isc {
  namespace dhcp {
  
diff --cc src/lib/dhcpsrv/parsers/client_class_def_parser.cc
index 82bb8bff56,01d35beb25..de0453cda3
--- a/src/lib/dhcpsrv/parsers/client_class_def_parser.cc
+++ b/src/lib/dhcpsrv/parsers/client_class_def_parser.cc
@@@ -5,11 -5,11 +5,13 @@@
  // file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
  #include <config.h>
 +
 +#include <cc/data.h>
  #include <dhcpsrv/cfgmgr.h>
  #include <dhcpsrv/client_class_def.h>
+ #include <dhcpsrv/parsers/dhcp_parsers.h>
  #include <dhcpsrv/parsers/client_class_def_parser.h>
+ #include <dhcpsrv/parsers/option_data_parser.h>
  #include <eval/eval_context.h>
  #include <asiolink/io_address.h>
  #include <asiolink/io_error.h>
diff --cc src/lib/hooks/hooks_log.cc
index 981c48d737,8e554b5166..6f75bc92df
--- a/src/lib/hooks/hooks_log.cc
+++ b/src/lib/hooks/hooks_log.cc
@@@ -6,9 -6,8 +6,10 @@@
  
  /// Defines the logger used by the Hooks
  
 +#include <config.h>
 +
  #include <hooks/hooks_log.h>
+ #include <log/macros.h>
  
  namespace isc {
  namespace hooks {
diff --cc src/lib/hooks/library_manager_collection.cc
index 7206ccaf03,ea2daa843f..0063bb1cde
--- a/src/lib/hooks/library_manager_collection.cc
+++ b/src/lib/hooks/library_manager_collection.cc
@@@ -4,9 -4,8 +4,10 @@@
  // License, v. 2.0. If a copy of the MPL was not distributed with this
  // file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
 +#include <config.h>
 +
  #include <hooks/callout_manager.h>
+ #include <hooks/hooks_manager.h>
  #include <hooks/library_manager.h>
  #include <hooks/library_manager_collection.h>
  
diff --cc src/lib/log/log_messages.cc
index 115f3f6191,e1f005cd90..34db41d967
--- a/src/lib/log/log_messages.cc
+++ b/src/lib/log/log_messages.cc
@@@ -1,7 -1,5 +1,7 @@@
- // File created from log_messages.mes on Thu Jul  7 15:32:06 2011
+ // File created from log_messages.mes on Tue Jan 24 2017 20:17
  
 +#include <config.h>
 +
  #include <cstddef>
  #include <log/message_types.h>
  #include <log/message_initializer.h>
diff --cc src/lib/testutils/io_utils.cc
index b7401d66d1,0081707e97..5590c690df
--- a/src/lib/testutils/io_utils.cc
+++ b/src/lib/testutils/io_utils.cc
@@@ -4,8 -4,7 +4,9 @@@
  // License, v. 2.0. If a copy of the MPL was not distributed with this
  // file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
 +#include <config.h>
 +
+ #include <exceptions/exceptions.h>
  #include <testutils/io_utils.h>
  #include <gtest/gtest.h>
  #include <fstream>