[master] Merged trac3870 (OPTIONAL macro guard)

src/bin/d2/d_cfg_mgr.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013, 2015 Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
@@ -22,6 +22,13 @@
 #include <stdint.h>
 #include <string>
 
+// Undefine the macro OPTIONAL which is defined in some operating
+// systems but conflicts with class constant is the context base class.
+
+#ifdef OPTIONAL
+#undef OPTIONAL
+#endif
+
 namespace isc {
 namespace d2 {
 

src/bin/dhcp4/dhcp4_srv.h

@@ -33,6 +33,14 @@
 #include <iostream>
 #include <queue>
 
+// Undefine the macro OPTIONAL which is defined in some operating
+// systems but conflicts with a member of the RequirementLevel enum in
+// the server class.
+
+#ifdef OPTIONAL
+#undef OPTIONAL
+#endif
+
 namespace isc {
 namespace dhcp {
 

src/bin/dhcp6/dhcp6_srv.h

@@ -32,6 +32,14 @@
 #include <iostream>
 #include <queue>
 
+// Undefine the macro OPTIONAL which is defined in some operating
+// systems but conflicts with a member of the RequirementLevel enum in
+// the server class.
+
+#ifdef OPTIONAL
+#undef OPTIONAL
+#endif
+
 namespace isc {
 namespace dhcp {