[2957] Moved header #ifdef to beginning of header file where

they're supposed to be.

diff --git a/src/bin/d2/d2_cfg_mgr.h b/src/bin/d2/d2_cfg_mgr.h
index 54692ce8fcba816b6dc6e2532626f29dbab44eed..ed4a561c5c5696ef560c4d22e8ca97b0865e9e3d 100644 (file)
--- a/src/bin/d2/d2_cfg_mgr.h
+++ b/src/bin/d2/d2_cfg_mgr.h
@@ -12,6 +12,9 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#ifndef D2_CFG_MGR_H
+#define D2_CFG_MGR_H
+
 #include <asiolink/io_address.h>
 #include <cc/data.h>
 #include <exceptions/exceptions.h>
@@ -21,9 +24,6 @@
 #include <stdint.h>
 #include <string>
 
-#ifndef D2_CFG_MGR_H
-#define D2_CFG_MGR_H
-
 namespace isc {
 namespace d2 {
 

diff --git a/src/bin/d2/d2_config.h b/src/bin/d2/d2_config.h
index deb8b525bfe81cd47c54b512f1109f420f285c9e..d07a54c1a56ed1b4839c1b3cb1caeeafcb62ba81 100644 (file)
--- a/src/bin/d2/d2_config.h
+++ b/src/bin/d2/d2_config.h
@@ -12,6 +12,9 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#ifndef D2_CONFIG_H
+#define D2_CONFIG_H
+
 #include <asiolink/io_address.h>
 #include <cc/data.h>
 #include <d2/d_cfg_mgr.h>
@@ -23,9 +26,6 @@
 #include <stdint.h>
 #include <string>
 
-#ifndef D2_CONFIG_H
-#define D2_CONFIG_H
-
 namespace isc {
 namespace d2 {
 
@@ -69,7 +69,7 @@ namespace d2 {
 /// A DnsServerInfoListParser creates and invokes a DnsServerInfoParser for
 /// each server entry in its list.
 ///
-/// A DdnsServerInfoParser handles the scalars which belong to th server.
+/// A DdnsServerInfoParser handles the scalars which belong to the server.
 
 /// @brief Exception thrown when the error during configuration handling
 /// occurs.

diff --git a/src/bin/d2/d_cfg_mgr.h b/src/bin/d2/d_cfg_mgr.h
index b5e476937de049bd24fe675c67796d7a7373d6d5..4f8b166553f98db783974065187fe837e7f37684 100644 (file)
--- a/src/bin/d2/d_cfg_mgr.h
+++ b/src/bin/d2/d_cfg_mgr.h
@@ -12,6 +12,9 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#ifndef D_CFG_MGR_H
+#define D_CFG_MGR_H
+
 #include <cc/data.h>
 #include <exceptions/exceptions.h>
 #include <dhcpsrv/dhcp_parsers.h>
@@ -19,9 +22,6 @@
 #include <stdint.h>
 #include <string>
 
-#ifndef D_CFG_MGR_H
-#define D_CFG_MGR_H
-
 namespace isc {
 namespace d2 {