Browse Source

Fix includes

Include with " " is relative to current file - library headers need < >
and in tests .. is needed (gcc does not reject invalid relative paths
and looks into -I as well for them).

git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac408@3480 e5f2f494-b856-4b98-b285-d166d9295462
Michal Vaner 14 years ago
parent
commit
4df2548127

+ 1 - 1
src/lib/nsas/hash.cc

@@ -60,7 +60,7 @@ if advised of the possibility of such damage.
 #include <cassert>
 #include <string>
 
-#include "config.h"
+#include <config.h>
 
 #include "hash.h"
 

+ 1 - 1
src/lib/nsas/hash.h

@@ -20,7 +20,7 @@
 #include <stdint.h>
 #include <vector>
 
-#include "exceptions/exceptions.h"
+#include <exceptions/exceptions.h>
 
 #include "hash_key.h"
 

+ 2 - 2
src/lib/nsas/hash_key.cc

@@ -14,9 +14,9 @@
 
 // $Id$
 
-#include <string.h>
+#include <cstring>
 
-#include "config.h"
+#include <config.h>
 #include "hash_key.h"
 
 namespace isc {

+ 1 - 1
src/lib/nsas/hash_key.h

@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 #include <string>
-#include "config.h"
+#include <config.h>
 
 namespace isc {
 namespace nsas {

+ 1 - 1
src/lib/nsas/hash_table.h

@@ -24,7 +24,7 @@
 #include <boost/interprocess/sync/interprocess_upgradable_mutex.hpp>
 #include <list>
 
-#include "config.h"
+#include <config.h>
 
 #include "hash.h"
 #include "hash_key.h"

+ 1 - 2
src/lib/nsas/lru_list.h

@@ -25,8 +25,7 @@
 #include <boost/thread.hpp>
 #include <boost/interprocess/sync/scoped_lock.hpp>
 
-#include "config.h"
-
+#include <config.h>
 
 namespace isc {
 namespace nsas {

+ 1 - 1
src/lib/nsas/nameserver_address_store.cc

@@ -16,7 +16,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "config.h"
+#include <config.h>
 
 #include "hash_deleter.h"
 #include "nsas_entry_compare.h"

+ 1 - 1
src/lib/nsas/nameserver_address_store.h

@@ -20,7 +20,7 @@
 #include <string>
 #include <vector>
 
-#include "rrset.h"
+#include <dns/rrset.h>
 
 #include "address_request_callback.h"
 #include "hash_table.h"

+ 5 - 5
src/lib/nsas/nameserver_entry.cc

@@ -22,12 +22,12 @@
 #include <ctype.h>
 #include <strings.h>
 
-#include "config.h"
+#include <config.h>
 
-#include "exceptions/exceptions.h"
-#include "name.h"
-#include "rrclass.h"
-#include "rrttl.h"
+#include <exceptions/exceptions.h>
+#include <dns/name.h>
+#include <dns/rrclass.h>
+#include <dns/rrttl.h>
 
 #include "address_entry.h"
 #include "nameserver_entry.h"

+ 3 - 2
src/lib/nsas/nameserver_entry.h

@@ -21,13 +21,14 @@
 #include <vector>
 #include <boost/thread.hpp>
 
+#include <exceptions/exceptions.h>
+#include <dns/rrset.h>
+
 #include "address_entry.h"
 #include "asiolink.h"
-#include "exceptions/exceptions.h"
 #include "nsas_entry.h"
 #include "hash_key.h"
 #include "lru_list.h"
-#include "rrset.h"
 
 namespace isc {
 namespace nsas {

+ 1 - 1
src/lib/nsas/nsas_entry.h

@@ -19,7 +19,7 @@
 
 #include <iostream>
 
-#include "exceptions/exceptions.h"
+#include <exceptions/exceptions.h>
 
 #include "hash_key.h"
 #include "hash_table.h"

+ 2 - 2
src/lib/nsas/tests/address_entry_unittest.cc

@@ -24,8 +24,8 @@
 #include <stdint.h>
 
 
-#include "asiolink.h"
-#include "address_entry.h"
+#include "../asiolink.h"
+#include "../address_entry.h"
 
 static std::string V4A_TEXT("1.2.3.4");
 static std::string V4B_TEXT("5.6.7.8");

+ 6 - 6
src/lib/nsas/tests/hash_deleter_unittest.cc

@@ -21,14 +21,14 @@
 #include <gtest/gtest.h>
 #include <boost/lexical_cast.hpp>
 
-#include "nsas_entry.h"
-#include "hash_table.h"
-#include "hash_key.h"
-#include "lru_list.h"
-#include "hash_deleter.h"
+#include "../nsas_entry.h"
+#include "../hash_table.h"
+#include "../hash_key.h"
+#include "../lru_list.h"
+#include "../hash_deleter.h"
 
 #include "nsas_test.h"
-#include "nsas_entry_compare.h"
+#include "../nsas_entry_compare.h"
 
 using namespace std;
 

+ 1 - 1
src/lib/nsas/tests/hash_key_unittest.cc

@@ -21,7 +21,7 @@
 #include <gtest/gtest.h>
 #include <boost/lexical_cast.hpp>
 
-#include "hash_key.h"
+#include "../hash_key.h"
 
 using namespace std;
 

+ 3 - 3
src/lib/nsas/tests/hash_table_unittest.cc

@@ -21,10 +21,10 @@
 #include <string.h>
 #include <iostream>
 
-#include "hash_table.h"
-#include "hash_key.h"
+#include "../hash_table.h"
+#include "../hash_key.h"
 
-#include "nsas_entry_compare.h"
+#include "../nsas_entry_compare.h"
 #include "nsas_test.h"
 
 using namespace std;

+ 1 - 1
src/lib/nsas/tests/hash_unittest.cc

@@ -21,7 +21,7 @@
 #include <gtest/gtest.h>
 #include <boost/lexical_cast.hpp>
 
-#include "hash.h"
+#include "../hash.h"
 
 #include "nsas_test.h"
 

+ 2 - 2
src/lib/nsas/tests/lru_list_unittest.cc

@@ -22,8 +22,8 @@
 #include <gtest/gtest.h>
 #include <boost/lexical_cast.hpp>
 
-#include "nsas_entry.h"
-#include "lru_list.h"
+#include "../nsas_entry.h"
+#include "../lru_list.h"
 
 #include "nsas_test.h"
 

+ 4 - 4
src/lib/nsas/tests/nameserver_address_store_unittest.cc

@@ -32,10 +32,10 @@
 #include <vector>
 #include <cassert>
 
-#include "nameserver_address_store.h"
-#include "nsas_entry_compare.h"
-#include "nameserver_entry.h"
-#include "zone_entry.h"
+#include "../nameserver_address_store.h"
+#include "../nsas_entry_compare.h"
+#include "../nameserver_entry.h"
+#include "../zone_entry.h"
 #include "nsas_test.h"
 
 using namespace isc::dns;

+ 6 - 6
src/lib/nsas/tests/nameserver_address_unittest.cc

@@ -16,13 +16,13 @@
 
 #include <gtest/gtest.h>
 
-#include "name.h"
-#include "nameserver_address.h"
-#include "rdata.h"
-#include "rrclass.h"
-#include "rrset.h"
-#include "rrttl.h"
+#include <dns/name.h>
+#include <dns/rdata.h>
+#include <dns/rrclass.h>
+#include <dns/rrset.h>
+#include <dns/rrttl.h>
 
+#include "../nameserver_address.h"
 #include "nsas_test.h"
 
 namespace isc {

+ 9 - 9
src/lib/nsas/tests/nameserver_entry_unittest.cc

@@ -21,15 +21,15 @@
 #include <boost/foreach.hpp>
 #include <gtest/gtest.h>
 
-#include "rdata.h"
-#include "rrset.h"
-#include "rrclass.h"
-#include "rrttl.h"
-#include "name.h"
-
-#include "asiolink.h"
-#include "address_entry.h"
-#include "nameserver_entry.h"
+#include <dns/rdata.h>
+#include <dns/rrset.h>
+#include <dns/rrclass.h>
+#include <dns/rrttl.h>
+#include <dns/name.h>
+
+#include "../asiolink.h"
+#include "../address_entry.h"
+#include "../nameserver_entry.h"
 
 #include "nsas_test.h"
 

+ 2 - 2
src/lib/nsas/tests/nsas_entry_compare_unittest.cc

@@ -21,8 +21,8 @@
 #include <gtest/gtest.h>
 #include <boost/lexical_cast.hpp>
 
-#include "hash_key.h"
-#include "nsas_entry_compare.h"
+#include "../hash_key.h"
+#include "../nsas_entry_compare.h"
 #include "nsas_test.h"
 
 using namespace std;

+ 6 - 6
src/lib/nsas/tests/nsas_test.h

@@ -24,13 +24,13 @@
 
 #include <string>
 
-#include "config.h"
+#include <config.h>
 
-#include "buffer.h"
-#include "rdata.h"
-#include "rrtype.h"
-#include "messagerenderer.h"
-#include "nsas_entry.h"
+#include <dns/buffer.h>
+#include <dns/rdata.h>
+#include <dns/rrtype.h>
+#include <dns/messagerenderer.h>
+#include "../nsas_entry.h"
 
 using namespace isc::dns::rdata;
 using namespace isc::dns;

+ 3 - 3
src/lib/nsas/tests/zone_entry_unittest.cc

@@ -17,10 +17,10 @@
 #include <gtest/gtest.h>
 #include <boost/shared_ptr.hpp>
 
-#include "rrclass.h"
+#include <dns/rrclass.h>
 
-#include "asiolink.h"
-#include "zone_entry.h"
+#include "../asiolink.h"
+#include "../zone_entry.h"
 #include "../address_request_callback.h"
 
 #include "nsas_test.h"

+ 1 - 1
src/lib/nsas/zone_entry.h

@@ -23,7 +23,7 @@
 #include <boost/thread.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include "rrset.h"
+#include <dns/rrset.h>
 
 #include "hash_key.h"
 #include "nsas_entry.h"