[#1308] removed boost/function.hpp and boost/bind.hpp

diff --git a/m4macros/ax_boost_for_kea.m4 b/m4macros/ax_boost_for_kea.m4
index ebb6a61dbfa41ebbec027ee7b32dec37bc96b80e..e4f3496dff87fd02468af15aeb3edd6d1e6950bf 100644 (file)
--- a/m4macros/ax_boost_for_kea.m4
+++ b/m4macros/ax_boost_for_kea.m4
@@ -74,7 +74,7 @@ if test "${boost_include_path}" ; then
        BOOST_INCLUDES="-isystem ${boost_include_path}"
        CPPFLAGS="$CPPFLAGS $BOOST_INCLUDES"
 fi
-AC_CHECK_HEADERS([boost/shared_ptr.hpp boost/foreach.hpp boost/interprocess/sync/interprocess_upgradable_mutex.hpp boost/date_time/posix_time/posix_time_types.hpp boost/bind.hpp boost/function.hpp boost/asio.hpp boost/asio/ip/address.hpp boost/asio/signal_set.hpp boost/system/error_code.hpp boost/atomic.hpp boost/circular_buffer.hpp boost/functional/hash.hpp],,
+AC_CHECK_HEADERS([boost/shared_ptr.hpp boost/foreach.hpp boost/interprocess/sync/interprocess_upgradable_mutex.hpp boost/date_time/posix_time/posix_time_types.hpp boost/asio.hpp boost/asio/ip/address.hpp boost/asio/signal_set.hpp boost/system/error_code.hpp boost/atomic.hpp boost/circular_buffer.hpp boost/functional/hash.hpp],,
   AC_MSG_ERROR([Missing required header files.]))
 
 AC_CHECK_HEADERS(boost/asio/coroutine.hpp,,AC_MSG_RESULT(not found, using built-in header.))

diff --git a/src/bin/d2/tests/d2_update_mgr_unittests.cc b/src/bin/d2/tests/d2_update_mgr_unittests.cc
index fc65d2ce5111ccb4c92f79ab16c8148f60dec5f4..72bcb07ca316135d99067297570a13f8b2f92d78 100644 (file)
--- a/src/bin/d2/tests/d2_update_mgr_unittests.cc
+++ b/src/bin/d2/tests/d2_update_mgr_unittests.cc
@@ -12,8 +12,6 @@
 #include <process/testutils/d_test_stubs.h>
 #include <util/time_utilities.h>
 
-#include <boost/function.hpp>
-#include <boost/bind.hpp>
 #include <gtest/gtest.h>
 #include <gtest/gtest.h>
 #include <algorithm>

diff --git a/src/bin/d2/tests/nc_add_unittests.cc b/src/bin/d2/tests/nc_add_unittests.cc
index c11062c372ae27d0ae354a1952f1ec02493450bc..7a3dcc2ed6e29f01fa10a1bbed0ada145469687a 100644 (file)
--- a/src/bin/d2/tests/nc_add_unittests.cc
+++ b/src/bin/d2/tests/nc_add_unittests.cc
@@ -13,8 +13,6 @@
 #include <dns/messagerenderer.h>
 #include <nc_test_utils.h>
 
-#include <boost/function.hpp>
-#include <boost/bind.hpp>
 #include <gtest/gtest.h>
 
 using namespace std;

diff --git a/src/bin/d2/tests/nc_remove_unittests.cc b/src/bin/d2/tests/nc_remove_unittests.cc
index d2ee9e46909a4b509ffa21843ca9210cc040912d..31b2d40a1565532ff30f549e1425f9642f21ee27 100644 (file)
--- a/src/bin/d2/tests/nc_remove_unittests.cc
+++ b/src/bin/d2/tests/nc_remove_unittests.cc
@@ -13,8 +13,6 @@
 #include <dns/messagerenderer.h>
 #include <nc_test_utils.h>
 
-#include <boost/function.hpp>
-#include <boost/bind.hpp>
 #include <gtest/gtest.h>
 
 using namespace std;

diff --git a/src/bin/perfdhcp/test_control.h b/src/bin/perfdhcp/test_control.h
index a951ac1d79fcb44225de36faa6548fe17e3ae3fb..54acd8a9db57cb7e1bd26139ccf48ff9f2860abb 100644 (file)
--- a/src/bin/perfdhcp/test_control.h
+++ b/src/bin/perfdhcp/test_control.h
@@ -22,7 +22,6 @@
 
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/function.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 
 #include <string>

diff --git a/src/hooks/dhcp/high_availability/tests/ha_service_unittest.cc b/src/hooks/dhcp/high_availability/tests/ha_service_unittest.cc
index fa0d6e2deba71b119abdd33833bd2bdad8c6fb08..f8f74b215a09f626dac91b400a349e756787c969 100644 (file)
--- a/src/hooks/dhcp/high_availability/tests/ha_service_unittest.cc
+++ b/src/hooks/dhcp/high_availability/tests/ha_service_unittest.cc
@@ -35,7 +35,6 @@
 #include <http/response_json.h>
 #include <util/multi_threading_mgr.h>
 
-#include <boost/bind.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/pointer_cast.hpp>
 #include <boost/shared_ptr.hpp>

diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds.cc b/src/hooks/dhcp/lease_cmds/lease_cmds.cc
index 688c3b03921162a650eb0700dde1ad7e520bab46..80c0859560a470df9ced419a36b0d08a0adec396 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/lease_cmds.cc
+++ b/src/hooks/dhcp/lease_cmds/lease_cmds.cc
@@ -30,7 +30,6 @@
 #include <util/multi_threading_mgr.h>
 #include <util/strutil.h>
 
-#include <boost/bind.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/algorithm/string.hpp>
 #include <string>

diff --git a/src/hooks/dhcp/user_chk/tests/user_file_unittests.cc b/src/hooks/dhcp/user_chk/tests/user_file_unittests.cc
index 4f8922b2fb545191676e13dc1d4d6c8eb4895763..7cca3f6ff8b8232ebfb67ed066861093eb264a58 100644 (file)
--- a/src/hooks/dhcp/user_chk/tests/user_file_unittests.cc
+++ b/src/hooks/dhcp/user_chk/tests/user_file_unittests.cc
@@ -10,8 +10,6 @@
 #include <test_data_files_config.h>
 #include <user_file.h>
 
-#include <boost/function.hpp>
-#include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 #include <gtest/gtest.h>
 

diff --git a/src/hooks/dhcp/user_chk/tests/user_registry_unittests.cc b/src/hooks/dhcp/user_chk/tests/user_registry_unittests.cc
index b624691d6a4e3039b71edf9857c960343858daa1..4f59c82d800fa1d0370a23f46e344f0914d9e85b 100644 (file)
--- a/src/hooks/dhcp/user_chk/tests/user_registry_unittests.cc
+++ b/src/hooks/dhcp/user_chk/tests/user_registry_unittests.cc
@@ -12,8 +12,6 @@
 #include <user_file.h>
 #include <test_data_files_config.h>
 
-#include <boost/function.hpp>
-#include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 #include <gtest/gtest.h>
 

diff --git a/src/hooks/dhcp/user_chk/tests/user_unittests.cc b/src/hooks/dhcp/user_chk/tests/user_unittests.cc
index 3672bed9ccd508efd76f95da296f17bddab88d80..c68b2bb51bc1e065d2170cf89a5258ce530c54a0 100644 (file)
--- a/src/hooks/dhcp/user_chk/tests/user_unittests.cc
+++ b/src/hooks/dhcp/user_chk/tests/user_unittests.cc
@@ -9,8 +9,6 @@
 #include <exceptions/exceptions.h>
 #include <user.h>
 
-#include <boost/function.hpp>
-#include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 #include <gtest/gtest.h>
 

diff --git a/src/hooks/dhcp/user_chk/tests/userid_unittests.cc b/src/hooks/dhcp/user_chk/tests/userid_unittests.cc
index 7d3a9dc0f13798c099fc723dcbdd5722f3bbaea6..832a79254c6547e0f502b84d4a7dfd1057677c2b 100644 (file)
--- a/src/hooks/dhcp/user_chk/tests/userid_unittests.cc
+++ b/src/hooks/dhcp/user_chk/tests/userid_unittests.cc
@@ -9,8 +9,6 @@
 #include <exceptions/exceptions.h>
 #include <user.h>
 
-#include <boost/function.hpp>
-#include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 #include <gtest/gtest.h>
 

diff --git a/src/lib/asiolink/tcp_socket.h b/src/lib/asiolink/tcp_socket.h
index 0ebffa37d2dd3d82940b949602bdce2a03ed3d3e..b98907a17a49f1b2b52eb7efe3cbcf528991f0dd 100644 (file)
--- a/src/lib/asiolink/tcp_socket.h
+++ b/src/lib/asiolink/tcp_socket.h
@@ -19,7 +19,6 @@
 #include <cassert>
 #include <cstddef>
 
-#include <boost/bind.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 
 #include <util/buffer.h>

diff --git a/src/lib/asiolink/tests/tcp_socket_unittest.cc b/src/lib/asiolink/tests/tcp_socket_unittest.cc
index e2477220992d574b6d0ff4b154fbb0eb2c1b6bf8..f7474189b0e783477fe8c0dd747c910d060ebe4f 100644 (file)
--- a/src/lib/asiolink/tests/tcp_socket_unittest.cc
+++ b/src/lib/asiolink/tests/tcp_socket_unittest.cc
@@ -18,7 +18,6 @@
 #include <util/buffer.h>
 #include <util/io_utilities.h>
 
-#include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 #include <gtest/gtest.h>
 

diff --git a/src/lib/asiolink/tests/udp_socket_unittest.cc b/src/lib/asiolink/tests/udp_socket_unittest.cc
index 4f61200aa3cf6278bfbc176a62d34f3e911c9f3e..9bbe6ba00fbd3d336c0ed6cf719feba92c7177e2 100644 (file)
--- a/src/lib/asiolink/tests/udp_socket_unittest.cc
+++ b/src/lib/asiolink/tests/udp_socket_unittest.cc
@@ -18,7 +18,6 @@
 #include <util/buffer.h>
 #include <util/io_utilities.h>
 
-#include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 #include <gtest/gtest.h>
 

diff --git a/src/lib/cc/tests/command_interpreter_unittests.cc b/src/lib/cc/tests/command_interpreter_unittests.cc
index 1ab02a72b2b5d6a422c44e7b250d989ec56b4d5e..1d7c6179a567e6cdef4a7c4cd4724843f4ed1ad2 100644 (file)
--- a/src/lib/cc/tests/command_interpreter_unittests.cc
+++ b/src/lib/cc/tests/command_interpreter_unittests.cc
@@ -7,11 +7,13 @@
 #include <config.h>
 
 #include <gtest/gtest.h>
+
 #include <cc/command_interpreter.h>
 #include <config/tests/data_def_unittests_config.h>
 #include <log/logger_name.h>
+
 #include <boost/scoped_ptr.hpp>
-#include <boost/bind.hpp>
+
 #include <fstream>
 
 using namespace isc::data;

diff --git a/src/lib/dhcp/option.h b/src/lib/dhcp/option.h
index 1c77397456e5ad55c01f3865440cbbd387d2e65f..1d6fba232836a651d07f3c8f160f44b07de42d81 100644 (file)
--- a/src/lib/dhcp/option.h
+++ b/src/lib/dhcp/option.h
@@ -9,7 +9,6 @@
 
 #include <util/buffer.h>
 
-#include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
 
 #include <map>

diff --git a/src/lib/dhcp/packet_queue.h b/src/lib/dhcp/packet_queue.h
index 393c5a48c15062969241203a9c3bc64ff681a8d0..f75591024669139f2dffe912bfe2d2bcd298c967 100644 (file)
--- a/src/lib/dhcp/packet_queue.h
+++ b/src/lib/dhcp/packet_queue.h
@@ -12,7 +12,6 @@
 #include <dhcp/pkt4.h>
 #include <dhcp/pkt6.h>
 
-#include <boost/function.hpp>
 #include <boost/circular_buffer.hpp>
 #include <sstream>
 

diff --git a/src/lib/dhcp/packet_queue_ring.h b/src/lib/dhcp/packet_queue_ring.h
index b2a6b39b075fe4b30c59b4a5650b24ebcc6e9220..fd9f82f3fd3859459acf9431f431b93e03ba24ab 100644 (file)
--- a/src/lib/dhcp/packet_queue_ring.h
+++ b/src/lib/dhcp/packet_queue_ring.h
@@ -9,7 +9,6 @@
 
 #include <dhcp/packet_queue.h>
 
-#include <boost/function.hpp>
 #include <boost/circular_buffer.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <sstream>

diff --git a/src/lib/dhcp/tests/option_unittest.cc b/src/lib/dhcp/tests/option_unittest.cc
index 9fbbc4f9f9a75fb80eae88e86105a5d2fdaa44da..1ed4068eb28f52ab834f0428690675612834ec2f 100644 (file)
--- a/src/lib/dhcp/tests/option_unittest.cc
+++ b/src/lib/dhcp/tests/option_unittest.cc
@@ -14,7 +14,6 @@
 #include <exceptions/exceptions.h>
 #include <util/buffer.h>
 
-#include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <gtest/gtest.h>

diff --git a/src/lib/dhcp/tests/pkt6_unittest.cc b/src/lib/dhcp/tests/pkt6_unittest.cc
index a81ea86dd3ffe370b18c03f826bd6f65f57c43ba..a33f0804104c6e0062c68c4a795baf5757033cb6 100644 (file)
--- a/src/lib/dhcp/tests/pkt6_unittest.cc
+++ b/src/lib/dhcp/tests/pkt6_unittest.cc
@@ -24,7 +24,6 @@
 #include <dhcp/tests/pkt_captures.h>
 #include <testutils/gtest_utils.h>
 #include <util/range_utilities.h>
-#include <boost/bind.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/pointer_cast.hpp>

diff --git a/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
index d62827996762c91155e5b5b34d4819e7cfcdb358..25d4a5541bfeabb47a5e340559034107c04ec253 100644 (file)
--- a/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
@@ -23,7 +23,6 @@
 #include <util/range_utilities.h>
 #include <util/stopwatch.h>
 
-#include <boost/bind.hpp>
 #include <gtest/gtest.h>
 
 #include <cstdlib>

diff --git a/src/lib/dns/master_lexer_state.h b/src/lib/dns/master_lexer_state.h
index a040fe4a38b3fd59ae78218c9339f4fd31f1b705..b7adca0741a5d30be8b07ae653ee121a4031797b 100644 (file)
--- a/src/lib/dns/master_lexer_state.h
+++ b/src/lib/dns/master_lexer_state.h
@@ -9,8 +9,6 @@
 
 #include <dns/master_lexer.h>
 
-#include <boost/function.hpp>
-
 namespace isc {
 namespace dns {
 

diff --git a/src/lib/dns/tests/master_lexer_unittest.cc b/src/lib/dns/tests/master_lexer_unittest.cc
index e19c7c31b641d99c57a31592a5a60dba1acdbdbd..4da00de976af7470cba863abb381dc440c8a8b81 100644 (file)
--- a/src/lib/dns/tests/master_lexer_unittest.cc
+++ b/src/lib/dns/tests/master_lexer_unittest.cc
@@ -14,9 +14,7 @@
 #include <gtest/gtest.h>
 
 #include <boost/lexical_cast.hpp>
-#include <boost/function.hpp>
 #include <boost/scoped_ptr.hpp>
-#include <boost/bind.hpp>
 
 #include <string>
 #include <sstream>

diff --git a/src/lib/dns/tests/rdata_txt_like_unittest.cc b/src/lib/dns/tests/rdata_txt_like_unittest.cc
index cf4872050ed22f71c9c8df7877416f862a03babe..f465968a2545f40572d3c833f77613dd272ea84e 100644 (file)
--- a/src/lib/dns/tests/rdata_txt_like_unittest.cc
+++ b/src/lib/dns/tests/rdata_txt_like_unittest.cc
@@ -19,8 +19,6 @@
 
 #include <gtest/gtest.h>
 
-#include <boost/bind.hpp>
-
 #include <string>
 #include <sstream>
 #include <vector>

diff --git a/src/lib/dns/tests/rrparamregistry_unittest.cc b/src/lib/dns/tests/rrparamregistry_unittest.cc
index 103b55c5c50ebf3860f9ac0bab13ed097e3567b6..0b7e6a154600f8e0ce9f49782422f639c93c7a4c 100644 (file)
--- a/src/lib/dns/tests/rrparamregistry_unittest.cc
+++ b/src/lib/dns/tests/rrparamregistry_unittest.cc
@@ -21,7 +21,6 @@
 #include <dns/master_loader.h>
 
 #include <boost/scoped_ptr.hpp>
-#include <boost/bind.hpp>
 
 using namespace std;
 using namespace isc::dns;

diff --git a/src/lib/util/tests/thread_pool_unittest.cc b/src/lib/util/tests/thread_pool_unittest.cc
index 41daecc8559efaedb4586e0fdb4d777bee0c321a..c39f61e785496dcbbc1b6e752df014251cffc0a3 100644 (file)
--- a/src/lib/util/tests/thread_pool_unittest.cc
+++ b/src/lib/util/tests/thread_pool_unittest.cc
@@ -11,8 +11,6 @@
 #include <exceptions/exceptions.h>
 #include <util/thread_pool.h>
 
-#include <boost/function.hpp>
-
 using namespace isc;
 using namespace isc::util;
 using namespace std;