Thu Mar 29 13:40:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

9 files changed, 41 insertions, 25 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 2ddab6cfa3e..dc066196bee 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,19 @@
+Thu Mar 29 13:40:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          Use the safe include in the anyop header file, not in the source
+          file, makes it possible to use a safe include in the diffserv library.
+
+        * tao/DiffServPolicy.mpc:
+        * tao/DiffServPolicy/Client_Network_Priority_Policy.cpp:
+        * tao/DiffServPolicy/Client_Network_Priority_Policy.h:
+        * tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp:
+        * tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp:
+        * tao/DiffServPolicy/Server_Network_Priority_Policy.cpp:
+        * tao/DiffServPolicy/Server_Network_Priority_Policy.h:
+          Use the safe include feature to make sure people have to include
+          the correct file to use diffserv
+
 Thu Mar 29 12:14:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/IIOP_Profile.cpp:
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index 720f4c52c4d..105e16b7c9c 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -860,9 +860,20 @@ TAO_CodeGen::start_anyop_header (const char *fname)
 
   // Generate the include statement for the client header. We just
   // need to put only the base names. Path info is not required.
-  *this->anyop_header_ << "\n#include \"" << tao_prefix
-                       << be_global->be_get_client_hdr_fname ()
-                       << "\"";
+  if (be_global->safe_include ())
+    {
+      // Generate the safe include if it is defined instead of the client header
+      // need to put only the base names. Path info is not required.
+      *this->anyop_header_ << "\n#include \""
+                           << be_global->safe_include ()
+                           << "\"";
+    }
+  else
+    {
+      *this->anyop_header_ << "\n#include \"" << tao_prefix
+                           << be_global->be_get_client_hdr_fname ()
+                           << "\"";
+    }
 
   // If we have not suppressed Any operator generation and also
   // are not generating the operators in a separate file, we
@@ -976,22 +987,11 @@ TAO_CodeGen::start_anyop_source (const char *fname)
                            << "\"";
     }
 
-  if (be_global->safe_include ())
-    {
-      // Generate the safe include if it is defined instead of the client header
-      // need to put only the base names. Path info is not required.
-      *this->anyop_source_ << "\n#include \""
-                           << be_global->safe_include ()
-                           << "\"";
-    }
-  else
-    {
-      // Generate the include statement for the client header. We just
-      // need to put only the base names. Path info is not required.
-      *this->anyop_source_ << "\n#include \""
-                           << be_global->be_get_anyop_header_fname (1)
-                           << "\"";
-    }
+  // Generate the include statement for the client header. We just
+  // need to put only the base names. Path info is not required.
+  *this->anyop_source_ << "\n#include \""
+                       << be_global->be_get_anyop_header_fname (1)
+                       << "\"";
 
   this->gen_typecode_includes (this->anyop_source_);
 
diff --git a/TAO/tao/DiffServPolicy.mpc b/TAO/tao/DiffServPolicy.mpc
index 29095430dba..c709cb37d45 100644
--- a/TAO/tao/DiffServPolicy.mpc
+++ b/TAO/tao/DiffServPolicy.mpc
@@ -30,6 +30,8 @@ project : taolib, install, portableserver, pi, tao_versioning_idl_defaults, tao_
     idlflags += -GA -SS -Sci -Sorb \
                 -Wb,export_macro=TAO_DiffServPolicy_Export \
                 -Wb,export_include=tao/DiffServPolicy/DiffServPolicy_Export.h \
+                -Wb,include_guard=TAO_DIFFSERVPOLICY_SAFE_INCLUDE \
+                -Wb,safe_include=tao/DiffServPolicy/DiffServPolicy.h \
                 -o DiffServPolicy
     idlflags -= -St
     DiffServPolicy/DiffServPolicy.pidl
diff --git a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
index 49c324115cb..2ada8f3f1c0 100644
--- a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
+++ b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "tao/DiffServPolicy/Client_Network_Priority_Policy.h"
-#include "tao/DiffServPolicy/DiffServPolicyC.h"
 #include "tao/ORB_Constants.h"
 #include "tao/SystemException.h"
 
diff --git a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h
index 56e2d41a162..44803a0056e 100644
--- a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h
+++ b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h
@@ -24,7 +24,7 @@
 
 #include "tao/LocalObject.h"
 #include "tao/Basic_Types.h"
-#include "tao/DiffServPolicy/DiffServPolicyC.h"
+#include "tao/DiffServPolicy/DiffServPolicy.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp b/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp
index 52532c410ad..79cc29524e5 100644
--- a/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h"
-#include "tao/DiffServPolicy/DiffServPolicyC.h"
+#include "tao/DiffServPolicy/DiffServPolicy.h"
 #include "tao/DiffServPolicy/DiffServPolicy_Factory.h"
 #include "tao/DiffServPolicy/DiffServ_Protocols_Hooks.h"
 #include "tao/ORB_Core.h"
diff --git a/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp
index 52bf8eab4ad..888eaf60a55 100644
--- a/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp
+++ b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp
@@ -4,7 +4,7 @@
 #include "tao/PortableServer/Root_POA.h"
 #include "tao/PortableServer/POA_Policy_Set.h"
 #include "tao/DiffServPolicy/Server_Network_Priority_Policy.h"
-#include "tao/DiffServPolicy/DiffServPolicyC.h"
+#include "tao/DiffServPolicy/DiffServPolicy.h"
 #include "tao/Service_Context.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/Network_Priority_Protocols_Hooks.h"
diff --git a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
index 12420df0717..c779ac07c3a 100644
--- a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
+++ b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "tao/DiffServPolicy/Server_Network_Priority_Policy.h"
-#include "tao/DiffServPolicy/DiffServPolicyC.h"
 #include "tao/SystemException.h"
 #include "tao/ORB_Constants.h"
 
diff --git a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h
index 37b440dc4c5..cc092c6c6a6 100644
--- a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h
+++ b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h
@@ -17,7 +17,7 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/DiffServPolicy/DiffServPolicy_Export.h"
-#include "tao/DiffServPolicy/DiffServPolicyC.h"
+#include "tao/DiffServPolicy/DiffServPolicy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once