[svn] commit: r3480 - in /branches/trac408/src/lib/nsas: ./ tests/
BIND 10 source code commits
bind10-changes at lists.isc.org
Sat Nov 6 22:15:35 UTC 2010
Author: vorner
Date: Sat Nov 6 22:15:21 2010
New Revision: 3480
Log:
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).
Modified:
branches/trac408/src/lib/nsas/hash.cc
branches/trac408/src/lib/nsas/hash.h
branches/trac408/src/lib/nsas/hash_key.cc
branches/trac408/src/lib/nsas/hash_key.h
branches/trac408/src/lib/nsas/hash_table.h
branches/trac408/src/lib/nsas/lru_list.h
branches/trac408/src/lib/nsas/nameserver_address_store.cc
branches/trac408/src/lib/nsas/nameserver_address_store.h
branches/trac408/src/lib/nsas/nameserver_entry.cc
branches/trac408/src/lib/nsas/nameserver_entry.h
branches/trac408/src/lib/nsas/nsas_entry.h
branches/trac408/src/lib/nsas/tests/address_entry_unittest.cc
branches/trac408/src/lib/nsas/tests/hash_deleter_unittest.cc
branches/trac408/src/lib/nsas/tests/hash_key_unittest.cc
branches/trac408/src/lib/nsas/tests/hash_table_unittest.cc
branches/trac408/src/lib/nsas/tests/hash_unittest.cc
branches/trac408/src/lib/nsas/tests/lru_list_unittest.cc
branches/trac408/src/lib/nsas/tests/nameserver_address_store_unittest.cc
branches/trac408/src/lib/nsas/tests/nameserver_address_unittest.cc
branches/trac408/src/lib/nsas/tests/nameserver_entry_unittest.cc
branches/trac408/src/lib/nsas/tests/nsas_entry_compare_unittest.cc
branches/trac408/src/lib/nsas/tests/nsas_test.h
branches/trac408/src/lib/nsas/tests/zone_entry_unittest.cc
branches/trac408/src/lib/nsas/zone_entry.h
Modified: branches/trac408/src/lib/nsas/hash.cc
==============================================================================
--- branches/trac408/src/lib/nsas/hash.cc (original)
+++ branches/trac408/src/lib/nsas/hash.cc Sat Nov 6 22:15:21 2010
@@ -60,7 +60,7 @@
#include <cassert>
#include <string>
-#include "config.h"
+#include <config.h>
#include "hash.h"
Modified: branches/trac408/src/lib/nsas/hash.h
==============================================================================
--- branches/trac408/src/lib/nsas/hash.h (original)
+++ branches/trac408/src/lib/nsas/hash.h Sat Nov 6 22:15:21 2010
@@ -20,7 +20,7 @@
#include <stdint.h>
#include <vector>
-#include "exceptions/exceptions.h"
+#include <exceptions/exceptions.h>
#include "hash_key.h"
Modified: branches/trac408/src/lib/nsas/hash_key.cc
==============================================================================
--- branches/trac408/src/lib/nsas/hash_key.cc (original)
+++ branches/trac408/src/lib/nsas/hash_key.cc Sat Nov 6 22:15:21 2010
@@ -14,9 +14,9 @@
// $Id$
-#include <string.h>
+#include <cstring>
-#include "config.h"
+#include <config.h>
#include "hash_key.h"
namespace isc {
Modified: branches/trac408/src/lib/nsas/hash_key.h
==============================================================================
--- branches/trac408/src/lib/nsas/hash_key.h (original)
+++ branches/trac408/src/lib/nsas/hash_key.h Sat Nov 6 22:15:21 2010
@@ -19,7 +19,7 @@
#include <stdint.h>
#include <string>
-#include "config.h"
+#include <config.h>
namespace isc {
namespace nsas {
Modified: branches/trac408/src/lib/nsas/hash_table.h
==============================================================================
--- branches/trac408/src/lib/nsas/hash_table.h (original)
+++ branches/trac408/src/lib/nsas/hash_table.h Sat Nov 6 22:15:21 2010
@@ -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"
Modified: branches/trac408/src/lib/nsas/lru_list.h
==============================================================================
--- branches/trac408/src/lib/nsas/lru_list.h (original)
+++ branches/trac408/src/lib/nsas/lru_list.h Sat Nov 6 22:15:21 2010
@@ -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 {
Modified: branches/trac408/src/lib/nsas/nameserver_address_store.cc
==============================================================================
--- branches/trac408/src/lib/nsas/nameserver_address_store.cc (original)
+++ branches/trac408/src/lib/nsas/nameserver_address_store.cc Sat Nov 6 22:15:21 2010
@@ -16,7 +16,7 @@
#include <boost/shared_ptr.hpp>
-#include "config.h"
+#include <config.h>
#include "hash_deleter.h"
#include "nsas_entry_compare.h"
Modified: branches/trac408/src/lib/nsas/nameserver_address_store.h
==============================================================================
--- branches/trac408/src/lib/nsas/nameserver_address_store.h (original)
+++ branches/trac408/src/lib/nsas/nameserver_address_store.h Sat Nov 6 22:15:21 2010
@@ -20,7 +20,7 @@
#include <string>
#include <vector>
-#include "rrset.h"
+#include <dns/rrset.h>
#include "address_request_callback.h"
#include "hash_table.h"
Modified: branches/trac408/src/lib/nsas/nameserver_entry.cc
==============================================================================
--- branches/trac408/src/lib/nsas/nameserver_entry.cc (original)
+++ branches/trac408/src/lib/nsas/nameserver_entry.cc Sat Nov 6 22:15:21 2010
@@ -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"
Modified: branches/trac408/src/lib/nsas/nameserver_entry.h
==============================================================================
--- branches/trac408/src/lib/nsas/nameserver_entry.h (original)
+++ branches/trac408/src/lib/nsas/nameserver_entry.h Sat Nov 6 22:15:21 2010
@@ -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 {
Modified: branches/trac408/src/lib/nsas/nsas_entry.h
==============================================================================
--- branches/trac408/src/lib/nsas/nsas_entry.h (original)
+++ branches/trac408/src/lib/nsas/nsas_entry.h Sat Nov 6 22:15:21 2010
@@ -19,7 +19,7 @@
#include <iostream>
-#include "exceptions/exceptions.h"
+#include <exceptions/exceptions.h>
#include "hash_key.h"
#include "hash_table.h"
Modified: branches/trac408/src/lib/nsas/tests/address_entry_unittest.cc
==============================================================================
--- branches/trac408/src/lib/nsas/tests/address_entry_unittest.cc (original)
+++ branches/trac408/src/lib/nsas/tests/address_entry_unittest.cc Sat Nov 6 22:15:21 2010
@@ -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");
Modified: branches/trac408/src/lib/nsas/tests/hash_deleter_unittest.cc
==============================================================================
--- branches/trac408/src/lib/nsas/tests/hash_deleter_unittest.cc (original)
+++ branches/trac408/src/lib/nsas/tests/hash_deleter_unittest.cc Sat Nov 6 22:15:21 2010
@@ -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;
Modified: branches/trac408/src/lib/nsas/tests/hash_key_unittest.cc
==============================================================================
--- branches/trac408/src/lib/nsas/tests/hash_key_unittest.cc (original)
+++ branches/trac408/src/lib/nsas/tests/hash_key_unittest.cc Sat Nov 6 22:15:21 2010
@@ -21,7 +21,7 @@
#include <gtest/gtest.h>
#include <boost/lexical_cast.hpp>
-#include "hash_key.h"
+#include "../hash_key.h"
using namespace std;
Modified: branches/trac408/src/lib/nsas/tests/hash_table_unittest.cc
==============================================================================
--- branches/trac408/src/lib/nsas/tests/hash_table_unittest.cc (original)
+++ branches/trac408/src/lib/nsas/tests/hash_table_unittest.cc Sat Nov 6 22:15:21 2010
@@ -21,10 +21,10 @@
#include <string.h>
#include <iostream>
-#include "hash_table.h"
-#include "hash_key.h"
-
-#include "nsas_entry_compare.h"
+#include "../hash_table.h"
+#include "../hash_key.h"
+
+#include "../nsas_entry_compare.h"
#include "nsas_test.h"
using namespace std;
Modified: branches/trac408/src/lib/nsas/tests/hash_unittest.cc
==============================================================================
--- branches/trac408/src/lib/nsas/tests/hash_unittest.cc (original)
+++ branches/trac408/src/lib/nsas/tests/hash_unittest.cc Sat Nov 6 22:15:21 2010
@@ -21,7 +21,7 @@
#include <gtest/gtest.h>
#include <boost/lexical_cast.hpp>
-#include "hash.h"
+#include "../hash.h"
#include "nsas_test.h"
Modified: branches/trac408/src/lib/nsas/tests/lru_list_unittest.cc
==============================================================================
--- branches/trac408/src/lib/nsas/tests/lru_list_unittest.cc (original)
+++ branches/trac408/src/lib/nsas/tests/lru_list_unittest.cc Sat Nov 6 22:15:21 2010
@@ -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"
Modified: branches/trac408/src/lib/nsas/tests/nameserver_address_store_unittest.cc
==============================================================================
--- branches/trac408/src/lib/nsas/tests/nameserver_address_store_unittest.cc (original)
+++ branches/trac408/src/lib/nsas/tests/nameserver_address_store_unittest.cc Sat Nov 6 22:15:21 2010
@@ -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;
Modified: branches/trac408/src/lib/nsas/tests/nameserver_address_unittest.cc
==============================================================================
--- branches/trac408/src/lib/nsas/tests/nameserver_address_unittest.cc (original)
+++ branches/trac408/src/lib/nsas/tests/nameserver_address_unittest.cc Sat Nov 6 22:15:21 2010
@@ -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 {
Modified: branches/trac408/src/lib/nsas/tests/nameserver_entry_unittest.cc
==============================================================================
--- branches/trac408/src/lib/nsas/tests/nameserver_entry_unittest.cc (original)
+++ branches/trac408/src/lib/nsas/tests/nameserver_entry_unittest.cc Sat Nov 6 22:15:21 2010
@@ -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"
Modified: branches/trac408/src/lib/nsas/tests/nsas_entry_compare_unittest.cc
==============================================================================
--- branches/trac408/src/lib/nsas/tests/nsas_entry_compare_unittest.cc (original)
+++ branches/trac408/src/lib/nsas/tests/nsas_entry_compare_unittest.cc Sat Nov 6 22:15:21 2010
@@ -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;
Modified: branches/trac408/src/lib/nsas/tests/nsas_test.h
==============================================================================
--- branches/trac408/src/lib/nsas/tests/nsas_test.h (original)
+++ branches/trac408/src/lib/nsas/tests/nsas_test.h Sat Nov 6 22:15:21 2010
@@ -24,13 +24,13 @@
#include <string>
-#include "config.h"
-
-#include "buffer.h"
-#include "rdata.h"
-#include "rrtype.h"
-#include "messagerenderer.h"
-#include "nsas_entry.h"
+#include <config.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;
Modified: branches/trac408/src/lib/nsas/tests/zone_entry_unittest.cc
==============================================================================
--- branches/trac408/src/lib/nsas/tests/zone_entry_unittest.cc (original)
+++ branches/trac408/src/lib/nsas/tests/zone_entry_unittest.cc Sat Nov 6 22:15:21 2010
@@ -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"
Modified: branches/trac408/src/lib/nsas/zone_entry.h
==============================================================================
--- branches/trac408/src/lib/nsas/zone_entry.h (original)
+++ branches/trac408/src/lib/nsas/zone_entry.h Sat Nov 6 22:15:21 2010
@@ -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"
More information about the bind10-changes
mailing list