ChangeLogTag:Thu Dec 8 15:38:02 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

7 files changed, 29 insertions, 1 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 4db4cb37d97..f80c323ccfe 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,16 @@
+Thu Dec  8 15:38:02 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+	* DAnCE/Old_Config_Handlers/DT_Handler.h:
+	* ciao/Client_init.h:
+	* ciao/Context_Impl_T.h:
+	* ciao/Server_init.h:
+	* ciao/Upgradeable_Context_Impl_T.h:
+	* tools/Config_Handlers/Any_Handler.h:
+
+	  Fixed versioned namespace support.  The versioning macros calls
+	  around forward declarations in the CORBA namespace were
+	  missing.
+
 Thu Dec 08 08:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * DAnCE/NodeManager/NodeManager_Impl.cpp:
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.h
index 54ab924355a..06256f23a23 100644
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.h
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.h
@@ -30,11 +30,14 @@ using xercesc::DOMText;
 using xercesc::DOMNodeIterator;
 using xercesc::DOMNode;
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace CORBA
 {
   class ORB;
   typedef ORB* ORB_ptr;
 }
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 namespace CIAO
 {
diff --git a/TAO/CIAO/ciao/Client_init.h b/TAO/CIAO/ciao/Client_init.h
index 065c1f2a280..6bf7d7dd712 100644
--- a/TAO/CIAO/ciao/Client_init.h
+++ b/TAO/CIAO/ciao/Client_init.h
@@ -18,6 +18,9 @@
 #pragma once
 #endif /* ! ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/orbconf.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace CORBA
 {
   class ORB;
@@ -33,8 +36,9 @@ namespace CIAO
    * should be call right after ORB initialization but we should try
    * to register these stuff automatically.
    */
-  CIAO_CLIENT_Export int Client_init (CORBA::ORB_ptr o);
+	CIAO_CLIENT_Export int Client_init (CORBA::ORB_ptr o);
 }
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /* CIAO_CLIENT_INIT_H */
diff --git a/TAO/CIAO/ciao/Context_Impl_T.h b/TAO/CIAO/ciao/Context_Impl_T.h
index 2cc2895e23f..a2cdc0b8fc8 100644
--- a/TAO/CIAO/ciao/Context_Impl_T.h
+++ b/TAO/CIAO/ciao/Context_Impl_T.h
@@ -26,6 +26,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace CORBA
 {
   class SystemException;
@@ -35,6 +36,7 @@ namespace SecurityLevel2
 {
   class Credentials;
 }
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 namespace Components
 {
diff --git a/TAO/CIAO/ciao/Server_init.h b/TAO/CIAO/ciao/Server_init.h
index d2cbfcc04f5..e9367ad278c 100644
--- a/TAO/CIAO/ciao/Server_init.h
+++ b/TAO/CIAO/ciao/Server_init.h
@@ -19,11 +19,13 @@
 #pragma once
 #endif /* ! ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace CORBA
 {
   class ORB;
   typedef ORB *ORB_ptr;
 }
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 namespace CIAO
 {
diff --git a/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.h b/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.h
index 28670a296da..42a28142284 100644
--- a/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.h
+++ b/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.h
@@ -22,10 +22,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace CORBA
 {
   class SystemException;
 }
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 namespace CIAO
 {
diff --git a/TAO/CIAO/tools/Config_Handlers/Any_Handler.h b/TAO/CIAO/tools/Config_Handlers/Any_Handler.h
index 8317c41422f..0a83ec8d31d 100644
--- a/TAO/CIAO/tools/Config_Handlers/Any_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Any_Handler.h
@@ -18,10 +18,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace CORBA
 {
   class Any;
 }
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 namespace CIAO
 {