Browse Source

cleanup: use relative path to header files from "src/lib", i.e., s/"name.h"/<dns/name.h", etc. also removed unnecessary header files to be included.

git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@1705 e5f2f494-b856-4b98-b285-d166d9295462
JINMEI Tatuya 15 years ago
parent
commit
886bc05b44
64 changed files with 277 additions and 283 deletions
  1. 1 1
      src/lib/dns/base32.cc
  2. 2 3
      src/lib/dns/base64.cc
  3. 9 9
      src/lib/dns/dnssectime.cc
  4. 2 2
      src/lib/dns/exceptions.cc
  5. 1 1
      src/lib/dns/hex.cc
  6. 11 11
      src/lib/dns/message.cc
  7. 2 2
      src/lib/dns/message.h
  8. 3 3
      src/lib/dns/messagerenderer.cc
  9. 4 5
      src/lib/dns/name.cc
  10. 12 12
      src/lib/dns/python_dns.cc
  11. 6 6
      src/lib/dns/question.cc
  12. 3 3
      src/lib/dns/question.h
  13. 6 6
      src/lib/dns/rdata.cc
  14. 5 4
      src/lib/dns/rdata/ch_3/a_1.cc
  15. 1 1
      src/lib/dns/rdata/ch_3/a_1.h
  16. 6 6
      src/lib/dns/rdata/generic/cname_5.cc
  17. 2 2
      src/lib/dns/rdata/generic/cname_5.h
  18. 5 5
      src/lib/dns/rdata/generic/dname_39.cc
  19. 2 2
      src/lib/dns/rdata/generic/dname_39.h
  20. 7 8
      src/lib/dns/rdata/generic/dnskey_48.cc
  21. 4 4
      src/lib/dns/rdata/generic/dnskey_48.h
  22. 7 8
      src/lib/dns/rdata/generic/ds_43.cc
  23. 4 4
      src/lib/dns/rdata/generic/ds_43.h
  24. 7 6
      src/lib/dns/rdata/generic/mx_15.cc
  25. 2 2
      src/lib/dns/rdata/generic/mx_15.h
  26. 6 6
      src/lib/dns/rdata/generic/ns_2.cc
  27. 2 2
      src/lib/dns/rdata/generic/ns_2.h
  28. 11 12
      src/lib/dns/rdata/generic/nsec3_50.cc
  29. 4 4
      src/lib/dns/rdata/generic/nsec3_50.h
  30. 7 8
      src/lib/dns/rdata/generic/nsec3param_51.cc
  31. 4 4
      src/lib/dns/rdata/generic/nsec3param_51.h
  32. 9 11
      src/lib/dns/rdata/generic/nsec_47.cc
  33. 4 4
      src/lib/dns/rdata/generic/nsec_47.h
  34. 5 5
      src/lib/dns/rdata/generic/opt_41.cc
  35. 1 1
      src/lib/dns/rdata/generic/opt_41.h
  36. 6 6
      src/lib/dns/rdata/generic/ptr_12.cc
  37. 2 2
      src/lib/dns/rdata/generic/ptr_12.h
  38. 10 11
      src/lib/dns/rdata/generic/rrsig_46.cc
  39. 4 4
      src/lib/dns/rdata/generic/rrsig_46.h
  40. 7 6
      src/lib/dns/rdata/generic/soa_6.cc
  41. 2 2
      src/lib/dns/rdata/generic/soa_6.h
  42. 4 6
      src/lib/dns/rdata/generic/txt_16.cc
  43. 1 1
      src/lib/dns/rdata/generic/txt_16.h
  44. 6 5
      src/lib/dns/rdata/hs_4/a_1.cc
  45. 1 1
      src/lib/dns/rdata/hs_4/a_1.h
  46. 5 7
      src/lib/dns/rdata/in_1/a_1.cc
  47. 1 1
      src/lib/dns/rdata/in_1/a_1.h
  48. 5 7
      src/lib/dns/rdata/in_1/aaaa_28.cc
  49. 1 1
      src/lib/dns/rdata/in_1/aaaa_28.h
  50. 4 4
      src/lib/dns/rdata/template.cc
  51. 1 1
      src/lib/dns/rdata/template.h
  52. 7 6
      src/lib/dns/rrclass.cc
  53. 6 5
      src/lib/dns/rrparamregistry-placeholder.cc
  54. 2 1
      src/lib/dns/rrparamregistry.h
  55. 7 7
      src/lib/dns/rrset.cc
  56. 2 2
      src/lib/dns/rrset.h
  57. 4 4
      src/lib/dns/rrsetlist.cc
  58. 3 3
      src/lib/dns/rrsetlist.h
  59. 6 6
      src/lib/dns/rrttl.cc
  60. 8 6
      src/lib/dns/rrtype.cc
  61. 1 1
      src/lib/dns/sha1.cc
  62. 1 1
      src/lib/dns/tests/unittest_util.cc
  63. 1 1
      src/lib/dns/tsig.cc
  64. 2 2
      src/lib/dns/tsig.h

+ 1 - 1
src/lib/dns/base32.cc

@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "base32.h"
+#include <dns/base32.h>
 
 using namespace std;
 

+ 2 - 3
src/lib/dns/base64.cc

@@ -14,8 +14,6 @@
 
 // $Id$
 
-#include "config.h"
-
 #include <stdint.h>
 #include <cassert>
 #include <iterator>
@@ -26,9 +24,10 @@
 #include <boost/archive/iterators/binary_from_base64.hpp>
 #include <boost/archive/iterators/transform_width.hpp>
 
-#include "base64.h"
 #include <exceptions/exceptions.h>
 
+#include <dns/base64.h>
+
 using namespace std;
 using namespace boost::archive::iterators;
 

+ 9 - 9
src/lib/dns/dnssectime.cc

@@ -25,15 +25,15 @@
 
 #include <exceptions/exceptions.h>
 
-#include "base64.h"
-#include "buffer.h"
-#include "messagerenderer.h"
-#include "name.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rdata.h"
-#include "rdataclass.h"
-#include "dnssectime.h"
+#include <dns/base64.h>
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/name.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
+#include <dns/dnssectime.h>
 
 using namespace std;
 

+ 2 - 2
src/lib/dns/exceptions.cc

@@ -14,8 +14,8 @@
 
 // $Id$
 
-#include "exceptions.h"
-#include "message.h"
+#include <dns/exceptions.h>
+#include <dns/message.h>
 
 namespace isc {
 namespace dns {

+ 1 - 1
src/lib/dns/hex.cc

@@ -28,7 +28,7 @@
 #include <ctype.h>
 #include <stdint.h>
 
-#include "hex.h"
+#include <dns/hex.h>
 
 using namespace std;
 

+ 11 - 11
src/lib/dns/message.cc

@@ -26,17 +26,17 @@
 
 #include <exceptions/exceptions.h>
 
-#include "buffer.h"
-#include "exceptions.h"
-#include "message.h"
-#include "messagerenderer.h"
-#include "name.h"
-#include "question.h"
-#include "rdataclass.h"
-#include "rrclass.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rrset.h"
+#include <dns/buffer.h>
+#include <dns/exceptions.h>
+#include <dns/message.h>
+#include <dns/messagerenderer.h>
+#include <dns/name.h>
+#include <dns/question.h>
+#include <dns/rdataclass.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
+#include <dns/rrset.h>
 
 using namespace std;
 using namespace boost;

+ 2 - 2
src/lib/dns/message.h

@@ -25,8 +25,8 @@
 
 #include <exceptions/exceptions.h>
 
-#include "question.h"
-#include "rrset.h"
+#include <dns/question.h>
+#include <dns/rrset.h>
 
 namespace isc {
 namespace dns {

+ 3 - 3
src/lib/dns/messagerenderer.cc

@@ -18,9 +18,9 @@
 #include <cassert>
 #include <set>
 
-#include "buffer.h"
-#include "name.h"
-#include "messagerenderer.h"
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/messagerenderer.h>
 
 namespace isc {
 namespace dns {

+ 4 - 5
src/lib/dns/name.cc

@@ -20,13 +20,12 @@
 #include <functional>
 #include <vector>
 #include <iostream>
-
 #include <algorithm>
 
-#include "buffer.h"
-#include "exceptions.h"
-#include "name.h"
-#include "messagerenderer.h"
+#include <dns/buffer.h>
+#include <dns/exceptions.h>
+#include <dns/name.h>
+#include <dns/messagerenderer.h>
 
 using namespace std;
 using isc::dns::NameComparisonResult;

+ 12 - 12
src/lib/dns/python_dns.cc

@@ -27,18 +27,18 @@
 
 #include <exceptions/exceptions.h>
 
-#include "buffer.h"
-#include "name.h"
-#include "messagerenderer.h"
-#include "rrtype.h"
-#include "rrclass.h"
-#include "rrttl.h"
-#include "rrset.h"
-#include "rdata.h"
-#include "rdataclass.h"
-#include "rrsetlist.h"
-#include "question.h"
-#include "message.h"
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/messagerenderer.h>
+#include <dns/rrtype.h>
+#include <dns/rrclass.h>
+#include <dns/rrttl.h>
+#include <dns/rrset.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
+#include <dns/rrsetlist.h>
+#include <dns/question.h>
+#include <dns/message.h>
 
 using namespace isc::dns;
 using namespace boost::python;

+ 6 - 6
src/lib/dns/question.cc

@@ -17,12 +17,12 @@
 #include <iostream>
 #include <string>
 
-#include "buffer.h"
-#include "messagerenderer.h"
-#include "name.h"
-#include "question.h"
-#include "rrclass.h"
-#include "rrtype.h"
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/name.h>
+#include <dns/question.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
 
 using namespace std;
 

+ 3 - 3
src/lib/dns/question.h

@@ -22,9 +22,9 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "name.h"
-#include "rrclass.h"
-#include "rrtype.h"
+#include <dns/name.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
 
 namespace isc {
 namespace dns {

+ 6 - 6
src/lib/dns/rdata.cc

@@ -29,12 +29,12 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include "buffer.h"
-#include "name.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rrparamregistry.h"
-#include "rrtype.h"
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rrparamregistry.h>
+#include <dns/rrtype.h>
 
 using namespace std;
 using namespace boost;

+ 5 - 4
src/lib/dns/rdata/ch_3/a_1.cc

@@ -18,11 +18,12 @@
 
 #include <string>
 
-#include "buffer.h"
 #include <exceptions/exceptions.h>
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 

+ 1 - 1
src/lib/dns/rdata/ch_3/a_1.h

@@ -18,7 +18,7 @@
 
 #include <string>
 
-#include "rdata.h"
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 

+ 6 - 6
src/lib/dns/rdata/generic/cname_5.cc

@@ -14,15 +14,15 @@
 
 // $Id$
 
-#include "config.h"
+#include <config.h>
 
 #include <string>
 
-#include "buffer.h"
-#include "name.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 

+ 2 - 2
src/lib/dns/rdata/generic/cname_5.h

@@ -18,8 +18,8 @@
 
 #include <string>
 
-#include "name.h"
-#include "rdata.h"
+#include <dns/name.h>
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 

+ 5 - 5
src/lib/dns/rdata/generic/dname_39.cc

@@ -18,11 +18,11 @@
 
 #include <string>
 
-#include "buffer.h"
-#include "name.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 

+ 2 - 2
src/lib/dns/rdata/generic/dname_39.h

@@ -18,8 +18,8 @@
 
 #include <string>
 
-#include "name.h"
-#include "rdata.h"
+#include <dns/name.h>
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 

+ 7 - 8
src/lib/dns/rdata/generic/dnskey_48.cc

@@ -14,22 +14,21 @@
 
 // $Id$
 
-#include "config.h"
-
 #include <iostream>
 #include <string>
 #include <sstream>
 #include <vector>
 
-#include "base64.h"
-#include "buffer.h"
-#include "messagerenderer.h"
-#include "name.h"
-#include "rdata.h"
-#include "rdataclass.h"
 #include <boost/lexical_cast.hpp>
 #include <boost/foreach.hpp>
 
+#include <dns/base64.h>
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/name.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
+
 #include <stdio.h>
 #include <time.h>
 

+ 4 - 4
src/lib/dns/rdata/generic/dnskey_48.h

@@ -18,10 +18,10 @@
 
 #include <string>
 
-#include "name.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rdata.h"
+#include <dns/name.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
+#include <dns/rdata.h>
 
 // BEGIN_HEADER_GUARD
 

+ 7 - 8
src/lib/dns/rdata/generic/ds_43.cc

@@ -14,21 +14,20 @@
 
 // $Id$
 
-#include <config.h>
-
 #include <iostream>
 #include <string>
 #include <sstream>
 #include <vector>
 
-#include "buffer.h"
-#include "hex.h"
-#include "messagerenderer.h"
-#include "name.h"
-#include "rdata.h"
-#include "rdataclass.h"
 #include <boost/lexical_cast.hpp>
 
+#include <dns/buffer.h>
+#include <dns/hex.h>
+#include <dns/messagerenderer.h>
+#include <dns/name.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
+
 #include <stdio.h>
 #include <time.h>
 

+ 4 - 4
src/lib/dns/rdata/generic/ds_43.h

@@ -18,10 +18,10 @@
 
 #include <string>
 
-#include "name.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rdata.h"
+#include <dns/name.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
+#include <dns/rdata.h>
 
 // BEGIN_HEADER_GUARD
 

+ 7 - 6
src/lib/dns/rdata/generic/mx_15.cc

@@ -14,18 +14,19 @@
 
 // $Id$
 
-#include "config.h"
+#include <config.h>
 
 #include <string>
 
 #include <boost/lexical_cast.hpp>
 
-#include "buffer.h"
 #include <exceptions/exceptions.h>
-#include "name.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 using namespace boost;

+ 2 - 2
src/lib/dns/rdata/generic/mx_15.h

@@ -20,8 +20,8 @@
 
 #include <string>
 
-#include "name.h"
-#include "rdata.h"
+#include <dns/name.h>
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 

+ 6 - 6
src/lib/dns/rdata/generic/ns_2.cc

@@ -14,15 +14,15 @@
 
 // $Id$
 
-#include "config.h"
+#include <config.h>
 
 #include <string>
 
-#include "buffer.h"
-#include "name.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 

+ 2 - 2
src/lib/dns/rdata/generic/ns_2.h

@@ -18,8 +18,8 @@
 
 #include <string>
 
-#include "name.h"
-#include "rdata.h"
+#include <dns/name.h>
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 

+ 11 - 12
src/lib/dns/rdata/generic/nsec3_50.cc

@@ -14,26 +14,25 @@
 
 // $Id$
 
-#include "config.h"
-
 #include <iostream>
 #include <iomanip>
 #include <string>
 #include <sstream>
 #include <vector>
 
-#include "base32.h"
-#include "buffer.h"
-#include "exceptions.h"
-#include "hex.h"
-#include "messagerenderer.h"
-#include "name.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rdata.h"
-#include "rdataclass.h"
 #include <boost/lexical_cast.hpp>
 
+#include <dns/base32.h>
+#include <dns/buffer.h>
+#include <dns/exceptions.h>
+#include <dns/hex.h>
+#include <dns/messagerenderer.h>
+#include <dns/name.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
+
 #include <stdio.h>
 #include <time.h>
 

+ 4 - 4
src/lib/dns/rdata/generic/nsec3_50.h

@@ -19,10 +19,10 @@
 #include <string>
 #include <vector>
 
-#include "name.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rdata.h"
+#include <dns/name.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
+#include <dns/rdata.h>
 
 // BEGIN_HEADER_GUARD
 

+ 7 - 8
src/lib/dns/rdata/generic/nsec3param_51.cc

@@ -14,21 +14,20 @@
 
 // $Id$
 
-#include "config.h"
-
 #include <iostream>
 #include <string>
 #include <sstream>
 #include <vector>
 
-#include "buffer.h"
-#include "hex.h"
-#include "messagerenderer.h"
-#include "name.h"
-#include "rdata.h"
-#include "rdataclass.h"
 #include <boost/lexical_cast.hpp>
 
+#include <dns/buffer.h>
+#include <dns/hex.h>
+#include <dns/messagerenderer.h>
+#include <dns/name.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
+
 #include <stdio.h>
 #include <time.h>
 

+ 4 - 4
src/lib/dns/rdata/generic/nsec3param_51.h

@@ -19,10 +19,10 @@
 #include <string>
 #include <vector>
 
-#include "name.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rdata.h"
+#include <dns/name.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
+#include <dns/rdata.h>
 
 // BEGIN_HEADER_GUARD
 

+ 9 - 11
src/lib/dns/rdata/generic/nsec_47.cc

@@ -14,22 +14,20 @@
 
 // $Id$
 
-#include "config.h"
-
 #include <iostream>
 #include <string>
 #include <sstream>
 #include <vector>
 
-#include "base64.h"
-#include "buffer.h"
-#include "exceptions.h"
-#include "messagerenderer.h"
-#include "name.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rdata.h"
-#include "rdataclass.h"
+#include <dns/base64.h>
+#include <dns/buffer.h>
+#include <dns/exceptions.h>
+#include <dns/messagerenderer.h>
+#include <dns/name.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 #include <stdio.h>
 #include <time.h>

+ 4 - 4
src/lib/dns/rdata/generic/nsec_47.h

@@ -18,10 +18,10 @@
 
 #include <string>
 
-#include "name.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rdata.h"
+#include <dns/name.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
+#include <dns/rdata.h>
 
 // BEGIN_HEADER_GUARD
 

+ 5 - 5
src/lib/dns/rdata/generic/opt_41.cc

@@ -14,14 +14,14 @@
 
 // $Id$
 
-#include "config.h"
+#include <config.h>
 
 #include <string>
 
-#include "buffer.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 

+ 1 - 1
src/lib/dns/rdata/generic/opt_41.h

@@ -18,7 +18,7 @@
 
 #include <string>
 
-#include "rdata.h"
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 

+ 6 - 6
src/lib/dns/rdata/generic/ptr_12.cc

@@ -14,15 +14,15 @@
 
 // $Id$
 
-#include "config.h"
+#include <config.h>
 
 #include <string>
 
-#include "buffer.h"
-#include "name.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 

+ 2 - 2
src/lib/dns/rdata/generic/ptr_12.h

@@ -18,8 +18,8 @@
 
 #include <string>
 
-#include "name.h"
-#include "rdata.h"
+#include <dns/name.h>
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 

+ 10 - 11
src/lib/dns/rdata/generic/rrsig_46.cc

@@ -14,25 +14,24 @@
 
 // $Id$
 
-#include "config.h"
-
 #include <string>
 #include <iomanip>
 #include <iostream>
 #include <sstream>
 #include <vector>
 
-#include "base64.h"
-#include "buffer.h"
-#include "dnssectime.h"
-#include "messagerenderer.h"
-#include "name.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rdata.h"
-#include "rdataclass.h"
 #include <boost/lexical_cast.hpp>
 
+#include <dns/base64.h>
+#include <dns/buffer.h>
+#include <dns/dnssectime.h>
+#include <dns/messagerenderer.h>
+#include <dns/name.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
+
 #include <stdio.h>
 #include <time.h>
 

+ 4 - 4
src/lib/dns/rdata/generic/rrsig_46.h

@@ -18,10 +18,10 @@
 
 #include <string>
 
-#include "name.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rdata.h"
+#include <dns/name.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
+#include <dns/rdata.h>
 
 // BEGIN_HEADER_GUARD
 

+ 7 - 6
src/lib/dns/rdata/generic/soa_6.cc

@@ -14,18 +14,19 @@
 
 // $Id$
 
-#include "config.h"
+#include <config.h>
 
 #include <string>
 
 #include <boost/lexical_cast.hpp>
 
-#include "buffer.h"
 #include <exceptions/exceptions.h>
-#include "name.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 using namespace boost;

+ 2 - 2
src/lib/dns/rdata/generic/soa_6.h

@@ -18,8 +18,8 @@
 
 #include <string>
 
-#include "name.h"
-#include "rdata.h"
+#include <dns/name.h>
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 

+ 4 - 6
src/lib/dns/rdata/generic/txt_16.cc

@@ -14,18 +14,16 @@
 
 // $Id$
 
-#include "config.h"
-
 #include <stdint.h>
 #include <string.h>
 
 #include <string>
 #include <vector>
 
-#include "buffer.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 

+ 1 - 1
src/lib/dns/rdata/generic/txt_16.h

@@ -21,7 +21,7 @@
 #include <string>
 #include <vector>
 
-#include "rdata.h"
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 

+ 6 - 5
src/lib/dns/rdata/hs_4/a_1.cc

@@ -14,15 +14,16 @@
 
 // $Id$
 
-#include <config.h>             // for UNUSED
+#include <config.h>             // for UNUSED_PARAM
 
 #include <string>
 
-#include "buffer.h"
 #include <exceptions/exceptions.h>
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 

+ 1 - 1
src/lib/dns/rdata/hs_4/a_1.h

@@ -18,7 +18,7 @@
 
 #include <string>
 
-#include "rdata.h"
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 

+ 5 - 7
src/lib/dns/rdata/in_1/a_1.cc

@@ -14,8 +14,6 @@
 
 // $Id: rdata.cc 545 2010-01-27 00:33:28Z jinmei $
 
-#include "config.h"
-
 #include <stdint.h>
 #include <string.h>
 
@@ -26,11 +24,11 @@
 
 #include <exceptions/exceptions.h>
 
-#include "buffer.h"
-#include "exceptions.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+#include <dns/buffer.h>
+#include <dns/exceptions.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 

+ 1 - 1
src/lib/dns/rdata/in_1/a_1.h

@@ -18,7 +18,7 @@
 
 #include <string>
 
-#include "rdata.h"
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 

+ 5 - 7
src/lib/dns/rdata/in_1/aaaa_28.cc

@@ -14,8 +14,6 @@
 
 // $Id$
 
-#include "config.h"
-
 #include <stdint.h>
 #include <string.h>
 
@@ -26,11 +24,11 @@
 
 #include <exceptions/exceptions.h>
 
-#include "buffer.h"
-#include "exceptions.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+#include <dns/buffer.h>
+#include <dns/exceptions.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 

+ 1 - 1
src/lib/dns/rdata/in_1/aaaa_28.h

@@ -20,7 +20,7 @@
 
 #include <string>
 
-#include "rdata.h"
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 

+ 4 - 4
src/lib/dns/rdata/template.cc

@@ -16,10 +16,10 @@
 
 #include <string>
 
-#include "buffer.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 

+ 1 - 1
src/lib/dns/rdata/template.h

@@ -18,7 +18,7 @@
 
 #include <string>
 
-#include "rdata.h"
+#include <dns/rdata.h>
 
 // BEGIN_ISC_NAMESPACE
 

+ 7 - 6
src/lib/dns/rrclass.cc

@@ -14,15 +14,16 @@
 
 // $Id$
 
-#include <string>
-
 #include <stdint.h>
 
-#include "buffer.h"
+#include <string>
+
 #include <exceptions/exceptions.h>
-#include "messagerenderer.h"
-#include "rrparamregistry.h"
-#include "rrclass.h"
+
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rrparamregistry.h>
+#include <dns/rrclass.h>
 
 using namespace std;
 using namespace isc::dns;

+ 6 - 5
src/lib/dns/rrparamregistry-placeholder.cc

@@ -28,11 +28,12 @@
 #include <boost/shared_ptr.hpp>
 
 #include <exceptions/exceptions.h>
-#include "rrparamregistry.h"
-#include "rrclass.h"
-#include "rrtype.h"
-#include "rdata.h"
-#include "rdataclass.h"
+
+#include <dns/rrparamregistry.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
 
 using namespace std;
 using namespace boost;

+ 2 - 1
src/lib/dns/rrparamregistry.h

@@ -24,7 +24,8 @@
 #include <boost/shared_ptr.hpp>
 
 #include <exceptions/exceptions.h>
-#include "rdata.h"
+
+#include <dns/rdata.h>
 
 namespace isc {
 namespace dns {

+ 7 - 7
src/lib/dns/rrset.cc

@@ -20,13 +20,13 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "buffer.h"
-#include "messagerenderer.h"
-#include "name.h"
-#include "rrclass.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rrset.h"
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/name.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
+#include <dns/rrset.h>
 
 using namespace std;
 using namespace isc::dns;

+ 2 - 2
src/lib/dns/rrset.h

@@ -24,8 +24,8 @@
 
 #include <exceptions/exceptions.h>
 
-#include "rdata.h"
-#include "rrtype.h"
+#include <dns/rdata.h>
+#include <dns/rrtype.h>
 
 namespace isc {
 namespace dns {

+ 4 - 4
src/lib/dns/rrsetlist.cc

@@ -20,10 +20,10 @@
 
 #include <exceptions/exceptions.h>
 
-#include "rrclass.h"
-#include "rrtype.h"
-#include "rrset.h"
-#include "rrsetlist.h"
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
+#include <dns/rrset.h>
+#include <dns/rrsetlist.h>
 
 namespace isc {
 namespace dns {

+ 3 - 3
src/lib/dns/rrsetlist.h

@@ -23,9 +23,9 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "rrset.h"
-#include "rrclass.h"
-#include "rrtype.h"
+#include <dns/rrset.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
 
 namespace isc {
 namespace dns {

+ 6 - 6
src/lib/dns/rrttl.cc

@@ -14,15 +14,15 @@
 
 // $Id$
 
-#include <sstream>
-
 #include <stdint.h>
 
-#include "buffer.h"
-#include "messagerenderer.h"
-#include "rrttl.h"
+#include <sstream>
+#include <ostream>
+
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rrttl.h>
 
-#include <iostream>
 using namespace std;
 using namespace isc::dns;
 

+ 8 - 6
src/lib/dns/rrtype.cc

@@ -14,15 +14,17 @@
 
 // $Id$
 
-#include <string>
-
 #include <stdint.h>
 
-#include "buffer.h"
+#include <string>
+#include <ostream>
+
 #include <exceptions/exceptions.h>
-#include "messagerenderer.h"
-#include "rrparamregistry.h"
-#include "rrtype.h"
+
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rrparamregistry.h>
+#include <dns/rrtype.h>
 
 using namespace std;
 using isc::dns::RRType;

+ 1 - 1
src/lib/dns/sha1.cc

@@ -50,7 +50,7 @@
  *      without express or implied warranty of any kind.
  *      
  */
-#include "sha1.h"
+#include <dns/sha1.h>
 
 /* Local Function Prototyptes */
 static void SHA1Finalize(SHA1Context *, uint8_t Pad_Byte);

+ 1 - 1
src/lib/dns/tests/unittest_util.cc

@@ -14,7 +14,7 @@
 
 // $Id$
 
-#include "config.h"
+#include <config.h>
 
 #include <iostream>
 #include <fstream>

+ 1 - 1
src/lib/dns/tsig.cc

@@ -21,7 +21,7 @@
 
 #include <algorithm>
 
-#include "tsig.h"
+#include <dns/tsig.h>
 
 using namespace std;
 using isc::dns::MessageRenderer;

+ 2 - 2
src/lib/dns/tsig.h

@@ -22,8 +22,8 @@
 
 #include <exceptions/exceptions.h>
 
-#include "name.h"
-#include "message.h"
+#include <dns/name.h>
+#include <dns/message.h>
 
 namespace isc {
 namespace dns {