Commit ae6f706d authored by Thomas Markwalder's avatar Thomas Markwalder
Browse files

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

they're supposed to be.
parent 42e6736f
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE. // PERFORMANCE OF THIS SOFTWARE.
#ifndef D2_CFG_MGR_H
#define D2_CFG_MGR_H
#include <asiolink/io_address.h> #include <asiolink/io_address.h>
#include <cc/data.h> #include <cc/data.h>
#include <exceptions/exceptions.h> #include <exceptions/exceptions.h>
...@@ -21,9 +24,6 @@ ...@@ -21,9 +24,6 @@
#include <stdint.h> #include <stdint.h>
#include <string> #include <string>
#ifndef D2_CFG_MGR_H
#define D2_CFG_MGR_H
namespace isc { namespace isc {
namespace d2 { namespace d2 {
......
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE. // PERFORMANCE OF THIS SOFTWARE.
#ifndef D2_CONFIG_H
#define D2_CONFIG_H
#include <asiolink/io_address.h> #include <asiolink/io_address.h>
#include <cc/data.h> #include <cc/data.h>
#include <d2/d_cfg_mgr.h> #include <d2/d_cfg_mgr.h>
...@@ -23,9 +26,6 @@ ...@@ -23,9 +26,6 @@
#include <stdint.h> #include <stdint.h>
#include <string> #include <string>
#ifndef D2_CONFIG_H
#define D2_CONFIG_H
namespace isc { namespace isc {
namespace d2 { namespace d2 {
...@@ -69,7 +69,7 @@ namespace d2 { ...@@ -69,7 +69,7 @@ namespace d2 {
/// A DnsServerInfoListParser creates and invokes a DnsServerInfoParser for /// A DnsServerInfoListParser creates and invokes a DnsServerInfoParser for
/// each server entry in its list. /// 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 /// @brief Exception thrown when the error during configuration handling
/// occurs. /// occurs.
......
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE. // PERFORMANCE OF THIS SOFTWARE.
#ifndef D_CFG_MGR_H
#define D_CFG_MGR_H
#include <cc/data.h> #include <cc/data.h>
#include <exceptions/exceptions.h> #include <exceptions/exceptions.h>
#include <dhcpsrv/dhcp_parsers.h> #include <dhcpsrv/dhcp_parsers.h>
...@@ -19,9 +22,6 @@ ...@@ -19,9 +22,6 @@
#include <stdint.h> #include <stdint.h>
#include <string> #include <string>
#ifndef D_CFG_MGR_H
#define D_CFG_MGR_H
namespace isc { namespace isc {
namespace d2 { namespace d2 {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment