Tue Jul 10 14:44:00 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 101 insertions, 26 deletions

diff --git a/TAO/tao/RTCORBA/RTCORBA.h b/TAO/tao/RTCORBA/RTCORBA.h
index fd1e4c1378f..b3995e9e35d 100644
--- a/TAO/tao/RTCORBA/RTCORBA.h
+++ b/TAO/tao/RTCORBA/RTCORBA.h
@@ -46,6 +46,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 
 #define TAO_RTCORBA_SAFE_INCLUDE
 #include "tao/RTCORBA/RTCORBAC.h"
+#include "tao/RTCORBA/RT_ProtocolPropertiesC.h"
 #undef TAO_RTCORBA_SAFE_INCLUDE
 
 #include "tao/RTCORBA/rtcorba_typedefs.h"
diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp
index 5f27b8bcd6e..7fd4f6bb209 100644
--- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp
+++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp
@@ -34,6 +34,10 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+
+
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
 
@@ -54,6 +58,10 @@ namespace RTCORBA
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:51
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
@@ -90,6 +98,10 @@ namespace TAO
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+
+
 
 #if defined (ACE_ANY_OPS_USE_NAMESPACE)
 
@@ -137,6 +149,10 @@ namespace RTCORBA
 
 #else
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
@@ -181,5 +197,13 @@ operator>>= (
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+
+
 
 #endif
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+
diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.h b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.h
index 4e2ac7a2464..cdb2d1310c3 100644
--- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.h
+++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:816
+// be\be_codegen.cpp:887
 
 #ifndef _TAO_IDL_RTCORBA_RT_PROTOCOLPROPERTIESA_H_
 #define _TAO_IDL_RTCORBA_RT_PROTOCOLPROPERTIESA_H_
@@ -34,7 +34,13 @@
 #include /**/ "ace/pre.h"
 
 #include /**/ "tao/RTCORBA/rtcorba_export.h"
+#define TAO_RTCORBA_SAFE_INCLUDE
 #include "tao/RTCORBA/RT_ProtocolPropertiesC.h"
+#undef TAO_RTCORBA_SAFE_INCLUDE
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 
 
 // TAO_IDL - Generated from
@@ -42,10 +48,10 @@
 
 namespace RTCORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:49
-  
+
   extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_ProtocolProperties;
 
 // TAO_IDL - Generated from
@@ -71,6 +77,10 @@ namespace RTCORBA
 #else
 
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RTCORBA_Export void operator<<= (::CORBA::Any &, RTCORBA::ProtocolProperties_ptr); // copying
@@ -79,9 +89,17 @@ TAO_RTCORBA_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, RTCORBA::
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+
+
 
 #endif
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp
index 7e7821f5c7e..ab48b2c8adc 100644
--- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp
+++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp
@@ -26,16 +26,24 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:311
+// be\be_codegen.cpp:371
 
 
-#include "RT_ProtocolPropertiesC.h"
+#include "tao/RTCORBA/RTCORBA.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+
+
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:72
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 
@@ -47,6 +55,10 @@ namespace TAO
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+
+
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
@@ -87,7 +99,7 @@ RTCORBA::ProtocolProperties::ProtocolProperties (void)
 RTCORBA::ProtocolProperties::~ProtocolProperties (void)
 {}
 
-void
+void 
 RTCORBA::ProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 {
   ProtocolProperties *_tao_tmp_pointer =
@@ -122,7 +134,7 @@ RTCORBA::ProtocolProperties::_duplicate (ProtocolProperties_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -185,4 +197,6 @@ RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &)
 {
   return true;
 }
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 
diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h
index c9ea2cdf219..e1778a0198b 100644
--- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h
+++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h
@@ -33,6 +33,9 @@
 
 #include /**/ "ace/pre.h"
 
+#ifndef TAO_RTCORBA_SAFE_INCLUDE
+#error You should not include RTCORBA/RT_ProtocolPropertiesC.h, use tao/RTCORBA/RTCORBA.h
+#endif /* TAO_RTCORBA_SAFE_INCLUDE */
 
 #include /**/ "ace/config-all.h"
 
@@ -41,38 +44,41 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "tao/RTCORBA/rtcorba_export.h"
-#include "tao/SystemException.h"
 #include "tao/Basic_Types.h"
-#include "tao/ORB_Constants.h"
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
+#include /**/ "tao/Versioned_Namespace.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
 #define TAO_EXPORT_MACRO TAO_RTCORBA_Export
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+
+
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
 namespace RTCORBA
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:638
 
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES__VAR_OUT_CH_)
 #define _RTCORBA_PROTOCOLPROPERTIES__VAR_OUT_CH_
-
+  
   class ProtocolProperties;
   typedef ProtocolProperties *ProtocolProperties_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ProtocolProperties
       >
     ProtocolProperties_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ProtocolProperties
@@ -80,13 +86,13 @@ namespace RTCORBA
     ProtocolProperties_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_PROTOCOLPROPERTIES_CH_
-
+  
   class TAO_RTCORBA_Export ProtocolProperties
     : public virtual ::CORBA::Object
   {
@@ -94,24 +100,24 @@ namespace RTCORBA
     typedef ProtocolProperties_ptr _ptr_type;
     typedef ProtocolProperties_var _var_type;
     typedef ProtocolProperties_out _out_type;
-
+    
     // The static operations.
     static ProtocolProperties_ptr _duplicate (ProtocolProperties_ptr obj);
-
+    
     static void _tao_release (ProtocolProperties_ptr obj);
-
+    
     static ProtocolProperties_ptr _narrow (::CORBA::Object_ptr obj);
     static ProtocolProperties_ptr _unchecked_narrow (::CORBA::Object_ptr obj);
     static ProtocolProperties_ptr _nil (void)
     {
       return static_cast<ProtocolProperties_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:216
-
+    
     virtual ::CORBA::Boolean _is_a (const char *type_id);
     virtual const char* _interface_repository_id (void) const;
     virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
@@ -123,13 +129,13 @@ namespace RTCORBA
   protected:
     // Abstract or local interface only.
     ProtocolProperties (void);
-
+    
     virtual ~ProtocolProperties (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     ProtocolProperties (const ProtocolProperties &);
-
+    
     void operator= (const ProtocolProperties &);
   };
 
@@ -143,6 +149,10 @@ namespace RTCORBA
 // TAO_IDL - Generated from
 // be\be_visitor_traits.cpp:64
 
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Traits specializations.
@@ -151,7 +161,7 @@ namespace TAO
 
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES__TRAITS_)
 #define _RTCORBA_PROTOCOLPROPERTIES__TRAITS_
-
+  
   template<>
   struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::ProtocolProperties>
   {
@@ -173,9 +183,17 @@ namespace TAO
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+
+
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:1138
+// be\be_codegen.cpp:1209
+
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */