[#3208] reordered includes

diff --git a/src/lib/dns/message.h b/src/lib/dns/message.h
index 7e942413c9f1ba3baa79f256c128251e2b8cba10..eb6e3f0cf43bd5edc957923bbfab075985aa272b 100644 (file)
--- a/src/lib/dns/message.h
+++ b/src/lib/dns/message.h
@@ -94,7 +94,8 @@ public:
     using pointer = T*;
     using reference = T&;
 
-    SectionIterator() : impl_(0) {}
+    SectionIterator() : impl_(0) {
+    }
     SectionIterator(const SectionIteratorImpl<T>& impl);
     ~SectionIterator();
     SectionIterator(const SectionIterator<T>& source);

diff --git a/src/lib/dns/messagerenderer.h b/src/lib/dns/messagerenderer.h
index 804f5c5f284f3237f4fbb306da97584cdcbeda43..7ee2277449c37b4c8e1b71fa7cdebc9326450d36 100644 (file)
--- a/src/lib/dns/messagerenderer.h
+++ b/src/lib/dns/messagerenderer.h
@@ -390,7 +390,3 @@ private:
 }
 }
 #endif // MESSAGERENDERER_H
-
-// Local Variables:
-// mode: c++
-// End:

diff --git a/src/lib/dns/name_internal.h b/src/lib/dns/name_internal.h
index 9864622e53424b1ce734e1920e6896d49958cb92..6c5a336d5f530c4122162c27310337a4a8cdd2e6 100644 (file)
--- a/src/lib/dns/name_internal.h
+++ b/src/lib/dns/name_internal.h
@@ -29,7 +29,3 @@ extern const uint8_t maptolower[];
 } // end of dns
 } // end of isc
 #endif // NAME_INTERNAL_H
-
-// Local Variables:
-// mode: c++
-// End:

diff --git a/src/lib/dns/rdataclass.cc b/src/lib/dns/rdataclass.cc
index b7c7bdb658c03db4fea50ac5833dc9f3092cf91c..c173c30af11c55321e09d2c597a8a62cd4ee45ea 100644 (file)
--- a/src/lib/dns/rdataclass.cc
+++ b/src/lib/dns/rdataclass.cc
@@ -578,8 +578,7 @@ A::A(const std::string&) {
 }
 
 A::A(MasterLexer&, const Name*,
-     MasterLoader::Options, MasterLoaderCallbacks&)
-{
+     MasterLoader::Options, MasterLoaderCallbacks&) {
     // TBD
 }
 
@@ -609,7 +608,8 @@ A::toText() const {
 
 int
 A::compare(const Rdata&) const {
-    return (0);                 // dummy.  TBD
+    // TBD
+    return (0);
 }
 
 } // end of namespace "ch"

diff --git a/src/lib/dns/tests/rdata_in_a_unittest.cc b/src/lib/dns/tests/rdata_in_a_unittest.cc
index f870ad8b997f4580ebd8ad3941907ed53e9b9508..9994e6ee1a8b30e8203438e8c3445c800882d77e 100644 (file)
--- a/src/lib/dns/tests/rdata_in_a_unittest.cc
+++ b/src/lib/dns/tests/rdata_in_a_unittest.cc
@@ -7,8 +7,6 @@
 #include <config.h>
 
 #include <dns/rdataclass.h>
-
-#include <util/buffer.h>
 #include <dns/exceptions.h>
 #include <dns/messagerenderer.h>
 #include <dns/master_lexer.h>
@@ -16,13 +14,13 @@
 #include <dns/rdata.h>
 #include <dns/rrclass.h>
 #include <dns/rrtype.h>
-
-#include <gtest/gtest.h>
-
 #include <dns/tests/unittest_util.h>
 #include <dns/tests/rdata_unittest.h>
+#include <util/buffer.h>
 #include <util/unittests/wiredata.h>
 
+#include <gtest/gtest.h>
+
 #include <sstream>
 
 #include <arpa/inet.h>

diff --git a/src/lib/dns/tests/rdata_in_aaaa_unittest.cc b/src/lib/dns/tests/rdata_in_aaaa_unittest.cc
index 34777d8962c26ffd73d7a703cfca6f2cbec85168..cb608d0bd001251f4c46f348c06ca2f1711fce52 100644 (file)
--- a/src/lib/dns/tests/rdata_in_aaaa_unittest.cc
+++ b/src/lib/dns/tests/rdata_in_aaaa_unittest.cc
@@ -6,20 +6,19 @@
 
 #include <config.h>
 
-#include <util/buffer.h>
 #include <dns/exceptions.h>
 #include <dns/messagerenderer.h>
 #include <dns/rdata.h>
 #include <dns/rdataclass.h>
 #include <dns/rrclass.h>
 #include <dns/rrtype.h>
-
-#include <gtest/gtest.h>
-
 #include <dns/tests/unittest_util.h>
 #include <dns/tests/rdata_unittest.h>
+#include <util/buffer.h>
 #include <util/unittests/wiredata.h>
 
+#include <gtest/gtest.h>
+
 using namespace std;
 using namespace isc::dns;
 using namespace isc::util;

diff --git a/src/lib/dns/tests/tsig_unittest.cc b/src/lib/dns/tests/tsig_unittest.cc
index 39df5bddfec65591f5c79e67958406113287b60f..f63cc7a23c3d6586e57126403ecddf3abb74b2fb 100644 (file)
--- a/src/lib/dns/tests/tsig_unittest.cc
+++ b/src/lib/dns/tests/tsig_unittest.cc
@@ -6,22 +6,7 @@
 
 #include <config.h>
 
-#include <time.h>
-#include <string>
-#include <stdexcept>
-#include <vector>
-
-#include <boost/scoped_ptr.hpp>
-
-#include <gtest/gtest.h>
-
 #include <exceptions/exceptions.h>
-
-#include <util/buffer.h>
-#include <util/encode/encode.h>
-#include <util/unittests/newhook.h>
-#include <util/time_utilities.h>
-
 #include <dns/message.h>
 #include <dns/messagerenderer.h>
 #include <dns/question.h>
@@ -32,10 +17,22 @@
 #include <dns/tsig.h>
 #include <dns/tsigkey.h>
 #include <dns/tsigrecord.h>
-
 #include <dns/tests/unittest_util.h>
+#include <util/buffer.h>
+#include <util/encode/encode.h>
+#include <util/unittests/newhook.h>
+#include <util/time_utilities.h>
 #include <util/unittests/wiredata.h>
 
+#include <time.h>
+#include <string>
+#include <stdexcept>
+#include <vector>
+
+#include <boost/scoped_ptr.hpp>
+
+#include <gtest/gtest.h>
+
 using namespace std;
 using namespace isc;
 using namespace isc::dns;

diff --git a/src/lib/dns/txt_like.h b/src/lib/dns/txt_like.h
index eef7a2f032df232a9552b65c40cf1e4f44e448f6..23b3411cd0f66cad6ee42267a0584ec55505988c 100644 (file)
--- a/src/lib/dns/txt_like.h
+++ b/src/lib/dns/txt_like.h
@@ -231,7 +231,3 @@ private:
 }      // namespace isc
 
 #endif //  TXT_LIKE_H
-
-// Local Variables:
-// mode: c++
-// End: