From 5f1739873b897cf268d7f1c143099e02afe72980 Mon Sep 17 00:00:00 2001 From: JINMEI Tatuya Date: Fri, 16 Jul 2010 06:31:56 +0000 Subject: [PATCH] s/#include "header"/#include <[path/]header>/ (trac #291) git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@2517 e5f2f494-b856-4b98-b285-d166d9295462 --- src/bin/auth/Makefile.am | 1 + src/bin/auth/asio_link.cc | 6 ++--- src/bin/auth/auth_srv.cc | 4 ++-- src/bin/auth/main.cc | 10 ++++---- src/bin/host/host.cc | 16 ++++++------- src/lib/cc/data.cc | 4 ++-- src/lib/cc/session.h | 4 ++-- src/lib/cc/session_unittests.cc | 2 +- src/lib/config/ccsession.cc | 5 ++-- src/lib/config/config_data.cc | 2 +- src/lib/config/module_spec.cc | 2 +- src/lib/config/tests/ccsession_unittests.cc | 2 +- src/lib/config/tests/config_data_unittests.cc | 2 +- src/lib/config/tests/fake_session.cc | 4 ++-- src/lib/config/tests/module_spec_unittests.cc | 2 +- src/lib/datasrc/data_source.cc | 2 +- src/lib/datasrc/query.cc | 2 +- src/lib/datasrc/sqlite3_datasrc.cc | 2 +- src/lib/datasrc/sqlite3_datasrc.h | 2 +- src/lib/datasrc/static_datasrc.cc | 6 ++--- src/lib/datasrc/static_datasrc.h | 2 +- src/lib/datasrc/tests/datasrc_unittest.cc | 2 +- src/lib/datasrc/tests/static_unittest.cc | 2 +- src/lib/datasrc/tests/test_datasrc.cc | 4 ++-- src/lib/dns/python/libdns_python.cc | 24 +++++++++---------- src/lib/dns/tests/hex_unittest.cc | 2 +- src/lib/dns/tests/message_unittest.cc | 2 +- src/lib/dns/tests/messagerenderer_unittest.cc | 2 +- src/lib/dns/tests/name_unittest.cc | 2 +- src/lib/dns/tests/question_unittest.cc | 2 +- src/lib/dns/tests/rdata_cname_unittest.cc | 4 ++-- src/lib/dns/tests/rdata_dname_unittest.cc | 4 ++-- src/lib/dns/tests/rdata_dnskey_unittest.cc | 4 ++-- src/lib/dns/tests/rdata_ds_unittest.cc | 4 ++-- src/lib/dns/tests/rdata_in_a_unittest.cc | 4 ++-- src/lib/dns/tests/rdata_in_aaaa_unittest.cc | 4 ++-- src/lib/dns/tests/rdata_mx_unittest.cc | 4 ++-- src/lib/dns/tests/rdata_ns_unittest.cc | 4 ++-- src/lib/dns/tests/rdata_nsec3_unittest.cc | 4 ++-- .../dns/tests/rdata_nsec3param_unittest.cc | 4 ++-- src/lib/dns/tests/rdata_nsec_unittest.cc | 4 ++-- src/lib/dns/tests/rdata_opt_unittest.cc | 4 ++-- src/lib/dns/tests/rdata_ptr_unittest.cc | 4 ++-- src/lib/dns/tests/rdata_rrsig_unittest.cc | 4 ++-- src/lib/dns/tests/rdata_soa_unittest.cc | 4 ++-- src/lib/dns/tests/rdata_txt_unittest.cc | 4 ++-- src/lib/dns/tests/rdata_unittest.cc | 4 ++-- src/lib/dns/tests/rrclass_unittest.cc | 2 +- src/lib/dns/tests/rrset_unittest.cc | 2 +- src/lib/dns/tests/rrttl_unittest.cc | 2 +- src/lib/dns/tests/rrtype_unittest.cc | 2 +- src/lib/dns/tests/run_unittests.cc | 2 +- src/lib/dns/tests/sha1_unittest.cc | 2 +- src/lib/dns/tests/tsig_unittest.cc | 2 +- src/lib/dns/tests/unittest_util.cc | 2 +- src/lib/exceptions/exceptions.cc | 2 +- src/lib/exceptions/exceptions_unittest.cc | 2 +- src/lib/xfr/fd_share.cc | 2 +- src/lib/xfr/fdshare_python.cc | 4 ++-- src/lib/xfr/python_xfr.cc | 2 +- src/lib/xfr/xfrout_client.cc | 4 ++-- 61 files changed, 112 insertions(+), 112 deletions(-) diff --git a/src/bin/auth/Makefile.am b/src/bin/auth/Makefile.am index 43fc5626d..6c4c81226 100644 --- a/src/bin/auth/Makefile.am +++ b/src/bin/auth/Makefile.am @@ -3,6 +3,7 @@ SUBDIRS = . tests AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += -I$(top_srcdir)/src/lib/dns -I$(top_builddir)/src/lib/dns AM_CPPFLAGS += -I$(top_builddir)/src/lib/cc +AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin AM_CXXFLAGS = $(B10_CXXFLAGS) diff --git a/src/bin/auth/asio_link.cc b/src/bin/auth/asio_link.cc index 9e3c01c74..298f4e8fb 100644 --- a/src/bin/auth/asio_link.cc +++ b/src/bin/auth/asio_link.cc @@ -29,9 +29,9 @@ #include -#include "spec_config.h" // for XFROUT. should not be here. -#include "auth_srv.h" -#include "common.h" +#include // for XFROUT. should not be here. +#include +#include using namespace asio; using ip::udp; diff --git a/src/bin/auth/auth_srv.cc b/src/bin/auth/auth_srv.cc index 70744b4c0..d9cb33004 100644 --- a/src/bin/auth/auth_srv.cc +++ b/src/bin/auth/auth_srv.cc @@ -40,8 +40,8 @@ #include -#include "common.h" -#include "auth_srv.h" +#include +#include #include diff --git a/src/bin/auth/main.cc b/src/bin/auth/main.cc index a864a6847..256335b65 100644 --- a/src/bin/auth/main.cc +++ b/src/bin/auth/main.cc @@ -14,7 +14,7 @@ // $Id$ -#include "config.h" +#include #include #include @@ -39,10 +39,10 @@ #include #include -#include "spec_config.h" -#include "common.h" -#include "auth_srv.h" -#include "asio_link.h" +#include +#include +#include +#include using namespace std; using namespace isc::data; diff --git a/src/bin/host/host.cc b/src/bin/host/host.cc index 07dd659b7..2cd660e7d 100644 --- a/src/bin/host/host.cc +++ b/src/bin/host/host.cc @@ -24,14 +24,14 @@ #include #include -#include "dns/buffer.h" -#include "dns/name.h" -#include "dns/message.h" -#include "dns/messagerenderer.h" -#include "dns/rrclass.h" -#include "dns/rrtype.h" -#include "dns/rrset.h" -#include "dns/message.h" +#include +#include +#include +#include +#include +#include +#include +#include using namespace std; using namespace isc::dns; diff --git a/src/lib/cc/data.cc b/src/lib/cc/data.cc index 675d391cc..4112ae906 100644 --- a/src/lib/cc/data.cc +++ b/src/lib/cc/data.cc @@ -14,9 +14,9 @@ // $Id$ -#include "config.h" +#include -#include "data.h" +#include #include #include diff --git a/src/lib/cc/session.h b/src/lib/cc/session.h index 39baf7a1d..821215f49 100644 --- a/src/lib/cc/session.h +++ b/src/lib/cc/session.h @@ -23,8 +23,8 @@ #include -#include "data.h" -#include "session_config.h" +#include +#include namespace asio { class io_service; diff --git a/src/lib/cc/session_unittests.cc b/src/lib/cc/session_unittests.cc index 83d939c4e..307691fc1 100644 --- a/src/lib/cc/session_unittests.cc +++ b/src/lib/cc/session_unittests.cc @@ -14,7 +14,7 @@ // $Id: data_unittests.cc 1899 2010-05-21 12:03:59Z jelte $ -#include "config.h" +#include // for some IPC/network system calls in asio/detail/pipe_select_interrupter.hpp #include diff --git a/src/lib/config/ccsession.cc b/src/lib/config/ccsession.cc index a7851ba3c..49e16290e 100644 --- a/src/lib/config/ccsession.cc +++ b/src/lib/config/ccsession.cc @@ -20,7 +20,7 @@ // react on config change announcements) // -#include "config.h" +#include #include #include @@ -40,8 +40,7 @@ #include #include -#include "ccsession.h" -#include "config.h" +#include using namespace std; diff --git a/src/lib/config/config_data.cc b/src/lib/config/config_data.cc index 7a92a23cd..6a01d089c 100644 --- a/src/lib/config/config_data.cc +++ b/src/lib/config/config_data.cc @@ -14,7 +14,7 @@ // $Id$ -#include "config_data.h" +#include #include diff --git a/src/lib/config/module_spec.cc b/src/lib/config/module_spec.cc index 6a4933868..19cad4bd5 100644 --- a/src/lib/config/module_spec.cc +++ b/src/lib/config/module_spec.cc @@ -13,7 +13,7 @@ // NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION // WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -#include "module_spec.h" +#include #include #include diff --git a/src/lib/config/tests/ccsession_unittests.cc b/src/lib/config/tests/ccsession_unittests.cc index 1897bf046..67e9997d1 100644 --- a/src/lib/config/tests/ccsession_unittests.cc +++ b/src/lib/config/tests/ccsession_unittests.cc @@ -24,7 +24,7 @@ #include -#include "data_def_unittests_config.h" +#include using namespace isc::data; using namespace isc::config; diff --git a/src/lib/config/tests/config_data_unittests.cc b/src/lib/config/tests/config_data_unittests.cc index 80cdb02cc..6910f94d7 100644 --- a/src/lib/config/tests/config_data_unittests.cc +++ b/src/lib/config/tests/config_data_unittests.cc @@ -17,7 +17,7 @@ #include -#include "data_def_unittests_config.h" +#include #include #include diff --git a/src/lib/config/tests/fake_session.cc b/src/lib/config/tests/fake_session.cc index e8fc4fb4e..8d082bb86 100644 --- a/src/lib/config/tests/fake_session.cc +++ b/src/lib/config/tests/fake_session.cc @@ -14,7 +14,7 @@ // $Id: session.cc 1250 2010-03-09 22:52:15Z jinmei $ -#include "config.h" +#include #include @@ -28,7 +28,7 @@ #include #include -#include "fake_session.h" +#include using namespace std; using namespace isc::cc; diff --git a/src/lib/config/tests/module_spec_unittests.cc b/src/lib/config/tests/module_spec_unittests.cc index 98f6570c6..1bf72b1e2 100644 --- a/src/lib/config/tests/module_spec_unittests.cc +++ b/src/lib/config/tests/module_spec_unittests.cc @@ -20,7 +20,7 @@ #include -#include "data_def_unittests_config.h" +#include using namespace isc::data; using namespace isc::config; diff --git a/src/lib/datasrc/data_source.cc b/src/lib/datasrc/data_source.cc index fac22cce6..43c5c60f0 100644 --- a/src/lib/datasrc/data_source.cc +++ b/src/lib/datasrc/data_source.cc @@ -14,7 +14,7 @@ // $Id$ -#include "config.h" +#include #include #include diff --git a/src/lib/datasrc/query.cc b/src/lib/datasrc/query.cc index 9b431ec39..4b01f7520 100644 --- a/src/lib/datasrc/query.cc +++ b/src/lib/datasrc/query.cc @@ -21,7 +21,7 @@ #include -#include "query.h" +#include using namespace isc::dns; diff --git a/src/lib/datasrc/sqlite3_datasrc.cc b/src/lib/datasrc/sqlite3_datasrc.cc index 7dd80ec3b..571fa3cdf 100644 --- a/src/lib/datasrc/sqlite3_datasrc.cc +++ b/src/lib/datasrc/sqlite3_datasrc.cc @@ -19,7 +19,7 @@ #include -#include "sqlite3_datasrc.h" +#include #include #include diff --git a/src/lib/datasrc/sqlite3_datasrc.h b/src/lib/datasrc/sqlite3_datasrc.h index 3d263b79b..26cbac109 100644 --- a/src/lib/datasrc/sqlite3_datasrc.h +++ b/src/lib/datasrc/sqlite3_datasrc.h @@ -21,7 +21,7 @@ #include -#include "data_source.h" +#include namespace isc { diff --git a/src/lib/datasrc/static_datasrc.cc b/src/lib/datasrc/static_datasrc.cc index ada53a2be..2259fe5ba 100644 --- a/src/lib/datasrc/static_datasrc.cc +++ b/src/lib/datasrc/static_datasrc.cc @@ -14,7 +14,7 @@ // $Id$ -#include "config.h" +#include #include @@ -26,8 +26,8 @@ #include #include -#include "data_source.h" -#include "static_datasrc.h" +#include +#include using namespace std; using namespace isc::dns; diff --git a/src/lib/datasrc/static_datasrc.h b/src/lib/datasrc/static_datasrc.h index 129de6b13..f61550ece 100644 --- a/src/lib/datasrc/static_datasrc.h +++ b/src/lib/datasrc/static_datasrc.h @@ -25,7 +25,7 @@ #ifndef __STATIC_DATA_SOURCE_H #define __STATIC_DATA_SOURCE_H -#include "data_source.h" +#include namespace isc { diff --git a/src/lib/datasrc/tests/datasrc_unittest.cc b/src/lib/datasrc/tests/datasrc_unittest.cc index b56a782a0..fa1cd5b25 100644 --- a/src/lib/datasrc/tests/datasrc_unittest.cc +++ b/src/lib/datasrc/tests/datasrc_unittest.cc @@ -39,7 +39,7 @@ #include #include -#include "test_datasrc.h" +#include using isc::UnitTestUtil; using namespace std; diff --git a/src/lib/datasrc/tests/static_unittest.cc b/src/lib/datasrc/tests/static_unittest.cc index 5ac3e0640..2bb6225a4 100644 --- a/src/lib/datasrc/tests/static_unittest.cc +++ b/src/lib/datasrc/tests/static_unittest.cc @@ -18,7 +18,7 @@ #include #include -#include "config.h" +#include #include diff --git a/src/lib/datasrc/tests/test_datasrc.cc b/src/lib/datasrc/tests/test_datasrc.cc index d79908457..f249861b4 100644 --- a/src/lib/datasrc/tests/test_datasrc.cc +++ b/src/lib/datasrc/tests/test_datasrc.cc @@ -14,14 +14,14 @@ // $Id$ -#include "config.h" +#include #include #include #include -#include "test_datasrc.h" +#include #include diff --git a/src/lib/dns/python/libdns_python.cc b/src/lib/dns/python/libdns_python.cc index 6c07773bd..62af5ec99 100644 --- a/src/lib/dns/python/libdns_python.cc +++ b/src/lib/dns/python/libdns_python.cc @@ -27,7 +27,7 @@ #include #include -#include "config.h" +#include #include @@ -36,22 +36,22 @@ #include #include -#include "libdns_python_common.h" +#include // For our 'general' isc::Exception static PyObject* po_IscException; // order is important here! -#include "messagerenderer_python.cc" -#include "name_python.cc" // needs Messagerenderer -#include "rrclass_python.cc" // needs Messagerenderer -#include "rrtype_python.cc" // needs Messagerenderer -#include "rrttl_python.cc" // needs Messagerenderer -#include "rdata_python.cc" // needs Type, Class -#include "rrset_python.cc" // needs Rdata, RRTTL -#include "question_python.cc" // needs RRClass, RRType, RRTTL, - // Name -#include "message_python.cc" // needs RRset, Question +#include +#include // needs Messagerenderer +#include // needs Messagerenderer +#include // needs Messagerenderer +#include // needs Messagerenderer +#include // needs Type, Class +#include // needs Rdata, RRTTL +#include // needs RRClass, RRType, RRTTL, + // Name +#include // needs RRset, Question // // Definition of the module diff --git a/src/lib/dns/tests/hex_unittest.cc b/src/lib/dns/tests/hex_unittest.cc index 2ba96238e..38226a5f9 100644 --- a/src/lib/dns/tests/hex_unittest.cc +++ b/src/lib/dns/tests/hex_unittest.cc @@ -23,7 +23,7 @@ #include -#include "unittest_util.h" +#include using isc::UnitTestUtil; using namespace std; diff --git a/src/lib/dns/tests/message_unittest.cc b/src/lib/dns/tests/message_unittest.cc index 410714fba..3ac8da469 100644 --- a/src/lib/dns/tests/message_unittest.cc +++ b/src/lib/dns/tests/message_unittest.cc @@ -28,7 +28,7 @@ #include -#include "unittest_util.h" +#include using isc::UnitTestUtil; using namespace std; diff --git a/src/lib/dns/tests/messagerenderer_unittest.cc b/src/lib/dns/tests/messagerenderer_unittest.cc index 67db27d3f..d4a826695 100644 --- a/src/lib/dns/tests/messagerenderer_unittest.cc +++ b/src/lib/dns/tests/messagerenderer_unittest.cc @@ -20,7 +20,7 @@ #include #include -#include "unittest_util.h" +#include #include diff --git a/src/lib/dns/tests/name_unittest.cc b/src/lib/dns/tests/name_unittest.cc index f5dc84e11..0be9287c8 100644 --- a/src/lib/dns/tests/name_unittest.cc +++ b/src/lib/dns/tests/name_unittest.cc @@ -26,7 +26,7 @@ #include #include -#include "unittest_util.h" +#include #include diff --git a/src/lib/dns/tests/question_unittest.cc b/src/lib/dns/tests/question_unittest.cc index 06670b42c..eaf2e3359 100644 --- a/src/lib/dns/tests/question_unittest.cc +++ b/src/lib/dns/tests/question_unittest.cc @@ -29,7 +29,7 @@ #include -#include "unittest_util.h" +#include using isc::UnitTestUtil; using namespace std; diff --git a/src/lib/dns/tests/rdata_cname_unittest.cc b/src/lib/dns/tests/rdata_cname_unittest.cc index 966413b78..fcb47e504 100644 --- a/src/lib/dns/tests/rdata_cname_unittest.cc +++ b/src/lib/dns/tests/rdata_cname_unittest.cc @@ -24,8 +24,8 @@ #include -#include "unittest_util.h" -#include "rdata_unittest.h" +#include +#include using isc::UnitTestUtil; using namespace std; diff --git a/src/lib/dns/tests/rdata_dname_unittest.cc b/src/lib/dns/tests/rdata_dname_unittest.cc index 6dbd79ebe..f8f788bd4 100644 --- a/src/lib/dns/tests/rdata_dname_unittest.cc +++ b/src/lib/dns/tests/rdata_dname_unittest.cc @@ -24,8 +24,8 @@ #include -#include "unittest_util.h" -#include "rdata_unittest.h" +#include +#include using isc::UnitTestUtil; using namespace std; diff --git a/src/lib/dns/tests/rdata_dnskey_unittest.cc b/src/lib/dns/tests/rdata_dnskey_unittest.cc index 5dcbbe159..457d3db62 100644 --- a/src/lib/dns/tests/rdata_dnskey_unittest.cc +++ b/src/lib/dns/tests/rdata_dnskey_unittest.cc @@ -26,8 +26,8 @@ #include -#include "unittest_util.h" -#include "rdata_unittest.h" +#include +#include using isc::UnitTestUtil; using namespace std; diff --git a/src/lib/dns/tests/rdata_ds_unittest.cc b/src/lib/dns/tests/rdata_ds_unittest.cc index 9724a34e4..87e05f1f2 100644 --- a/src/lib/dns/tests/rdata_ds_unittest.cc +++ b/src/lib/dns/tests/rdata_ds_unittest.cc @@ -25,8 +25,8 @@ #include -#include "unittest_util.h" -#include "rdata_unittest.h" +#include +#include using isc::UnitTestUtil; using namespace std; diff --git a/src/lib/dns/tests/rdata_in_a_unittest.cc b/src/lib/dns/tests/rdata_in_a_unittest.cc index b4383b8e3..8c0388a8a 100644 --- a/src/lib/dns/tests/rdata_in_a_unittest.cc +++ b/src/lib/dns/tests/rdata_in_a_unittest.cc @@ -24,8 +24,8 @@ #include -#include "unittest_util.h" -#include "rdata_unittest.h" +#include +#include using isc::UnitTestUtil; using namespace std; diff --git a/src/lib/dns/tests/rdata_in_aaaa_unittest.cc b/src/lib/dns/tests/rdata_in_aaaa_unittest.cc index 4fe42a572..c1b46cf94 100644 --- a/src/lib/dns/tests/rdata_in_aaaa_unittest.cc +++ b/src/lib/dns/tests/rdata_in_aaaa_unittest.cc @@ -24,8 +24,8 @@ #include -#include "unittest_util.h" -#include "rdata_unittest.h" +#include +#include using isc::UnitTestUtil; using namespace std; diff --git a/src/lib/dns/tests/rdata_mx_unittest.cc b/src/lib/dns/tests/rdata_mx_unittest.cc index 547e5d54a..df840eacd 100644 --- a/src/lib/dns/tests/rdata_mx_unittest.cc +++ b/src/lib/dns/tests/rdata_mx_unittest.cc @@ -23,8 +23,8 @@ #include -#include "unittest_util.h" -#include "rdata_unittest.h" +#include +#include using isc::UnitTestUtil; using namespace std; diff --git a/src/lib/dns/tests/rdata_ns_unittest.cc b/src/lib/dns/tests/rdata_ns_unittest.cc index 481f78f32..59a942df2 100644 --- a/src/lib/dns/tests/rdata_ns_unittest.cc +++ b/src/lib/dns/tests/rdata_ns_unittest.cc @@ -24,8 +24,8 @@ #include -#include "unittest_util.h" -#include "rdata_unittest.h" +#include +#include using isc::UnitTestUtil; using namespace std; diff --git a/src/lib/dns/tests/rdata_nsec3_unittest.cc b/src/lib/dns/tests/rdata_nsec3_unittest.cc index caf01731c..a648a3a61 100644 --- a/src/lib/dns/tests/rdata_nsec3_unittest.cc +++ b/src/lib/dns/tests/rdata_nsec3_unittest.cc @@ -28,8 +28,8 @@ #include -#include "unittest_util.h" -#include "rdata_unittest.h" +#include +#include using isc::UnitTestUtil; using namespace std; diff --git a/src/lib/dns/tests/rdata_nsec3param_unittest.cc b/src/lib/dns/tests/rdata_nsec3param_unittest.cc index a80bf7e84..c35806d59 100644 --- a/src/lib/dns/tests/rdata_nsec3param_unittest.cc +++ b/src/lib/dns/tests/rdata_nsec3param_unittest.cc @@ -27,8 +27,8 @@ #include -#include "unittest_util.h" -#include "rdata_unittest.h" +#include +#include using isc::UnitTestUtil; using namespace std; diff --git a/src/lib/dns/tests/rdata_nsec_unittest.cc b/src/lib/dns/tests/rdata_nsec_unittest.cc index 950361d6d..b5ce3966e 100644 --- a/src/lib/dns/tests/rdata_nsec_unittest.cc +++ b/src/lib/dns/tests/rdata_nsec_unittest.cc @@ -26,8 +26,8 @@ #include -#include "unittest_util.h" -#include "rdata_unittest.h" +#include +#include using isc::UnitTestUtil; using namespace std; diff --git a/src/lib/dns/tests/rdata_opt_unittest.cc b/src/lib/dns/tests/rdata_opt_unittest.cc index 5991ee3ff..3d806b0c2 100644 --- a/src/lib/dns/tests/rdata_opt_unittest.cc +++ b/src/lib/dns/tests/rdata_opt_unittest.cc @@ -23,8 +23,8 @@ #include -#include "unittest_util.h" -#include "rdata_unittest.h" +#include +#include using isc::UnitTestUtil; using namespace std; diff --git a/src/lib/dns/tests/rdata_ptr_unittest.cc b/src/lib/dns/tests/rdata_ptr_unittest.cc index 6cd770874..6d6771805 100644 --- a/src/lib/dns/tests/rdata_ptr_unittest.cc +++ b/src/lib/dns/tests/rdata_ptr_unittest.cc @@ -24,8 +24,8 @@ #include -#include "unittest_util.h" -#include "rdata_unittest.h" +#include +#include using isc::UnitTestUtil; using namespace std; diff --git a/src/lib/dns/tests/rdata_rrsig_unittest.cc b/src/lib/dns/tests/rdata_rrsig_unittest.cc index b2ffefef4..900e4a5a6 100644 --- a/src/lib/dns/tests/rdata_rrsig_unittest.cc +++ b/src/lib/dns/tests/rdata_rrsig_unittest.cc @@ -25,8 +25,8 @@ #include -#include "unittest_util.h" -#include "rdata_unittest.h" +#include +#include using isc::UnitTestUtil; using namespace std; diff --git a/src/lib/dns/tests/rdata_soa_unittest.cc b/src/lib/dns/tests/rdata_soa_unittest.cc index 8fdcffaa1..9458e9fde 100644 --- a/src/lib/dns/tests/rdata_soa_unittest.cc +++ b/src/lib/dns/tests/rdata_soa_unittest.cc @@ -23,8 +23,8 @@ #include -#include "unittest_util.h" -#include "rdata_unittest.h" +#include +#include using isc::UnitTestUtil; using namespace std; diff --git a/src/lib/dns/tests/rdata_txt_unittest.cc b/src/lib/dns/tests/rdata_txt_unittest.cc index d56bcaeaa..ee3df0a3a 100644 --- a/src/lib/dns/tests/rdata_txt_unittest.cc +++ b/src/lib/dns/tests/rdata_txt_unittest.cc @@ -24,8 +24,8 @@ #include -#include "unittest_util.h" -#include "rdata_unittest.h" +#include +#include using isc::UnitTestUtil; using namespace std; diff --git a/src/lib/dns/tests/rdata_unittest.cc b/src/lib/dns/tests/rdata_unittest.cc index 1d09e11d2..fe891f2f4 100644 --- a/src/lib/dns/tests/rdata_unittest.cc +++ b/src/lib/dns/tests/rdata_unittest.cc @@ -27,8 +27,8 @@ #include -#include "unittest_util.h" -#include "rdata_unittest.h" +#include +#include using isc::UnitTestUtil; using namespace std; diff --git a/src/lib/dns/tests/rrclass_unittest.cc b/src/lib/dns/tests/rrclass_unittest.cc index f57c96313..b34fef9f9 100644 --- a/src/lib/dns/tests/rrclass_unittest.cc +++ b/src/lib/dns/tests/rrclass_unittest.cc @@ -20,7 +20,7 @@ #include #include -#include "unittest_util.h" +#include using namespace std; using namespace isc; diff --git a/src/lib/dns/tests/rrset_unittest.cc b/src/lib/dns/tests/rrset_unittest.cc index 831cc31f1..9c68712ee 100644 --- a/src/lib/dns/tests/rrset_unittest.cc +++ b/src/lib/dns/tests/rrset_unittest.cc @@ -28,7 +28,7 @@ #include -#include "unittest_util.h" +#include using isc::UnitTestUtil; diff --git a/src/lib/dns/tests/rrttl_unittest.cc b/src/lib/dns/tests/rrttl_unittest.cc index 3ef4750db..2ec099442 100644 --- a/src/lib/dns/tests/rrttl_unittest.cc +++ b/src/lib/dns/tests/rrttl_unittest.cc @@ -20,7 +20,7 @@ #include #include -#include "unittest_util.h" +#include using namespace std; using namespace isc; diff --git a/src/lib/dns/tests/rrtype_unittest.cc b/src/lib/dns/tests/rrtype_unittest.cc index ddfc5d96f..123e99d29 100644 --- a/src/lib/dns/tests/rrtype_unittest.cc +++ b/src/lib/dns/tests/rrtype_unittest.cc @@ -20,7 +20,7 @@ #include #include -#include "unittest_util.h" +#include using namespace std; using namespace isc; diff --git a/src/lib/dns/tests/run_unittests.cc b/src/lib/dns/tests/run_unittests.cc index 9706f9dd8..20d56731c 100644 --- a/src/lib/dns/tests/run_unittests.cc +++ b/src/lib/dns/tests/run_unittests.cc @@ -16,7 +16,7 @@ #include -#include "unittest_util.h" +#include int main(int argc, char* argv[]) { diff --git a/src/lib/dns/tests/sha1_unittest.cc b/src/lib/dns/tests/sha1_unittest.cc index 3c51b0a74..ca46ec0ec 100644 --- a/src/lib/dns/tests/sha1_unittest.cc +++ b/src/lib/dns/tests/sha1_unittest.cc @@ -21,7 +21,7 @@ #include -#include "unittest_util.h" +#include using isc::UnitTestUtil; using namespace std; diff --git a/src/lib/dns/tests/tsig_unittest.cc b/src/lib/dns/tests/tsig_unittest.cc index 7f2a4dd73..420acbe61 100644 --- a/src/lib/dns/tests/tsig_unittest.cc +++ b/src/lib/dns/tests/tsig_unittest.cc @@ -18,7 +18,7 @@ #include -#include "unittest_util.h" +#include using isc::UnitTestUtil; using namespace std; diff --git a/src/lib/dns/tests/unittest_util.cc b/src/lib/dns/tests/unittest_util.cc index 1718eaf04..414f41098 100644 --- a/src/lib/dns/tests/unittest_util.cc +++ b/src/lib/dns/tests/unittest_util.cc @@ -26,7 +26,7 @@ #include #include -#include "unittest_util.h" +#include using namespace std; diff --git a/src/lib/exceptions/exceptions.cc b/src/lib/exceptions/exceptions.cc index 1d5df24a4..62d747de7 100644 --- a/src/lib/exceptions/exceptions.cc +++ b/src/lib/exceptions/exceptions.cc @@ -16,7 +16,7 @@ #include -#include "exceptions.h" +#include using isc::Exception; diff --git a/src/lib/exceptions/exceptions_unittest.cc b/src/lib/exceptions/exceptions_unittest.cc index 96c205a0a..7d5990cff 100644 --- a/src/lib/exceptions/exceptions_unittest.cc +++ b/src/lib/exceptions/exceptions_unittest.cc @@ -17,7 +17,7 @@ #include #include -#include "exceptions.h" +#include #include diff --git a/src/lib/xfr/fd_share.cc b/src/lib/xfr/fd_share.cc index 6f75b077e..bc7824ba6 100644 --- a/src/lib/xfr/fd_share.cc +++ b/src/lib/xfr/fd_share.cc @@ -21,7 +21,7 @@ #include #include #include // for malloc and free -#include "fd_share.h" +#include namespace isc { namespace xfr { diff --git a/src/lib/xfr/fdshare_python.cc b/src/lib/xfr/fdshare_python.cc index 1d60fdf86..014bf6405 100644 --- a/src/lib/xfr/fdshare_python.cc +++ b/src/lib/xfr/fdshare_python.cc @@ -18,9 +18,9 @@ #include #include -#include "config.h" +#include -#include "fd_share.h" +#include static PyObject* fdshare_recv_fd(PyObject *self UNUSED_PARAM, PyObject *args) diff --git a/src/lib/xfr/python_xfr.cc b/src/lib/xfr/python_xfr.cc index a403be2cb..4257b57b7 100644 --- a/src/lib/xfr/python_xfr.cc +++ b/src/lib/xfr/python_xfr.cc @@ -23,7 +23,7 @@ #include #include -#include "fd_share.h" +#include using namespace isc::xfr; using namespace boost::python; diff --git a/src/lib/xfr/xfrout_client.cc b/src/lib/xfr/xfrout_client.cc index a8dc8dcde..b216e8b55 100644 --- a/src/lib/xfr/xfrout_client.cc +++ b/src/lib/xfr/xfrout_client.cc @@ -22,8 +22,8 @@ #include #include -#include "fd_share.h" -#include "xfrout_client.h" +#include +#include using namespace std; using asio::local::stream_protocol; -- GitLab