diff options
Diffstat (limited to 'TAO')
291 files changed, 1113 insertions, 43 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 9a7f8aba173..d1a3a546df3 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -308,10 +308,10 @@ Fri Nov 25 19:26:03 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_codegen.cpp: * TAO_IDL/be/be_field.cpp: * TAO_IDL/fe/fe_declarator.cpp: - + Added code generation for explicit inclusionn of tao/Managed_Types.h if TAO_(W)String_Manager is seen - anywhere in the generated code. This inclusion is + anywhere in the generated code. This inclusion is redundant now, but will make it easier to merge the new sequence implementation branch, where managed_Types.h will be changed to the name of a new file, into which @@ -328,7 +328,7 @@ Fri Nov 25 07:43:56 2005 Ossama Othman <ossama@dre.vanderbilt.edu> Fri Nov 25 15:06:43 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/fe/fe_interface_header.cpp: - + Applied a patch submitted by Max Khon <mkhon@swsoft.com> to fix a bug in computing the inheritance list of an IDL interface. This fix closes [BUGID:2318]. diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc index 62a2089c52d..02f81cd7b59 100644 --- a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc @@ -1,7 +1,9 @@ // -*- MPC -*- +// // $Id$ -project(CosNaming_Serv) : orbsvcslib, acememorylib_for_tao, core, naming_skel, messaging_optional, svc_utils, iortable { +project(CosNaming_Serv) : orbsvcslib, core, naming_skel, messaging_optional, svc_utils, iortable { + avoids += ace_for_tao // Requires MMAP_Memory_Pool sharedname = TAO_CosNaming_Serv dynamicflags = TAO_NAMING_SERV_BUILD_DLL tagchecks += Naming diff --git a/TAO/orbsvcs/orbsvcs/FTORB.mpc b/TAO/orbsvcs/orbsvcs/FTORB.mpc index 226721c3de6..c1be2de2ded 100644 --- a/TAO/orbsvcs/orbsvcs/FTORB.mpc +++ b/TAO/orbsvcs/orbsvcs/FTORB.mpc @@ -30,6 +30,7 @@ project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver, portablegroup } project(FT_ClientORB) : orbsvcslib, ftorbutils, core, messaging, portablegroup, interceptors { + avoids += ace_for_tao // Requires ace/UUID sharedname = TAO_FT_ClientORB dynamicflags = TAO_FT_CLIENTORB_BUILD_DLL tagchecks += FT_ClientORB diff --git a/TAO/orbsvcs/orbsvcs/IFRService.mpc b/TAO/orbsvcs/orbsvcs/IFRService.mpc index 2cd7439e464..e0c158052da 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService.mpc +++ b/TAO/orbsvcs/orbsvcs/IFRService.mpc @@ -2,6 +2,7 @@ // $Id$ project(IFRService) : orbsvcslib, core, typecodefactory, svc_utils, iortable, minimum_corba { + avoids += ace_for_tao // Requires ace/Configuration sharedname = TAO_IFRService dynamicflags = TAO_IFRSERVICE_BUILD_DLL tagchecks += IFRService diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc index 0d2aa5cfa34..62979dc481d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc +++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(PortableGroup) : orbsvcslib, core, naming, iormanip, messaging, minimum_corba, acesocketslib_for_tao { +project(PortableGroup) : orbsvcslib, core, naming, iormanip, messaging, minimum_corba { sharedname = TAO_PortableGroup idlflags += -Wb,export_macro=TAO_PortableGroup_Export \ -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc index 6590376426c..495f1213d72 100644 --- a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc @@ -2,6 +2,7 @@ // $Id$ project(RTEvent_Serv) : orbsvcslib, core, rtevent_skel, svc_utils, messaging { + avoids += ace_for_tao // Requires ACE_crc32 sharedname = TAO_RTEvent_Serv dynamicflags = TAO_RTEVENT_SERV_BUILD_DLL tagchecks += RTEvent diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc index 8cf1f9a2feb..967b1e3eeb0 100644 --- a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc +++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(Svc_Utils) : orbsvcslib, acesocketslib_for_tao, core, portableserver { +project(Svc_Utils) : orbsvcslib, core, portableserver { sharedname = TAO_Svc_Utils idlflags += -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h dynamicflags = TAO_SVC_UTILS_BUILD_DLL diff --git a/TAO/tao/AnyTypeCode/CharSeqA.cpp b/TAO/tao/AnyTypeCode/CharSeqA.cpp index e6867cf7452..041ec3e8b2c 100644 --- a/TAO/tao/AnyTypeCode/CharSeqA.cpp +++ b/TAO/tao/AnyTypeCode/CharSeqA.cpp @@ -34,6 +34,8 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -140,3 +142,5 @@ void operator<<= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/CharSeqA.h b/TAO/tao/AnyTypeCode/CharSeqA.h index 59c6bfdb1f4..76758080b9e 100644 --- a/TAO/tao/AnyTypeCode/CharSeqA.h +++ b/TAO/tao/AnyTypeCode/CharSeqA.h @@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -61,6 +63,8 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::CharSeq*); // n TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::CharSeq *&); // deprecated TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::CharSeq *&); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/CurrentA.cpp b/TAO/tao/AnyTypeCode/CurrentA.cpp index d7946836b98..9fc5479bba6 100644 --- a/TAO/tao/AnyTypeCode/CurrentA.cpp +++ b/TAO/tao/AnyTypeCode/CurrentA.cpp @@ -37,6 +37,8 @@ // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + static TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy> _tao_tc_CORBA_Current ( @@ -51,3 +53,4 @@ namespace CORBA } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/CurrentA.h b/TAO/tao/AnyTypeCode/CurrentA.h index e045f6a2882..5a505a5776d 100644 --- a/TAO/tao/AnyTypeCode/CurrentA.h +++ b/TAO/tao/AnyTypeCode/CurrentA.h @@ -41,6 +41,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -54,6 +56,8 @@ namespace CORBA } // module CORBA +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/DomainA.cpp b/TAO/tao/AnyTypeCode/DomainA.cpp index 4bf71aa1cae..4b00c38c490 100644 --- a/TAO/tao/AnyTypeCode/DomainA.cpp +++ b/TAO/tao/AnyTypeCode/DomainA.cpp @@ -36,6 +36,8 @@ #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -294,3 +296,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/DomainA.h b/TAO/tao/AnyTypeCode/DomainA.h index 9f8660d3545..72c5b0f95ac 100644 --- a/TAO/tao/AnyTypeCode/DomainA.h +++ b/TAO/tao/AnyTypeCode/DomainA.h @@ -58,6 +58,8 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 @@ -117,6 +119,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/DoubleSeqA.cpp b/TAO/tao/AnyTypeCode/DoubleSeqA.cpp index 79331b8f617..dc10da0c3e3 100644 --- a/TAO/tao/AnyTypeCode/DoubleSeqA.cpp +++ b/TAO/tao/AnyTypeCode/DoubleSeqA.cpp @@ -34,6 +34,8 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -140,3 +142,5 @@ void operator<<= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/DoubleSeqA.h b/TAO/tao/AnyTypeCode/DoubleSeqA.h index f6bb35ddd49..c905c31a980 100644 --- a/TAO/tao/AnyTypeCode/DoubleSeqA.h +++ b/TAO/tao/AnyTypeCode/DoubleSeqA.h @@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -61,6 +63,8 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::DoubleSeq*); // TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::DoubleSeq *&); // deprecated TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::DoubleSeq *&); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/DynamicA.cpp b/TAO/tao/AnyTypeCode/DynamicA.cpp index 589213436f5..5c36a5e2a2b 100644 --- a/TAO/tao/AnyTypeCode/DynamicA.cpp +++ b/TAO/tao/AnyTypeCode/DynamicA.cpp @@ -38,6 +38,8 @@ #include "tao/AnyTypeCode/StringSeqA.h" #include "tao/AnyTypeCode/Dynamic_ParameterA.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + #ifndef _TAO_TYPECODE_Dynamic_ParameterList_GUARD #define _TAO_TYPECODE_Dynamic_ParameterList_GUARD namespace TAO @@ -285,3 +287,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/DynamicA.h b/TAO/tao/AnyTypeCode/DynamicA.h index 944d9d28d76..a327a5a461a 100644 --- a/TAO/tao/AnyTypeCode/DynamicA.h +++ b/TAO/tao/AnyTypeCode/DynamicA.h @@ -60,6 +60,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { } // module CORBA @@ -127,6 +129,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypeCod // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/Dynamic_ParameterA.cpp b/TAO/tao/AnyTypeCode/Dynamic_ParameterA.cpp index df1f94abd24..d126358eec2 100644 --- a/TAO/tao/AnyTypeCode/Dynamic_ParameterA.cpp +++ b/TAO/tao/AnyTypeCode/Dynamic_ParameterA.cpp @@ -37,6 +37,8 @@ #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" #include "tao/AnyTypeCode/ParameterModeA.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/struct_typecode.cpp:87 @@ -122,3 +124,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Dynamic_ParameterA.h b/TAO/tao/AnyTypeCode/Dynamic_ParameterA.h index 25b861466fd..facb3803731 100644 --- a/TAO/tao/AnyTypeCode/Dynamic_ParameterA.h +++ b/TAO/tao/AnyTypeCode/Dynamic_ParameterA.h @@ -60,6 +60,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace Dynamic { @@ -89,6 +91,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dyn // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/ExceptionA.cpp b/TAO/tao/AnyTypeCode/ExceptionA.cpp index ba97c942cdb..4419a1e080b 100644 --- a/TAO/tao/AnyTypeCode/ExceptionA.cpp +++ b/TAO/tao/AnyTypeCode/ExceptionA.cpp @@ -20,6 +20,8 @@ ACE_RCSID (tao, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Specializations for CORBA::Exception Any operators. namespace TAO { @@ -116,3 +118,5 @@ operator<<= (CORBA::Any &any, CORBA::Exception *exception) ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ExceptionA.h b/TAO/tao/AnyTypeCode/ExceptionA.h index 05d608f4403..44f6cd6834c 100644 --- a/TAO/tao/AnyTypeCode/ExceptionA.h +++ b/TAO/tao/AnyTypeCode/ExceptionA.h @@ -35,6 +35,8 @@ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" #include "tao/Exception.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class Any; @@ -44,6 +46,8 @@ namespace CORBA TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const CORBA::Exception &); TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::Exception *); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/"ace/post.h" #endif /* TAO_EXCEPTIONA_H */ diff --git a/TAO/tao/AnyTypeCode/FloatSeqA.cpp b/TAO/tao/AnyTypeCode/FloatSeqA.cpp index 2d7b5761009..e5367367291 100644 --- a/TAO/tao/AnyTypeCode/FloatSeqA.cpp +++ b/TAO/tao/AnyTypeCode/FloatSeqA.cpp @@ -34,6 +34,8 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -140,3 +142,5 @@ void operator<<= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/FloatSeqA.h b/TAO/tao/AnyTypeCode/FloatSeqA.h index 149932f1466..e43fd256d73 100644 --- a/TAO/tao/AnyTypeCode/FloatSeqA.h +++ b/TAO/tao/AnyTypeCode/FloatSeqA.h @@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -61,6 +63,8 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::FloatSeq*); // TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::FloatSeq *&); // deprecated TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::FloatSeq *&); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/GIOPA.cpp b/TAO/tao/AnyTypeCode/GIOPA.cpp index 2e6898c7486..42a140aaba8 100644 --- a/TAO/tao/AnyTypeCode/GIOPA.cpp +++ b/TAO/tao/AnyTypeCode/GIOPA.cpp @@ -38,6 +38,8 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -326,3 +328,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/GIOPA.h b/TAO/tao/AnyTypeCode/GIOPA.h index b6b51cc4f1b..7971878edcc 100644 --- a/TAO/tao/AnyTypeCode/GIOPA.h +++ b/TAO/tao/AnyTypeCode/GIOPA.h @@ -39,6 +39,7 @@ #include "tao/AnyTypeCode/IOP_IORA.h" #include "tao/AnyTypeCode/OctetSeqA.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 @@ -95,6 +96,8 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, GIOP::TargetAddress*); // TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, GIOP::TargetAddress *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const GIOP::TargetAddress *&); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/IIOPA.cpp b/TAO/tao/AnyTypeCode/IIOPA.cpp index 89720b384a9..6140bd06712 100644 --- a/TAO/tao/AnyTypeCode/IIOPA.cpp +++ b/TAO/tao/AnyTypeCode/IIOPA.cpp @@ -37,6 +37,9 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/struct_typecode.cpp:87 @@ -319,3 +322,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/IIOPA.h b/TAO/tao/AnyTypeCode/IIOPA.h index 58fc4b53f3a..52931766bc1 100644 --- a/TAO/tao/AnyTypeCode/IIOPA.h +++ b/TAO/tao/AnyTypeCode/IIOPA.h @@ -41,6 +41,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace IIOP { @@ -88,6 +90,8 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, IIOP::BiDirIIOPServiceCon TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::BiDirIIOPServiceContext *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::BiDirIIOPServiceContext *&); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/IIOP_EndpointsA.cpp b/TAO/tao/AnyTypeCode/IIOP_EndpointsA.cpp index d528ac270c4..10256a34999 100644 --- a/TAO/tao/AnyTypeCode/IIOP_EndpointsA.cpp +++ b/TAO/tao/AnyTypeCode/IIOP_EndpointsA.cpp @@ -38,6 +38,8 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/struct_typecode.cpp:87 @@ -231,3 +233,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/IIOP_EndpointsA.h b/TAO/tao/AnyTypeCode/IIOP_EndpointsA.h index b62fc8976f1..e7f1f677145 100644 --- a/TAO/tao/AnyTypeCode/IIOP_EndpointsA.h +++ b/TAO/tao/AnyTypeCode/IIOP_EndpointsA.h @@ -61,6 +61,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { @@ -106,6 +108,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/IOP_IORA.cpp b/TAO/tao/AnyTypeCode/IOP_IORA.cpp index 0c9e8f27150..31c78cf12db 100644 --- a/TAO/tao/AnyTypeCode/IOP_IORA.cpp +++ b/TAO/tao/AnyTypeCode/IOP_IORA.cpp @@ -37,6 +37,8 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -995,3 +997,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/IOP_IORA.h b/TAO/tao/AnyTypeCode/IOP_IORA.h index 081015c697f..aecc75df280 100644 --- a/TAO/tao/AnyTypeCode/IOP_IORA.h +++ b/TAO/tao/AnyTypeCode/IOP_IORA.h @@ -39,6 +39,8 @@ #include "tao/AnyTypeCode/OctetSeqA.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 @@ -182,6 +184,8 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, IOP::ServiceContextList*) TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::ServiceContextList *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::ServiceContextList *&); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/LongDoubleSeqA.cpp b/TAO/tao/AnyTypeCode/LongDoubleSeqA.cpp index 98e266b808a..0966b1b396b 100644 --- a/TAO/tao/AnyTypeCode/LongDoubleSeqA.cpp +++ b/TAO/tao/AnyTypeCode/LongDoubleSeqA.cpp @@ -34,6 +34,8 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -140,3 +142,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/LongDoubleSeqA.h b/TAO/tao/AnyTypeCode/LongDoubleSeqA.h index 1462f4a097c..7c4b3675985 100644 --- a/TAO/tao/AnyTypeCode/LongDoubleSeqA.h +++ b/TAO/tao/AnyTypeCode/LongDoubleSeqA.h @@ -61,6 +61,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { // TAO_IDL - Generated from @@ -92,6 +94,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/LongLongSeqA.cpp b/TAO/tao/AnyTypeCode/LongLongSeqA.cpp index 237cc42e778..f971189e9d1 100644 --- a/TAO/tao/AnyTypeCode/LongLongSeqA.cpp +++ b/TAO/tao/AnyTypeCode/LongLongSeqA.cpp @@ -34,6 +34,8 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -140,3 +142,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/LongLongSeqA.h b/TAO/tao/AnyTypeCode/LongLongSeqA.h index ba99c7410b9..12256367f76 100644 --- a/TAO/tao/AnyTypeCode/LongLongSeqA.h +++ b/TAO/tao/AnyTypeCode/LongLongSeqA.h @@ -61,6 +61,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { // TAO_IDL - Generated from @@ -92,6 +94,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/LongSeqA.cpp b/TAO/tao/AnyTypeCode/LongSeqA.cpp index ac83fdac8db..69b05a2d208 100644 --- a/TAO/tao/AnyTypeCode/LongSeqA.cpp +++ b/TAO/tao/AnyTypeCode/LongSeqA.cpp @@ -34,6 +34,8 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -140,3 +142,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/LongSeqA.h b/TAO/tao/AnyTypeCode/LongSeqA.h index 29beb356664..0d639f5719c 100644 --- a/TAO/tao/AnyTypeCode/LongSeqA.h +++ b/TAO/tao/AnyTypeCode/LongSeqA.h @@ -61,6 +61,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -93,6 +95,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.cpp b/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.cpp index 6d77541a020..0d928705b16 100644 --- a/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.cpp +++ b/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.cpp @@ -41,6 +41,8 @@ #include "tao/AnyTypeCode/Policy_ForwardA.h" #include "tao/AnyTypeCode/OctetSeqA.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/struct_typecode.cpp:87 @@ -238,3 +240,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.h b/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.h index f6d5e0d7474..ea8e563befd 100644 --- a/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.h +++ b/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.h @@ -61,6 +61,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace Messaging { // TAO_IDL - Generated from @@ -108,6 +110,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Mes // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/ObjectIdListA.cpp b/TAO/tao/AnyTypeCode/ObjectIdListA.cpp index 409a8b0e341..9d7b92bc032 100644 --- a/TAO/tao/AnyTypeCode/ObjectIdListA.cpp +++ b/TAO/tao/AnyTypeCode/ObjectIdListA.cpp @@ -32,6 +32,8 @@ #include "tao/AnyTypeCode/Sequence_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -98,3 +100,5 @@ namespace CORBA &_tao_tc_CORBA_ORB_ObjectIdList; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ObjectIdListA.h b/TAO/tao/AnyTypeCode/ObjectIdListA.h index 1fedb3c212a..50fc249bcf3 100644 --- a/TAO/tao/AnyTypeCode/ObjectIdListA.h +++ b/TAO/tao/AnyTypeCode/ObjectIdListA.h @@ -61,6 +61,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -87,6 +89,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/PI_ForwardA.cpp b/TAO/tao/AnyTypeCode/PI_ForwardA.cpp index 6d4394780cf..6e5378dd7f5 100644 --- a/TAO/tao/AnyTypeCode/PI_ForwardA.cpp +++ b/TAO/tao/AnyTypeCode/PI_ForwardA.cpp @@ -36,6 +36,8 @@ #include "tao/AnyTypeCode/StringSeqA.h" #include "tao/AnyTypeCode/OctetSeqA.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -195,3 +197,4 @@ namespace PortableInterceptor } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/PI_ForwardA.h b/TAO/tao/AnyTypeCode/PI_ForwardA.h index 70124737301..f99092e4ec1 100644 --- a/TAO/tao/AnyTypeCode/PI_ForwardA.h +++ b/TAO/tao/AnyTypeCode/PI_ForwardA.h @@ -65,6 +65,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -176,6 +178,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/ParameterModeA.cpp b/TAO/tao/AnyTypeCode/ParameterModeA.cpp index 7eeaa86618c..fe5ef92a2b9 100644 --- a/TAO/tao/AnyTypeCode/ParameterModeA.cpp +++ b/TAO/tao/AnyTypeCode/ParameterModeA.cpp @@ -34,6 +34,8 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Basic_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 @@ -89,3 +91,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ParameterModeA.h b/TAO/tao/AnyTypeCode/ParameterModeA.h index 85dbb46597e..91bb04bd510 100644 --- a/TAO/tao/AnyTypeCode/ParameterModeA.h +++ b/TAO/tao/AnyTypeCode/ParameterModeA.h @@ -61,6 +61,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { // TAO_IDL - Generated from @@ -90,6 +92,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Pa // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/PolicyA.cpp b/TAO/tao/AnyTypeCode/PolicyA.cpp index 0594672bf8f..8fbbcda2440 100644 --- a/TAO/tao/AnyTypeCode/PolicyA.cpp +++ b/TAO/tao/AnyTypeCode/PolicyA.cpp @@ -39,6 +39,8 @@ #include "tao/AnyTypeCode/UShortSeqA.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -555,3 +557,5 @@ operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/PolicyA.h b/TAO/tao/AnyTypeCode/PolicyA.h index feae0030ce9..ed2c78d1e3a 100644 --- a/TAO/tao/AnyTypeCode/PolicyA.h +++ b/TAO/tao/AnyTypeCode/PolicyA.h @@ -61,6 +61,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -140,6 +142,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Po // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/Policy_ForwardA.cpp b/TAO/tao/AnyTypeCode/Policy_ForwardA.cpp index aae38186b03..f62c7cd0f48 100644 --- a/TAO/tao/AnyTypeCode/Policy_ForwardA.cpp +++ b/TAO/tao/AnyTypeCode/Policy_ForwardA.cpp @@ -36,6 +36,8 @@ #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" #include "tao/AnyTypeCode/Any_Basic_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -329,3 +331,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Policy_ForwardA.h b/TAO/tao/AnyTypeCode/Policy_ForwardA.h index 88c0b82f339..7626097a3b9 100644 --- a/TAO/tao/AnyTypeCode/Policy_ForwardA.h +++ b/TAO/tao/AnyTypeCode/Policy_ForwardA.h @@ -37,6 +37,7 @@ #include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/Policy_ForwardC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 @@ -98,6 +99,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::SetOverrideType); TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::SetOverrideType &); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/PortableInterceptorA.h b/TAO/tao/AnyTypeCode/PortableInterceptorA.h index e257fccb813..4de58d5653e 100644 --- a/TAO/tao/AnyTypeCode/PortableInterceptorA.h +++ b/TAO/tao/AnyTypeCode/PortableInterceptorA.h @@ -42,6 +42,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -50,6 +52,8 @@ namespace PortableInterceptor } // module PortableInterceptor +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/ServicesA.cpp b/TAO/tao/AnyTypeCode/ServicesA.cpp index 2fa2316ff53..d78416fda23 100644 --- a/TAO/tao/AnyTypeCode/ServicesA.cpp +++ b/TAO/tao/AnyTypeCode/ServicesA.cpp @@ -36,6 +36,8 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -516,3 +518,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ServicesA.h b/TAO/tao/AnyTypeCode/ServicesA.h index 87b6aca143f..7a422b3358a 100644 --- a/TAO/tao/AnyTypeCode/ServicesA.h +++ b/TAO/tao/AnyTypeCode/ServicesA.h @@ -41,6 +41,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -121,6 +123,8 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::ServiceInformation TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceInformation *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceInformation *&); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/ShortSeqA.cpp b/TAO/tao/AnyTypeCode/ShortSeqA.cpp index ed70a459f81..0d53bc9e6b1 100644 --- a/TAO/tao/AnyTypeCode/ShortSeqA.cpp +++ b/TAO/tao/AnyTypeCode/ShortSeqA.cpp @@ -34,6 +34,8 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -140,3 +142,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ShortSeqA.h b/TAO/tao/AnyTypeCode/ShortSeqA.h index f3f6f53c485..5c450473eb1 100644 --- a/TAO/tao/AnyTypeCode/ShortSeqA.h +++ b/TAO/tao/AnyTypeCode/ShortSeqA.h @@ -41,6 +41,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -62,6 +64,8 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::ShortSeq*); // non TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ShortSeq *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ShortSeq *&); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/StringSeqA.cpp b/TAO/tao/AnyTypeCode/StringSeqA.cpp index df52b396d70..21954b9b072 100644 --- a/TAO/tao/AnyTypeCode/StringSeqA.cpp +++ b/TAO/tao/AnyTypeCode/StringSeqA.cpp @@ -35,6 +35,8 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -141,3 +143,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/StringSeqA.h b/TAO/tao/AnyTypeCode/StringSeqA.h index a97892b5181..c26b6c77dee 100644 --- a/TAO/tao/AnyTypeCode/StringSeqA.h +++ b/TAO/tao/AnyTypeCode/StringSeqA.h @@ -41,6 +41,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -62,6 +64,8 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::StringSeq*); // no TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StringSeq *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StringSeq *&); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/SystemExceptionA.cpp b/TAO/tao/AnyTypeCode/SystemExceptionA.cpp index 44271253ab5..3aa922f68df 100644 --- a/TAO/tao/AnyTypeCode/SystemExceptionA.cpp +++ b/TAO/tao/AnyTypeCode/SystemExceptionA.cpp @@ -16,6 +16,9 @@ ACE_RCSID (tao, SystemExceptionA, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + #if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO) #undef THREAD_CANCELLED #endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */ @@ -178,3 +181,5 @@ CORBA::Boolean operator>>= (const CORBA::Any &any, \ STANDARD_EXCEPTION_LIST #undef TAO_SYSTEM_EXCEPTION + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/SystemExceptionA.h b/TAO/tao/AnyTypeCode/SystemExceptionA.h index 75fc6dfd459..b6ca62d2e55 100644 --- a/TAO/tao/AnyTypeCode/SystemExceptionA.h +++ b/TAO/tao/AnyTypeCode/SystemExceptionA.h @@ -20,6 +20,8 @@ #include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/SystemException.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { class TypeCode; @@ -82,6 +84,8 @@ namespace CORBA } // End CORBA namespace +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_SYSTEMEXCEPTIONA_H */ diff --git a/TAO/tao/AnyTypeCode/TAOA.cpp b/TAO/tao/AnyTypeCode/TAOA.cpp index 4230f001fc7..30e6a7c5c12 100644 --- a/TAO/tao/AnyTypeCode/TAOA.cpp +++ b/TAO/tao/AnyTypeCode/TAOA.cpp @@ -37,6 +37,8 @@ #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -162,3 +164,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TimeBaseA.cpp b/TAO/tao/AnyTypeCode/TimeBaseA.cpp index 444c8d69f0a..2752e747339 100644 --- a/TAO/tao/AnyTypeCode/TimeBaseA.cpp +++ b/TAO/tao/AnyTypeCode/TimeBaseA.cpp @@ -36,6 +36,8 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -269,3 +271,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TimeBaseA.h b/TAO/tao/AnyTypeCode/TimeBaseA.h index c75cc8715c4..c18a4a4f8d2 100644 --- a/TAO/tao/AnyTypeCode/TimeBaseA.h +++ b/TAO/tao/AnyTypeCode/TimeBaseA.h @@ -61,6 +61,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TimeBase { @@ -121,6 +123,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Tim // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/ULongLongSeqA.cpp b/TAO/tao/AnyTypeCode/ULongLongSeqA.cpp index d77d9b59c07..43420cd5280 100644 --- a/TAO/tao/AnyTypeCode/ULongLongSeqA.cpp +++ b/TAO/tao/AnyTypeCode/ULongLongSeqA.cpp @@ -34,6 +34,8 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -140,3 +142,5 @@ void operator<<= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ULongLongSeqA.h b/TAO/tao/AnyTypeCode/ULongLongSeqA.h index 0d5ca2d7bd9..65fb4366d8f 100644 --- a/TAO/tao/AnyTypeCode/ULongLongSeqA.h +++ b/TAO/tao/AnyTypeCode/ULongLongSeqA.h @@ -37,6 +37,8 @@ #include "tao/ULongLongSeqC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 @@ -61,6 +63,8 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::ULongLongSeq*); TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::ULongLongSeq *&); // deprecated TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::ULongLongSeq *&); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/ULongSeqA.cpp b/TAO/tao/AnyTypeCode/ULongSeqA.cpp index f48c8306497..74f062c1853 100644 --- a/TAO/tao/AnyTypeCode/ULongSeqA.cpp +++ b/TAO/tao/AnyTypeCode/ULongSeqA.cpp @@ -34,6 +34,8 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -140,3 +142,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ULongSeqA.h b/TAO/tao/AnyTypeCode/ULongSeqA.h index f093cec9617..ed4eac48536 100644 --- a/TAO/tao/AnyTypeCode/ULongSeqA.h +++ b/TAO/tao/AnyTypeCode/ULongSeqA.h @@ -38,6 +38,8 @@ #include "tao/ULongSeqC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 @@ -62,6 +64,8 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::ULongSeq*); // non TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ULongSeq *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ULongSeq *&); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/UShortSeqA.cpp b/TAO/tao/AnyTypeCode/UShortSeqA.cpp index 8150d15bef7..75fb6904f92 100644 --- a/TAO/tao/AnyTypeCode/UShortSeqA.cpp +++ b/TAO/tao/AnyTypeCode/UShortSeqA.cpp @@ -34,6 +34,8 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -140,3 +142,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/UShortSeqA.h b/TAO/tao/AnyTypeCode/UShortSeqA.h index 59de79c234c..824246509de 100644 --- a/TAO/tao/AnyTypeCode/UShortSeqA.h +++ b/TAO/tao/AnyTypeCode/UShortSeqA.h @@ -61,6 +61,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -93,6 +95,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/ValueModifierA.cpp b/TAO/tao/AnyTypeCode/ValueModifierA.cpp index 0a93f94dc26..81d564143bf 100644 --- a/TAO/tao/AnyTypeCode/ValueModifierA.cpp +++ b/TAO/tao/AnyTypeCode/ValueModifierA.cpp @@ -33,6 +33,8 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -52,3 +54,4 @@ namespace CORBA } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ValueModifierA.h b/TAO/tao/AnyTypeCode/ValueModifierA.h index 479dc4c4052..ff165ad8eda 100644 --- a/TAO/tao/AnyTypeCode/ValueModifierA.h +++ b/TAO/tao/AnyTypeCode/ValueModifierA.h @@ -58,6 +58,8 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 @@ -80,6 +82,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/VisibilityA.cpp b/TAO/tao/AnyTypeCode/VisibilityA.cpp index 95ae55adc13..8e56a0113f1 100644 --- a/TAO/tao/AnyTypeCode/VisibilityA.cpp +++ b/TAO/tao/AnyTypeCode/VisibilityA.cpp @@ -32,6 +32,8 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -51,3 +53,4 @@ namespace CORBA } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/VisibilityA.h b/TAO/tao/AnyTypeCode/VisibilityA.h index 04f9ebde904..c791d479e08 100644 --- a/TAO/tao/AnyTypeCode/VisibilityA.h +++ b/TAO/tao/AnyTypeCode/VisibilityA.h @@ -61,6 +61,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -82,6 +84,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/WCharSeqA.cpp b/TAO/tao/AnyTypeCode/WCharSeqA.cpp index c8d8ecee99d..9f735b31b0c 100644 --- a/TAO/tao/AnyTypeCode/WCharSeqA.cpp +++ b/TAO/tao/AnyTypeCode/WCharSeqA.cpp @@ -34,6 +34,8 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -140,3 +142,5 @@ void operator<<= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/WCharSeqA.h b/TAO/tao/AnyTypeCode/WCharSeqA.h index ab57e949bdd..8935210cc23 100644 --- a/TAO/tao/AnyTypeCode/WCharSeqA.h +++ b/TAO/tao/AnyTypeCode/WCharSeqA.h @@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -61,6 +63,8 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::WCharSeq*); // TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::WCharSeq *&); // deprecated TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::WCharSeq *&); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/WStringSeqA.cpp b/TAO/tao/AnyTypeCode/WStringSeqA.cpp index 41067661a25..c49b1395340 100644 --- a/TAO/tao/AnyTypeCode/WStringSeqA.cpp +++ b/TAO/tao/AnyTypeCode/WStringSeqA.cpp @@ -35,6 +35,8 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -141,3 +143,5 @@ void operator<<= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/WStringSeqA.h b/TAO/tao/AnyTypeCode/WStringSeqA.h index 9f01c462bc2..b9357c80326 100644 --- a/TAO/tao/AnyTypeCode/WStringSeqA.h +++ b/TAO/tao/AnyTypeCode/WStringSeqA.h @@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -61,6 +63,8 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::WStringSeq*); / TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::WStringSeq *&); // deprecated TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::WStringSeq *&); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp index 7b37a76f712..57c00799f56 100644 --- a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp +++ b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp @@ -35,6 +35,8 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/struct_typecode.cpp:87 @@ -145,3 +147,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.h b/TAO/tao/AnyTypeCode/WrongTransactionA.h index 08bce947959..745c0aa5f39 100644 --- a/TAO/tao/AnyTypeCode/WrongTransactionA.h +++ b/TAO/tao/AnyTypeCode/WrongTransactionA.h @@ -61,6 +61,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -93,6 +95,8 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/orb_typesA.cpp b/TAO/tao/AnyTypeCode/orb_typesA.cpp index 92c9bc9bc46..c704c87e805 100644 --- a/TAO/tao/AnyTypeCode/orb_typesA.cpp +++ b/TAO/tao/AnyTypeCode/orb_typesA.cpp @@ -33,6 +33,8 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -112,3 +114,4 @@ namespace CORBA } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/orb_typesA.h b/TAO/tao/AnyTypeCode/orb_typesA.h index 1585e465596..84b2fcc5c0f 100644 --- a/TAO/tao/AnyTypeCode/orb_typesA.h +++ b/TAO/tao/AnyTypeCode/orb_typesA.h @@ -37,6 +37,7 @@ #include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/orb_typesC.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 @@ -69,6 +70,8 @@ namespace CORBA } // module CORBA +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/CSD_Framework/CSD_FrameworkA.cpp b/TAO/tao/CSD_Framework/CSD_FrameworkA.cpp index 104d361e5e1..befdbb62572 100644 --- a/TAO/tao/CSD_Framework/CSD_FrameworkA.cpp +++ b/TAO/tao/CSD_Framework/CSD_FrameworkA.cpp @@ -36,6 +36,8 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/objref_typecode.cpp:76 @@ -71,3 +73,4 @@ namespace CSD_Framework } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_FrameworkA.h b/TAO/tao/CSD_Framework/CSD_FrameworkA.h index 4e5d9bca095..d3e730f09c6 100644 --- a/TAO/tao/CSD_Framework/CSD_FrameworkA.h +++ b/TAO/tao/CSD_Framework/CSD_FrameworkA.h @@ -38,6 +38,8 @@ //#include "tao/PortableServer/PortableServerA.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:59 @@ -59,6 +61,8 @@ namespace CSD_Framework } // module CSD_Framework +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/CSD_Framework/CSD_FrameworkC.cpp b/TAO/tao/CSD_Framework/CSD_FrameworkC.cpp index 85e2a8bcedb..3066545bcd9 100644 --- a/TAO/tao/CSD_Framework/CSD_FrameworkC.cpp +++ b/TAO/tao/CSD_Framework/CSD_FrameworkC.cpp @@ -37,6 +37,8 @@ // TAO_IDL - Generated from // .\be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -288,3 +290,5 @@ CSD_Framework::POA::marshal (TAO_OutputCDR &) { return false; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_FrameworkC.h b/TAO/tao/CSD_Framework/CSD_FrameworkC.h index f426b94b8b5..080f13c4bf3 100644 --- a/TAO/tao/CSD_Framework/CSD_FrameworkC.h +++ b/TAO/tao/CSD_Framework/CSD_FrameworkC.h @@ -57,6 +57,8 @@ // TAO_IDL - Generated from // c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CSD_Framework { @@ -305,6 +307,8 @@ namespace TAO #endif /* end #if !defined */ } +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp index 569c74c70d2..ca00470e5e8 100644 --- a/TAO/tao/Domain/DomainS.cpp +++ b/TAO/tao/Domain/DomainS.cpp @@ -75,6 +75,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -1684,5 +1686,7 @@ POA_CORBA::ConstructionPolicy::_this (ACE_ENV_SINGLE_ARG_DECL) ); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* ifndef */ diff --git a/TAO/tao/Domain/DomainS.h b/TAO/tao/Domain/DomainS.h index b95ab45f54b..8aef6169380 100644 --- a/TAO/tao/Domain/DomainS.h +++ b/TAO/tao/Domain/DomainS.h @@ -64,6 +64,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_sh.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace POA_CORBA { @@ -481,6 +483,8 @@ namespace POA_CORBA // TAO_IDL - Generated from // be\be_codegen.cpp:995 +TAO_END_VERSIONED_NAMESPACE_DECL + #include "DomainS_T.h" #if defined (__ACE_INLINE__) diff --git a/TAO/tao/Domain/DomainS.inl b/TAO/tao/Domain/DomainS.inl index 7da816922ac..5e1b77f1084 100644 --- a/TAO/tao/Domain/DomainS.inl +++ b/TAO/tao/Domain/DomainS.inl @@ -25,6 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void @@ -154,3 +155,4 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::destroy ( ); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Domain/DomainS_T.h b/TAO/tao/Domain/DomainS_T.h index 9d854d72853..d4660ac1e44 100644 --- a/TAO/tao/Domain/DomainS_T.h +++ b/TAO/tao/Domain/DomainS_T.h @@ -38,6 +38,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_root/root_sth.cpp:116 @@ -202,6 +203,8 @@ namespace POA_CORBA // TAO_IDL - Generated from // be\be_codegen.cpp:1096 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "DomainS_T.inl" #endif /* defined INLINE */ diff --git a/TAO/tao/Domain/DomainS_T.inl b/TAO/tao/Domain/DomainS_T.inl index 83b1baa46c4..2287aa6ba7e 100644 --- a/TAO/tao/Domain/DomainS_T.inl +++ b/TAO/tao/Domain/DomainS_T.inl @@ -26,6 +26,8 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_interface/tie_si.cpp:96 @@ -298,3 +300,5 @@ void POA_CORBA::ConstructionPolicy_tie<T>::make_domain_manager ( ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp index ba64e06d5b0..98ce898fd22 100644 --- a/TAO/tao/DynamicAny/DynamicAnyC.cpp +++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp @@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -1878,3 +1880,5 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_DynamicAny_AnySeq_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h index f78ad947472..da68eeab800 100644 --- a/TAO/tao/DynamicAny/DynamicAnyC.h +++ b/TAO/tao/DynamicAny/DynamicAnyC.h @@ -77,6 +77,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace DynamicAny { @@ -2532,6 +2534,8 @@ TAO_DynamicAny_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp index 339d9aea34e..ed675318654 100644 --- a/TAO/tao/IFR_Client/IFR_BaseC.cpp +++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp @@ -66,6 +66,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -8610,3 +8612,5 @@ CORBA::Boolean operator>> ( (strm >> _tao_aggregate.version.out ()) && (strm >> _tao_aggregate.type.out ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IFR_Client/IFR_BaseC.h b/TAO/tao/IFR_Client/IFR_BaseC.h index 7d7e3171b2b..44b8f9774a3 100644 --- a/TAO/tao/IFR_Client/IFR_BaseC.h +++ b/TAO/tao/IFR_Client/IFR_BaseC.h @@ -72,6 +72,8 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 @@ -4105,6 +4107,8 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypeDesc // TAO_IDL - Generated from // be\be_codegen.cpp:1136 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "IFR_BaseC.inl" #endif /* defined INLINE */ diff --git a/TAO/tao/IFR_Client/IFR_BaseC.inl b/TAO/tao/IFR_Client/IFR_BaseC.inl index 8b69d04033d..c7be5ed5427 100644 --- a/TAO/tao/IFR_Client/IFR_BaseC.inl +++ b/TAO/tao/IFR_Client/IFR_BaseC.inl @@ -29,6 +29,8 @@ // TAO_IDL - Generated from // be\be_visitor_interface/interface_ci.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + #if !defined (_CORBA_IROBJECT___CI_) #define _CORBA_IROBJECT___CI_ @@ -205,3 +207,5 @@ CORBA::TypedefDef::TypedefDef ( } #endif /* end #if !defined */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IFR_Client/IFR_BaseS.h b/TAO/tao/IFR_Client/IFR_BaseS.h index 1fea87667c7..b7a196d3491 100644 --- a/TAO/tao/IFR_Client/IFR_BaseS.h +++ b/TAO/tao/IFR_Client/IFR_BaseS.h @@ -57,6 +57,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_sh.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace POA_CORBA { @@ -1248,6 +1250,8 @@ namespace POA_CORBA } // module CORBA +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h index 06488fb9e77..c9fc4cbcea1 100644 --- a/TAO/tao/IFR_Client/IFR_BasicC.h +++ b/TAO/tao/IFR_Client/IFR_BasicC.h @@ -72,6 +72,8 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 @@ -5687,6 +5689,8 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtLocal // TAO_IDL - Generated from // be\be_codegen.cpp:1136 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "IFR_BasicC.inl" #endif /* defined INLINE */ diff --git a/TAO/tao/IFR_Client/IFR_BasicC.inl b/TAO/tao/IFR_Client/IFR_BasicC.inl index 6edd2c8a1a9..8f36b619375 100644 --- a/TAO/tao/IFR_Client/IFR_BasicC.inl +++ b/TAO/tao/IFR_Client/IFR_BasicC.inl @@ -26,6 +26,8 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ci.cpp:70 @@ -889,3 +891,5 @@ CORBA::ExtLocalInterfaceDef::ExtLocalInterfaceDef ( } #endif /* end #if !defined */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp index eab777756f6..5764d2ac56f 100644 --- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp +++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp @@ -64,6 +64,9 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -7399,3 +7402,5 @@ CORBA::Boolean operator>> ( (strm >> _tao_aggregate.attributes) && (strm >> _tao_aggregate.type.out ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.h b/TAO/tao/IFR_Client/IFR_ComponentsC.h index f2efcd1c0c8..3c1eec96f17 100644 --- a/TAO/tao/IFR_Client/IFR_ComponentsC.h +++ b/TAO/tao/IFR_Client/IFR_ComponentsC.h @@ -69,6 +69,8 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 @@ -3102,6 +3104,8 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Componen // TAO_IDL - Generated from // be\be_codegen.cpp:1136 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "IFR_ComponentsC.inl" #endif /* defined INLINE */ diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.inl b/TAO/tao/IFR_Client/IFR_ComponentsC.inl index 63e656401e4..58217d7f6d4 100644 --- a/TAO/tao/IFR_Client/IFR_ComponentsC.inl +++ b/TAO/tao/IFR_Client/IFR_ComponentsC.inl @@ -25,6 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_interface/interface_ci.cpp:70 @@ -529,3 +530,5 @@ CORBA::ComponentIR::HomeDef::HomeDef ( } #endif /* end #if !defined */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp index 6e6d014a7bd..77820fd693d 100644 --- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp +++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp @@ -66,6 +66,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -4247,3 +4249,5 @@ CORBA::Boolean operator>> ( return 1; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.h b/TAO/tao/IFR_Client/IFR_ExtendedC.h index e432cce0663..d42a5de4728 100644 --- a/TAO/tao/IFR_Client/IFR_ExtendedC.h +++ b/TAO/tao/IFR_Client/IFR_ExtendedC.h @@ -71,6 +71,8 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 @@ -1551,6 +1553,8 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueBox // TAO_IDL - Generated from // be\be_codegen.cpp:1136 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "IFR_ExtendedC.inl" #endif /* defined INLINE */ diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.inl b/TAO/tao/IFR_Client/IFR_ExtendedC.inl index 21c51c95edd..ee480033bf6 100644 --- a/TAO/tao/IFR_Client/IFR_ExtendedC.inl +++ b/TAO/tao/IFR_Client/IFR_ExtendedC.inl @@ -25,6 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_interface/interface_ci.cpp:70 @@ -205,3 +206,5 @@ CORBA::ValueBoxDef::ValueBoxDef ( } #endif /* end #if !defined */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORInterceptor/IORInfoC.cpp b/TAO/tao/IORInterceptor/IORInfoC.cpp index c17b04c2629..f2158657ac4 100644 --- a/TAO/tao/IORInterceptor/IORInfoC.cpp +++ b/TAO/tao/IORInterceptor/IORInfoC.cpp @@ -37,6 +37,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -181,3 +183,5 @@ PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &) { return false; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORInterceptor/IORInfoC.h b/TAO/tao/IORInterceptor/IORInfoC.h index 6d6e28b2e0b..cd478a109df 100644 --- a/TAO/tao/IORInterceptor/IORInfoC.h +++ b/TAO/tao/IORInterceptor/IORInfoC.h @@ -60,6 +60,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -269,6 +271,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.cpp b/TAO/tao/IORInterceptor/IORInterceptorC.cpp index a7c58215d59..fa92df1631d 100644 --- a/TAO/tao/IORInterceptor/IORInterceptorC.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptorC.cpp @@ -36,6 +36,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -295,3 +297,5 @@ PortableInterceptor::IORInterceptor_3_0::marshal (TAO_OutputCDR &) { return false; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.h b/TAO/tao/IORInterceptor/IORInterceptorC.h index c131a968980..fccb04aadac 100644 --- a/TAO/tao/IORInterceptor/IORInterceptorC.h +++ b/TAO/tao/IORInterceptor/IORInterceptorC.h @@ -62,6 +62,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -337,6 +339,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/IORManipulation/IORA.cpp b/TAO/tao/IORManipulation/IORA.cpp index 8f9b028afe9..180ea97f604 100644 --- a/TAO/tao/IORManipulation/IORA.cpp +++ b/TAO/tao/IORManipulation/IORA.cpp @@ -38,6 +38,8 @@ #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be/be_visitor_typecode/struct_typecode.cpp:74 @@ -900,3 +902,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp index 80b5d8c433b..20c641906d5 100644 --- a/TAO/tao/IORManipulation/IORC.cpp +++ b/TAO/tao/IORManipulation/IORC.cpp @@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -1005,3 +1007,5 @@ CORBA::Boolean operator>> ( { return true; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h index 3c3fb06fc6c..b7160ffbf98 100644 --- a/TAO/tao/IORManipulation/IORC.h +++ b/TAO/tao/IORManipulation/IORC.h @@ -71,6 +71,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_IOP { @@ -907,6 +909,8 @@ TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::MultiPro // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp index afbeabe311b..63c820ac1b1 100644 --- a/TAO/tao/IORTable/IORTableC.cpp +++ b/TAO/tao/IORTable/IORTableC.cpp @@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -539,3 +541,5 @@ CORBA::Boolean operator>> ( { return true; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORTable/IORTableC.h b/TAO/tao/IORTable/IORTableC.h index 4f2d10cf9f0..19f09fa7d59 100644 --- a/TAO/tao/IORTable/IORTableC.h +++ b/TAO/tao/IORTable/IORTableC.h @@ -68,6 +68,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace IORTable { @@ -451,6 +453,8 @@ TAO_IORTable_Export CORBA::Boolean operator>> (TAO_InputCDR &, IORTable::NotFoun // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/ImR_Client/ImplRepoC.cpp b/TAO/tao/ImR_Client/ImplRepoC.cpp index 6643a51b990..897f264f2db 100644 --- a/TAO/tao/ImR_Client/ImplRepoC.cpp +++ b/TAO/tao/ImR_Client/ImplRepoC.cpp @@ -61,6 +61,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -3089,3 +3091,5 @@ operator>>= ( return 1; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ImR_Client/ImplRepoC.h b/TAO/tao/ImR_Client/ImplRepoC.h index 137f4f1e20e..748bb20eb98 100644 --- a/TAO/tao/ImR_Client/ImplRepoC.h +++ b/TAO/tao/ImR_Client/ImplRepoC.h @@ -60,6 +60,8 @@ #endif #define TAO_EXPORT_MACRO TAO_IMR_Client_Export +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 @@ -1090,6 +1092,8 @@ TAO_IMR_Client_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Implementatio // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ImplRepoC.inl" #endif /* defined INLINE */ diff --git a/TAO/tao/ImR_Client/ImplRepoC.inl b/TAO/tao/ImR_Client/ImplRepoC.inl index 3ed7c4ecff0..ca194cdf453 100644 --- a/TAO/tao/ImR_Client/ImplRepoC.inl +++ b/TAO/tao/ImR_Client/ImplRepoC.inl @@ -26,6 +26,8 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ci.cpp:70 @@ -97,3 +99,5 @@ ImplementationRepository::Administration::Administration ( } #endif /* end #if !defined */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ImR_Client/ImplRepoS.cpp b/TAO/tao/ImR_Client/ImplRepoS.cpp index 7f2910a0dbf..8d26c369368 100644 --- a/TAO/tao/ImR_Client/ImplRepoS.cpp +++ b/TAO/tao/ImR_Client/ImplRepoS.cpp @@ -70,6 +70,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -3104,5 +3106,7 @@ POA_ImplementationRepository::Administration::_this (ACE_ENV_SINGLE_ARG_DECL) ); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* ifndef */ diff --git a/TAO/tao/ImR_Client/ImplRepoS.h b/TAO/tao/ImR_Client/ImplRepoS.h index 826a4ce7455..e3d670bd35e 100644 --- a/TAO/tao/ImR_Client/ImplRepoS.h +++ b/TAO/tao/ImR_Client/ImplRepoS.h @@ -47,6 +47,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_sh.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace POA_ImplementationRepository { @@ -718,7 +720,7 @@ namespace POA_ImplementationRepository // TAO_IDL - Generated from // be\be_codegen.cpp:1072 - +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/ImR_Client/ServerObjectC.cpp b/TAO/tao/ImR_Client/ServerObjectC.cpp index 8aa0505c7e2..a758031bc82 100644 --- a/TAO/tao/ImR_Client/ServerObjectC.cpp +++ b/TAO/tao/ImR_Client/ServerObjectC.cpp @@ -50,6 +50,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -457,3 +459,5 @@ operator>>= ( return 1; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ImR_Client/ServerObjectC.h b/TAO/tao/ImR_Client/ServerObjectC.h index 7cdd3ddebc6..991a4b47010 100644 --- a/TAO/tao/ImR_Client/ServerObjectC.h +++ b/TAO/tao/ImR_Client/ServerObjectC.h @@ -53,6 +53,8 @@ #endif #define TAO_EXPORT_MACRO TAO_IMR_Client_Export +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 @@ -274,6 +276,8 @@ TAO_IMR_Client_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Implementatio // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ServerObjectC.inl" #endif /* defined INLINE */ diff --git a/TAO/tao/ImR_Client/ServerObjectC.inl b/TAO/tao/ImR_Client/ServerObjectC.inl index 8cc38b5b2e0..5582a055944 100644 --- a/TAO/tao/ImR_Client/ServerObjectC.inl +++ b/TAO/tao/ImR_Client/ServerObjectC.inl @@ -25,6 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_interface/interface_ci.cpp:70 @@ -61,3 +62,5 @@ ImplementationRepository::ServerObject::ServerObject ( } #endif /* end #if !defined */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ImR_Client/ServerObjectS.cpp b/TAO/tao/ImR_Client/ServerObjectS.cpp index e85dff9426d..ef38543d4b9 100644 --- a/TAO/tao/ImR_Client/ServerObjectS.cpp +++ b/TAO/tao/ImR_Client/ServerObjectS.cpp @@ -65,6 +65,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -996,5 +998,7 @@ POA_ImplementationRepository::ServerObject::_this (ACE_ENV_SINGLE_ARG_DECL) ); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* ifndef */ diff --git a/TAO/tao/ImR_Client/ServerObjectS.h b/TAO/tao/ImR_Client/ServerObjectS.h index f9f7c790be4..c161372e2af 100644 --- a/TAO/tao/ImR_Client/ServerObjectS.h +++ b/TAO/tao/ImR_Client/ServerObjectS.h @@ -46,6 +46,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_sh.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace POA_ImplementationRepository { @@ -263,7 +265,7 @@ namespace POA_ImplementationRepository // TAO_IDL - Generated from // be\be_codegen.cpp:1072 - +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Messaging/ExceptionHolderA.cpp b/TAO/tao/Messaging/ExceptionHolderA.cpp index 4acda37b712..416dd45a937 100644 --- a/TAO/tao/Messaging/ExceptionHolderA.cpp +++ b/TAO/tao/Messaging/ExceptionHolderA.cpp @@ -43,6 +43,7 @@ #if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_typecode/value_typecode.cpp:63 @@ -189,8 +190,8 @@ operator>>= ( ); } - - #endif +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/tao/Messaging/ExceptionHolderA.h b/TAO/tao/Messaging/ExceptionHolderA.h index b3c03859799..6559e3120ee 100644 --- a/TAO/tao/Messaging/ExceptionHolderA.h +++ b/TAO/tao/Messaging/ExceptionHolderA.h @@ -44,6 +44,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace Messaging { @@ -79,6 +81,8 @@ TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, Messagi #endif +TAO_END_VERSIONED_NAMESPACE_DECL + #endif #include /**/ "ace/post.h" diff --git a/TAO/tao/Messaging/ExceptionHolderC.cpp b/TAO/tao/Messaging/ExceptionHolderC.cpp index 285d835210b..49c287cc953 100644 --- a/TAO/tao/Messaging/ExceptionHolderC.cpp +++ b/TAO/tao/Messaging/ExceptionHolderC.cpp @@ -44,6 +44,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -304,4 +306,6 @@ OBV_Messaging::ExceptionHolder::_tao_unmarshal_state (TAO_InputCDR &strm) ); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/tao/Messaging/ExceptionHolderC.h b/TAO/tao/Messaging/ExceptionHolderC.h index ffedf44d5f4..d5544db28f9 100644 --- a/TAO/tao/Messaging/ExceptionHolderC.h +++ b/TAO/tao/Messaging/ExceptionHolderC.h @@ -61,6 +61,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace Messaging { @@ -281,6 +283,8 @@ TAO_Messaging_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Exc // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ExceptionHolderC.inl" #endif /* defined INLINE */ diff --git a/TAO/tao/Messaging/ExceptionHolderC.inl b/TAO/tao/Messaging/ExceptionHolderC.inl index 6348b2eb0c7..cabe51e8d9f 100644 --- a/TAO/tao/Messaging/ExceptionHolderC.inl +++ b/TAO/tao/Messaging/ExceptionHolderC.inl @@ -31,6 +31,8 @@ #if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE Messaging::ExceptionHolder::ExceptionHolder (void) {} @@ -41,4 +43,6 @@ Messaging::ExceptionHolder::_tao_obv_static_repository_id () return "IDL:omg.org/Messaging/ExceptionHolder:1.0"; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif diff --git a/TAO/tao/Messaging/MessagingA.cpp b/TAO/tao/Messaging/MessagingA.cpp index ae94cc8598a..fd18b39c162 100644 --- a/TAO/tao/Messaging/MessagingA.cpp +++ b/TAO/tao/Messaging/MessagingA.cpp @@ -35,6 +35,8 @@ #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 @@ -164,3 +166,5 @@ operator>>= ( } #endif + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/MessagingA.h b/TAO/tao/Messaging/MessagingA.h index f07ee68a2ab..99c4e29ed37 100644 --- a/TAO/tao/Messaging/MessagingA.h +++ b/TAO/tao/Messaging/MessagingA.h @@ -47,6 +47,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace Messaging { @@ -82,6 +84,8 @@ TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, Messagi #endif +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp index 0fb388a8db1..3916b1bb0e9 100644 --- a/TAO/tao/Messaging/MessagingC.cpp +++ b/TAO/tao/Messaging/MessagingC.cpp @@ -41,6 +41,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -237,3 +239,5 @@ Messaging::ReplyHandler::marshal (TAO_OutputCDR &cdr) return 1; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h index a7ea6b985d0..55375f75eab 100644 --- a/TAO/tao/Messaging/MessagingC.h +++ b/TAO/tao/Messaging/MessagingC.h @@ -66,6 +66,8 @@ #endif #define TAO_EXPORT_MACRO TAO_Messaging_Export +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 @@ -240,6 +242,8 @@ TAO_Messaging_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Rep // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "MessagingC.inl" #endif /* defined INLINE */ diff --git a/TAO/tao/Messaging/MessagingC.inl b/TAO/tao/Messaging/MessagingC.inl index 465190bb2db..ee8e47e7f57 100644 --- a/TAO/tao/Messaging/MessagingC.inl +++ b/TAO/tao/Messaging/MessagingC.inl @@ -25,6 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_interface/interface_ci.cpp:70 @@ -61,3 +62,5 @@ Messaging::ReplyHandler::ReplyHandler ( } #endif /* end #if !defined */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp index 65746739df0..714f9cfac20 100644 --- a/TAO/tao/Messaging/MessagingS.cpp +++ b/TAO/tao/Messaging/MessagingS.cpp @@ -63,6 +63,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -795,5 +797,7 @@ POA_Messaging::ReplyHandler::_this (ACE_ENV_SINGLE_ARG_DECL) ); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* ifndef */ diff --git a/TAO/tao/Messaging/MessagingS.h b/TAO/tao/Messaging/MessagingS.h index c633f3027ba..47e30a286a6 100644 --- a/TAO/tao/Messaging/MessagingS.h +++ b/TAO/tao/Messaging/MessagingS.h @@ -46,6 +46,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_sh.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace POA_Messaging { @@ -201,6 +203,8 @@ namespace POA_Messaging // TAO_IDL - Generated from // be\be_codegen.cpp:1072 +TAO_END_VERSIONED_NAMESPACE_DECL + #include "MessagingS_T.h" diff --git a/TAO/tao/Messaging/MessagingS_T.h b/TAO/tao/Messaging/MessagingS_T.h index 426a76f0529..46541951dbb 100644 --- a/TAO/tao/Messaging/MessagingS_T.h +++ b/TAO/tao/Messaging/MessagingS_T.h @@ -33,6 +33,8 @@ #include /**/ "ace/pre.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_root/root_sth.cpp:116 @@ -93,6 +95,8 @@ namespace POA_Messaging // TAO_IDL - Generated from // be\be_codegen.cpp:1165 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "MessagingS_T.inl" #endif /* defined INLINE */ diff --git a/TAO/tao/Messaging/MessagingS_T.inl b/TAO/tao/Messaging/MessagingS_T.inl index 0a3b3cfd130..45319a7c078 100644 --- a/TAO/tao/Messaging/MessagingS_T.inl +++ b/TAO/tao/Messaging/MessagingS_T.inl @@ -25,6 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_interface/tie_si.cpp:96 @@ -119,3 +120,4 @@ POA_Messaging::ReplyHandler_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) return this->ReplyHandler::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging_No_ImplA.cpp b/TAO/tao/Messaging/Messaging_No_ImplA.cpp index cb4d2d6d29a..8e39beebd03 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplA.cpp +++ b/TAO/tao/Messaging/Messaging_No_ImplA.cpp @@ -38,6 +38,8 @@ #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -493,3 +495,5 @@ void operator<<= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging_No_ImplA.h b/TAO/tao/Messaging/Messaging_No_ImplA.h index a2d24bed959..f6f30be698c 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplA.h +++ b/TAO/tao/Messaging/Messaging_No_ImplA.h @@ -42,6 +42,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace Messaging { @@ -151,6 +153,8 @@ TAO_Messaging_Export void operator<<= (::CORBA::Any &, Messaging::RoutingTypeRan TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, Messaging::RoutingTypeRange *&); // deprecated TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const Messaging::RoutingTypeRange *&); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.cpp b/TAO/tao/Messaging/Messaging_No_ImplC.cpp index cd27dfdd4bc..8ba47ccb99a 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplC.cpp +++ b/TAO/tao/Messaging/Messaging_No_ImplC.cpp @@ -36,6 +36,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -1488,3 +1490,5 @@ Messaging::QueueOrderPolicy::marshal (TAO_OutputCDR &) (strm >> _tao_aggregate.min) && (strm >> _tao_aggregate.max); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.h b/TAO/tao/Messaging/Messaging_No_ImplC.h index 8efa3edd9dd..87552735230 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplC.h +++ b/TAO/tao/Messaging/Messaging_No_ImplC.h @@ -64,6 +64,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace Messaging { @@ -1763,6 +1765,8 @@ TAO_Messaging_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Rou // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp index 480dc301af5..16c8f6c7d0e 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp +++ b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp @@ -35,6 +35,8 @@ #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/alias_typecode.cpp:50 @@ -71,4 +73,4 @@ namespace Messaging &_tao_tc_Messaging_RelativeRoundtripTimeoutPolicy; } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyA.h b/TAO/tao/Messaging/Messaging_RT_PolicyA.h index 02ca2ce7790..3157100a186 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyA.h +++ b/TAO/tao/Messaging/Messaging_RT_PolicyA.h @@ -42,6 +42,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace Messaging { @@ -60,6 +62,8 @@ namespace Messaging } // module Messaging +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp index 8b89e1d6b0d..3e602455741 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp +++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp @@ -36,6 +36,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -166,3 +168,5 @@ Messaging::RelativeRoundtripTimeoutPolicy::marshal (TAO_OutputCDR &) { return false; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.h b/TAO/tao/Messaging/Messaging_RT_PolicyC.h index 94187df87b4..13ede4c1d54 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyC.h +++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.h @@ -58,6 +58,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace Messaging { @@ -223,6 +225,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp index 587d65ab1a9..a09d5f5cd7d 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp @@ -35,6 +35,8 @@ #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 @@ -51,4 +53,4 @@ namespace Messaging &_tao_tc_Messaging_SyncScopePolicy; } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.h b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.h index daa19a0c347..ba6ac73fb6d 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.h +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.h @@ -42,6 +42,9 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace Messaging { @@ -55,6 +58,8 @@ namespace Messaging } // module Messaging +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp index ff6a8d19564..b58c9d4516b 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp @@ -36,6 +36,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -166,3 +168,5 @@ Messaging::SyncScopePolicy::marshal (TAO_OutputCDR &) { return false; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h index 8354217f535..3452a884ae4 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h @@ -58,6 +58,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace Messaging { @@ -217,6 +219,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Messaging/OldExceptionHolderA.cpp b/TAO/tao/Messaging/OldExceptionHolderA.cpp index 8de6c9b59be..467fb084ecb 100644 --- a/TAO/tao/Messaging/OldExceptionHolderA.cpp +++ b/TAO/tao/Messaging/OldExceptionHolderA.cpp @@ -43,6 +43,8 @@ #if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_defn.cpp:937 @@ -187,4 +189,6 @@ operator>>= ( #endif +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* */ diff --git a/TAO/tao/Messaging/OldExceptionHolderA.h b/TAO/tao/Messaging/OldExceptionHolderA.h index 428e264c75d..f7b5a946231 100644 --- a/TAO/tao/Messaging/OldExceptionHolderA.h +++ b/TAO/tao/Messaging/OldExceptionHolderA.h @@ -42,6 +42,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace Messaging { @@ -77,6 +79,8 @@ TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, Messagi #endif +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Messaging/OldExceptionHolderC.cpp b/TAO/tao/Messaging/OldExceptionHolderC.cpp index a51fe765e3c..c3aca20ad91 100644 --- a/TAO/tao/Messaging/OldExceptionHolderC.cpp +++ b/TAO/tao/Messaging/OldExceptionHolderC.cpp @@ -39,6 +39,8 @@ #if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 @@ -337,4 +339,6 @@ OBV_Messaging::ExceptionHolder::_tao_unmarshal_state (TAO_InputCDR &strm) ); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* */ diff --git a/TAO/tao/Messaging/OldExceptionHolderC.h b/TAO/tao/Messaging/OldExceptionHolderC.h index 6c4049eb423..b756d8a1107 100644 --- a/TAO/tao/Messaging/OldExceptionHolderC.h +++ b/TAO/tao/Messaging/OldExceptionHolderC.h @@ -61,6 +61,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace Messaging { @@ -288,6 +290,8 @@ TAO_Messaging_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Exc // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "OldExceptionHolderC.inl" #endif /* defined INLINE */ diff --git a/TAO/tao/Messaging/OldExceptionHolderC.inl b/TAO/tao/Messaging/OldExceptionHolderC.inl index 0e9229fa8d4..c2586897783 100644 --- a/TAO/tao/Messaging/OldExceptionHolderC.inl +++ b/TAO/tao/Messaging/OldExceptionHolderC.inl @@ -31,6 +31,8 @@ #if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE Messaging::ExceptionHolder::ExceptionHolder (void) {} @@ -41,4 +43,6 @@ Messaging::ExceptionHolder::_tao_obv_static_repository_id () return "IDL:omg.org/Messaging/ExceptionHolder:1.0"; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* */ diff --git a/TAO/tao/Messaging/PollableC.cpp b/TAO/tao/Messaging/PollableC.cpp index b2a14c34a8a..7e2dc81be54 100644 --- a/TAO/tao/Messaging/PollableC.cpp +++ b/TAO/tao/Messaging/PollableC.cpp @@ -45,6 +45,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -697,3 +699,4 @@ namespace CORBA } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/PollableC.h b/TAO/tao/Messaging/PollableC.h index 9a76deac2d3..2dadea5c4bd 100644 --- a/TAO/tao/Messaging/PollableC.h +++ b/TAO/tao/Messaging/PollableC.h @@ -56,6 +56,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -575,6 +577,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Messaging/TAO_ExtA.cpp b/TAO/tao/Messaging/TAO_ExtA.cpp index 82aadf99bb3..73955e1533d 100644 --- a/TAO/tao/Messaging/TAO_ExtA.cpp +++ b/TAO/tao/Messaging/TAO_ExtA.cpp @@ -35,6 +35,8 @@ #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 @@ -51,4 +53,4 @@ namespace TAO &_tao_tc_TAO_ConnectionTimeoutPolicy; } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/TAO_ExtA.h b/TAO/tao/Messaging/TAO_ExtA.h index c83d58ed9e0..2655e7a426a 100644 --- a/TAO/tao/Messaging/TAO_ExtA.h +++ b/TAO/tao/Messaging/TAO_ExtA.h @@ -42,6 +42,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { @@ -55,6 +57,8 @@ namespace TAO } // module TAO +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Messaging/TAO_ExtC.cpp b/TAO/tao/Messaging/TAO_ExtC.cpp index 597218703ad..a5e3dd66e03 100644 --- a/TAO/tao/Messaging/TAO_ExtC.cpp +++ b/TAO/tao/Messaging/TAO_ExtC.cpp @@ -36,6 +36,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -166,3 +168,5 @@ TAO::ConnectionTimeoutPolicy::marshal (TAO_OutputCDR &) { return false; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/TAO_ExtC.h b/TAO/tao/Messaging/TAO_ExtC.h index edc68f14de5..1e08d457080 100644 --- a/TAO/tao/Messaging/TAO_ExtC.h +++ b/TAO/tao/Messaging/TAO_ExtC.h @@ -58,6 +58,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { @@ -217,6 +219,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp b/TAO/tao/ObjRefTemplate/Default_ORTA.cpp index ccf1e5bb0fc..00e305d93aa 100644 --- a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp +++ b/TAO/tao/ObjRefTemplate/Default_ORTA.cpp @@ -36,6 +36,8 @@ #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/value_typecode.cpp:50 @@ -121,4 +123,4 @@ operator>>= ( ); } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp index f44925afb77..0bc55fa009a 100644 --- a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp +++ b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp @@ -44,6 +44,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -239,3 +241,5 @@ OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_state (TAO_InputCDR true ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.h b/TAO/tao/ObjRefTemplate/Default_ORTC.h index f7f225bf63b..cab7c82bdaf 100644 --- a/TAO/tao/ObjRefTemplate/Default_ORTC.h +++ b/TAO/tao/ObjRefTemplate/Default_ORTC.h @@ -67,6 +67,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO_Default_ORT { @@ -238,6 +240,8 @@ TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::Objec // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "Default_ORTC.inl" #endif /* defined INLINE */ diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp index a5fcc1c409e..d712cc5e368 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp @@ -38,6 +38,8 @@ #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be/be_visitor_typecode/value_typecode.cpp:50 @@ -317,3 +319,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp index 9ffbc54f337..f14130532ee 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp @@ -50,6 +50,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -487,3 +489,5 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h index 70c007519ce..e9508181cb4 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h @@ -75,6 +75,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -430,6 +432,8 @@ TAO_ORT_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ObjectReferenceTemplateC.inl" #endif /* defined INLINE */ diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h index 1b15e680078..e8fa34cf1bb 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h @@ -71,6 +71,8 @@ // TAO_IDL - Generated from // be\be_visitor_traits.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Traits specializations. namespace TAO { @@ -79,6 +81,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:963 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PI/ClientRequestInfoA.cpp b/TAO/tao/PI/ClientRequestInfoA.cpp index 0f9a537531a..c550083982f 100644 --- a/TAO/tao/PI/ClientRequestInfoA.cpp +++ b/TAO/tao/PI/ClientRequestInfoA.cpp @@ -36,6 +36,8 @@ #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 @@ -53,3 +55,4 @@ namespace PortableInterceptor } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/ClientRequestInfoA.h b/TAO/tao/PI/ClientRequestInfoA.h index a0f63205b6f..54fc23da5bd 100644 --- a/TAO/tao/PI/ClientRequestInfoA.h +++ b/TAO/tao/PI/ClientRequestInfoA.h @@ -43,6 +43,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -56,6 +58,8 @@ namespace PortableInterceptor } // module PortableInterceptor +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PI/ClientRequestInfoC.cpp b/TAO/tao/PI/ClientRequestInfoC.cpp index f7a5cd3d52f..668c57b6967 100644 --- a/TAO/tao/PI/ClientRequestInfoC.cpp +++ b/TAO/tao/PI/ClientRequestInfoC.cpp @@ -36,6 +36,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -166,3 +168,5 @@ PortableInterceptor::ClientRequestInfo::marshal (TAO_OutputCDR &) { return false; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/ClientRequestInterceptorA.cpp b/TAO/tao/PI/ClientRequestInterceptorA.cpp index 8fce3456a17..41f26d62e49 100644 --- a/TAO/tao/PI/ClientRequestInterceptorA.cpp +++ b/TAO/tao/PI/ClientRequestInterceptorA.cpp @@ -36,6 +36,8 @@ #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 @@ -53,3 +55,4 @@ namespace PortableInterceptor } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/ClientRequestInterceptorA.h b/TAO/tao/PI/ClientRequestInterceptorA.h index 0836a284431..3f99475e2fe 100644 --- a/TAO/tao/PI/ClientRequestInterceptorA.h +++ b/TAO/tao/PI/ClientRequestInterceptorA.h @@ -42,6 +42,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -55,6 +57,8 @@ namespace PortableInterceptor } // module PortableInterceptor +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PI/ClientRequestInterceptorC.cpp b/TAO/tao/PI/ClientRequestInterceptorC.cpp index 5e5ae824486..199069ab999 100644 --- a/TAO/tao/PI/ClientRequestInterceptorC.cpp +++ b/TAO/tao/PI/ClientRequestInterceptorC.cpp @@ -36,6 +36,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -166,3 +168,5 @@ PortableInterceptor::ClientRequestInterceptor::marshal (TAO_OutputCDR &) { return false; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/InterceptorA.cpp b/TAO/tao/PI/InterceptorA.cpp index 7a95ba8f8ac..290604176d3 100644 --- a/TAO/tao/PI/InterceptorA.cpp +++ b/TAO/tao/PI/InterceptorA.cpp @@ -36,6 +36,8 @@ #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 @@ -52,4 +54,4 @@ namespace PortableInterceptor &_tao_tc_PortableInterceptor_Interceptor; } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/InterceptorA.h b/TAO/tao/PI/InterceptorA.h index 1b84221641a..f749d91e8a1 100644 --- a/TAO/tao/PI/InterceptorA.h +++ b/TAO/tao/PI/InterceptorA.h @@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -53,6 +55,8 @@ namespace PortableInterceptor } // module PortableInterceptor +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PI/InterceptorC.cpp b/TAO/tao/PI/InterceptorC.cpp index daa23625037..eda67ffce4c 100644 --- a/TAO/tao/PI/InterceptorC.cpp +++ b/TAO/tao/PI/InterceptorC.cpp @@ -36,6 +36,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -162,3 +164,5 @@ PortableInterceptor::Interceptor::marshal (TAO_OutputCDR &) { return false; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/InterceptorC.h b/TAO/tao/PI/InterceptorC.h index 00816f382d3..55841315bfe 100644 --- a/TAO/tao/PI/InterceptorC.h +++ b/TAO/tao/PI/InterceptorC.h @@ -55,6 +55,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -199,6 +201,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PI/InvalidSlotA.h b/TAO/tao/PI/InvalidSlotA.h index bd02e893965..323675bc790 100644 --- a/TAO/tao/PI/InvalidSlotA.h +++ b/TAO/tao/PI/InvalidSlotA.h @@ -60,6 +60,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { // TAO_IDL - Generated from @@ -91,6 +93,8 @@ TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInte // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PI/InvalidSlotC.cpp b/TAO/tao/PI/InvalidSlotC.cpp index 441c13306f4..d0c59762242 100644 --- a/TAO/tao/PI/InvalidSlotC.cpp +++ b/TAO/tao/PI/InvalidSlotC.cpp @@ -41,6 +41,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -171,3 +173,5 @@ CORBA::Boolean operator>> ( { return true; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/InvalidSlotC.h b/TAO/tao/PI/InvalidSlotC.h index 47acd600e79..cefb3fb9adb 100644 --- a/TAO/tao/PI/InvalidSlotC.h +++ b/TAO/tao/PI/InvalidSlotC.h @@ -61,6 +61,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -131,6 +133,8 @@ TAO_PI_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::In // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PI/ORBInitializerA.cpp b/TAO/tao/PI/ORBInitializerA.cpp index 2c6f6319e8f..83a81a36b55 100644 --- a/TAO/tao/PI/ORBInitializerA.cpp +++ b/TAO/tao/PI/ORBInitializerA.cpp @@ -35,6 +35,8 @@ #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 @@ -51,4 +53,4 @@ namespace PortableInterceptor &_tao_tc_PortableInterceptor_ORBInitializer; } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/ORBInitializerA.h b/TAO/tao/PI/ORBInitializerA.h index 6e5645f8727..fa6f6273d1e 100644 --- a/TAO/tao/PI/ORBInitializerA.h +++ b/TAO/tao/PI/ORBInitializerA.h @@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -53,6 +55,8 @@ namespace PortableInterceptor } // module PortableInterceptor +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PI/ORBInitializerC.cpp b/TAO/tao/PI/ORBInitializerC.cpp index 507d02aa8a8..b476a04c6b2 100644 --- a/TAO/tao/PI/ORBInitializerC.cpp +++ b/TAO/tao/PI/ORBInitializerC.cpp @@ -36,6 +36,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -162,3 +164,5 @@ PortableInterceptor::ORBInitializer::marshal (TAO_OutputCDR &) { return false; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/ORBInitializerC.h b/TAO/tao/PI/ORBInitializerC.h index 73ea632256b..95080c13aca 100644 --- a/TAO/tao/PI/ORBInitializerC.h +++ b/TAO/tao/PI/ORBInitializerC.h @@ -55,6 +55,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -245,6 +247,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PI/PICurrentA.cpp b/TAO/tao/PI/PICurrentA.cpp index 27411a28fcb..a10e9724137 100644 --- a/TAO/tao/PI/PICurrentA.cpp +++ b/TAO/tao/PI/PICurrentA.cpp @@ -35,6 +35,8 @@ #include "PICurrentA.h" #include "tao/CDR.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -127,3 +129,5 @@ operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PICurrentA.h b/TAO/tao/PI/PICurrentA.h index 092901e4ad4..668e6ba90cb 100644 --- a/TAO/tao/PI/PICurrentA.h +++ b/TAO/tao/PI/PICurrentA.h @@ -60,6 +60,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { // TAO_IDL - Generated from @@ -82,6 +84,8 @@ TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableIntercepto // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PI/PICurrentC.h b/TAO/tao/PI/PICurrentC.h index 242cd2d0ca5..ba9e11adddb 100644 --- a/TAO/tao/PI/PICurrentC.h +++ b/TAO/tao/PI/PICurrentC.h @@ -68,6 +68,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -217,6 +219,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PI/PIForwardRequestA.cpp b/TAO/tao/PI/PIForwardRequestA.cpp index 9596177b573..7e068a2c524 100644 --- a/TAO/tao/PI/PIForwardRequestA.cpp +++ b/TAO/tao/PI/PIForwardRequestA.cpp @@ -35,6 +35,8 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO extension - the virtual _type method. ::CORBA::TypeCode_ptr PortableInterceptor::ForwardRequest::_tao_type (void) const { @@ -155,3 +157,5 @@ void operator<<= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PIForwardRequestA.h b/TAO/tao/PI/PIForwardRequestA.h index 1e2035e9e15..56ccfdaa1ba 100644 --- a/TAO/tao/PI/PIForwardRequestA.h +++ b/TAO/tao/PI/PIForwardRequestA.h @@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -61,6 +63,8 @@ TAO_PI_Export void operator<<= (::CORBA::Any &, PortableInterceptor::ForwardRequ TAO_PI_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, PortableInterceptor::ForwardRequest *&); // deprecated TAO_PI_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const PortableInterceptor::ForwardRequest *&); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PI/PIForwardRequestC.cpp b/TAO/tao/PI/PIForwardRequestC.cpp index a8391b7b812..9e24f47bb6f 100644 --- a/TAO/tao/PI/PIForwardRequestC.cpp +++ b/TAO/tao/PI/PIForwardRequestC.cpp @@ -37,6 +37,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -194,3 +196,5 @@ PortableInterceptor::ForwardRequest::ForwardRequest ( (strm >> _tao_aggregate.forward.out ()) ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PIForwardRequestC.h b/TAO/tao/PI/PIForwardRequestC.h index a6eddc3e4e6..73de9b859a6 100644 --- a/TAO/tao/PI/PIForwardRequestC.h +++ b/TAO/tao/PI/PIForwardRequestC.h @@ -53,6 +53,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -128,6 +130,8 @@ TAO_PI_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor:: // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PI/PolicyFactoryA.cpp b/TAO/tao/PI/PolicyFactoryA.cpp index 2baee0a8ac0..c6e151c09c7 100644 --- a/TAO/tao/PI/PolicyFactoryA.cpp +++ b/TAO/tao/PI/PolicyFactoryA.cpp @@ -35,6 +35,8 @@ #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 @@ -51,4 +53,4 @@ namespace PortableInterceptor &_tao_tc_PortableInterceptor_PolicyFactory; } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PolicyFactoryA.h b/TAO/tao/PI/PolicyFactoryA.h index 74940eade6c..2bbd578a36e 100644 --- a/TAO/tao/PI/PolicyFactoryA.h +++ b/TAO/tao/PI/PolicyFactoryA.h @@ -37,6 +37,7 @@ #include "tao/PI/PolicyFactoryC.h" #include "tao/AnyTypeCode/PolicyA.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 @@ -54,6 +55,8 @@ namespace PortableInterceptor } // module PortableInterceptor +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PI/PolicyFactoryC.cpp b/TAO/tao/PI/PolicyFactoryC.cpp index fc549654c43..0d4657699c2 100644 --- a/TAO/tao/PI/PolicyFactoryC.cpp +++ b/TAO/tao/PI/PolicyFactoryC.cpp @@ -36,6 +36,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -174,3 +176,5 @@ PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType CORBA::Policy::_nil ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PolicyFactoryC.h b/TAO/tao/PI/PolicyFactoryC.h index dd42f38eef8..9737af6be89 100644 --- a/TAO/tao/PI/PolicyFactoryC.h +++ b/TAO/tao/PI/PolicyFactoryC.h @@ -60,6 +60,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -207,6 +209,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PI/RequestInfoA.cpp b/TAO/tao/PI/RequestInfoA.cpp index ea7f68a4cca..c8ad4d80ebc 100644 --- a/TAO/tao/PI/RequestInfoA.cpp +++ b/TAO/tao/PI/RequestInfoA.cpp @@ -36,6 +36,8 @@ #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 @@ -52,4 +54,4 @@ namespace PortableInterceptor &_tao_tc_PortableInterceptor_RequestInfo; } - +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/RequestInfoA.h b/TAO/tao/PI/RequestInfoA.h index 7e1510b0bf5..e1290cb2124 100644 --- a/TAO/tao/PI/RequestInfoA.h +++ b/TAO/tao/PI/RequestInfoA.h @@ -45,6 +45,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -58,6 +60,8 @@ namespace PortableInterceptor } // module PortableInterceptor +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PI/RequestInfoC.cpp b/TAO/tao/PI/RequestInfoC.cpp index 300b136a76e..7e42e72ee0e 100644 --- a/TAO/tao/PI/RequestInfoC.cpp +++ b/TAO/tao/PI/RequestInfoC.cpp @@ -36,6 +36,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -162,3 +164,5 @@ PortableInterceptor::RequestInfo::marshal (TAO_OutputCDR &) { return false; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/RequestInfoC.h b/TAO/tao/PI/RequestInfoC.h index b75230dafd6..7c9b60ae17f 100644 --- a/TAO/tao/PI/RequestInfoC.h +++ b/TAO/tao/PI/RequestInfoC.h @@ -64,6 +64,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -332,6 +334,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PI_Server/ServerRequestInfoA.cpp b/TAO/tao/PI_Server/ServerRequestInfoA.cpp index 514a418c751..c2de1e45236 100644 --- a/TAO/tao/PI_Server/ServerRequestInfoA.cpp +++ b/TAO/tao/PI_Server/ServerRequestInfoA.cpp @@ -36,6 +36,8 @@ #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 @@ -53,3 +55,4 @@ namespace PortableInterceptor } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/ServerRequestInfoA.h b/TAO/tao/PI_Server/ServerRequestInfoA.h index 680a45acc98..1766f29ea93 100644 --- a/TAO/tao/PI_Server/ServerRequestInfoA.h +++ b/TAO/tao/PI_Server/ServerRequestInfoA.h @@ -43,6 +43,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -56,6 +58,8 @@ namespace PortableInterceptor } // module PortableInterceptor +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PI_Server/ServerRequestInfoC.cpp b/TAO/tao/PI_Server/ServerRequestInfoC.cpp index 9f2c4d4a524..369ef8bdde0 100644 --- a/TAO/tao/PI_Server/ServerRequestInfoC.cpp +++ b/TAO/tao/PI_Server/ServerRequestInfoC.cpp @@ -37,6 +37,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -167,3 +169,5 @@ PortableInterceptor::ServerRequestInfo::marshal (TAO_OutputCDR &) { return false; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/ServerRequestInfoC.h b/TAO/tao/PI_Server/ServerRequestInfoC.h index 7df272daa25..bcefdc89906 100644 --- a/TAO/tao/PI_Server/ServerRequestInfoC.h +++ b/TAO/tao/PI_Server/ServerRequestInfoC.h @@ -62,6 +62,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -303,6 +305,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp index b91ba552fe5..851dd83180c 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp +++ b/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp @@ -36,6 +36,8 @@ #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 @@ -53,3 +55,4 @@ namespace PortableInterceptor } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorA.h b/TAO/tao/PI_Server/ServerRequestInterceptorA.h index c01c91db449..6ed94797f14 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorA.h +++ b/TAO/tao/PI_Server/ServerRequestInterceptorA.h @@ -43,6 +43,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -56,6 +58,8 @@ namespace PortableInterceptor } // module PortableInterceptor +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp index 343bbceb502..3a6c10cdbdb 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp +++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp @@ -37,6 +37,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -167,3 +169,5 @@ PortableInterceptor::ServerRequestInterceptor::marshal (TAO_OutputCDR &) { return false; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.h b/TAO/tao/PI_Server/ServerRequestInterceptorC.h index 1003d070540..ec784b9d706 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorC.h +++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.h @@ -59,6 +59,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableInterceptor { @@ -303,6 +305,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/AdapterActivatorA.cpp b/TAO/tao/PortableServer/AdapterActivatorA.cpp index 0e381b61957..cdada812597 100644 --- a/TAO/tao/PortableServer/AdapterActivatorA.cpp +++ b/TAO/tao/PortableServer/AdapterActivatorA.cpp @@ -37,6 +37,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -53,4 +55,6 @@ namespace PortableServer &_tao_tc_PortableServer_AdapterActivator; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/AdapterActivatorA.h b/TAO/tao/PortableServer/AdapterActivatorA.h index b67fd60fcae..99ac21d6918 100644 --- a/TAO/tao/PortableServer/AdapterActivatorA.h +++ b/TAO/tao/PortableServer/AdapterActivatorA.h @@ -41,6 +41,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -54,6 +56,8 @@ namespace PortableServer } // module PortableServer +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/AdapterActivatorC.cpp b/TAO/tao/PortableServer/AdapterActivatorC.cpp index 14a2fbb7712..11ddfbaeab3 100644 --- a/TAO/tao/PortableServer/AdapterActivatorC.cpp +++ b/TAO/tao/PortableServer/AdapterActivatorC.cpp @@ -38,6 +38,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -165,4 +167,6 @@ PortableServer::AdapterActivator::marshal (TAO_OutputCDR &) return false; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/AdapterActivatorC.h b/TAO/tao/PortableServer/AdapterActivatorC.h index de4186e65c1..7c69d6fbee6 100644 --- a/TAO/tao/PortableServer/AdapterActivatorC.h +++ b/TAO/tao/PortableServer/AdapterActivatorC.h @@ -59,6 +59,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { // TAO_IDL - Generated from @@ -191,6 +193,8 @@ namespace TAO #endif /* end #if !defined */ } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ // TAO_IDL - Generated from diff --git a/TAO/tao/PortableServer/ForwardRequestA.cpp b/TAO/tao/PortableServer/ForwardRequestA.cpp index e7f7a7415bf..f74ba34eeb1 100644 --- a/TAO/tao/PortableServer/ForwardRequestA.cpp +++ b/TAO/tao/PortableServer/ForwardRequestA.cpp @@ -37,6 +37,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO extension - the virtual _type method. CORBA::TypeCode_ptr PortableServer::ForwardRequest::_tao_type (void) const { @@ -156,4 +158,6 @@ CORBA::Boolean operator>>= ( ); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ForwardRequestA.h b/TAO/tao/PortableServer/ForwardRequestA.h index 7334c86752b..9dfac3f1406 100644 --- a/TAO/tao/PortableServer/ForwardRequestA.h +++ b/TAO/tao/PortableServer/ForwardRequestA.h @@ -41,6 +41,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -62,6 +64,8 @@ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Forwar TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ForwardRequest *&); // deprecated TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ForwardRequest *&); +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/ForwardRequestC.cpp b/TAO/tao/PortableServer/ForwardRequestC.cpp index c062858725e..4254786753d 100644 --- a/TAO/tao/PortableServer/ForwardRequestC.cpp +++ b/TAO/tao/PortableServer/ForwardRequestC.cpp @@ -39,6 +39,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -197,4 +199,6 @@ CORBA::Boolean operator>> ( ); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ForwardRequestC.h b/TAO/tao/PortableServer/ForwardRequestC.h index 68cd5c23e74..ce718a8efcc 100644 --- a/TAO/tao/PortableServer/ForwardRequestC.h +++ b/TAO/tao/PortableServer/ForwardRequestC.h @@ -55,6 +55,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -130,6 +132,8 @@ namespace TAO TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ForwardRequest &); TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &); +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ // TAO_IDL - Generated from diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp index ad3a8c200b3..67babedb32c 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp +++ b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp @@ -36,6 +36,8 @@ #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Basic_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 @@ -108,3 +110,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyA.h b/TAO/tao/PortableServer/IdAssignmentPolicyA.h index 5e640efa07f..54a3ce33743 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicyA.h +++ b/TAO/tao/PortableServer/IdAssignmentPolicyA.h @@ -41,6 +41,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -65,6 +67,8 @@ namespace PortableServer TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicyValue &); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp index dae4a91d05b..b34377d544b 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp +++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp @@ -36,6 +36,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -187,3 +189,5 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::IdAssignmentPoli return _tao_success; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.h b/TAO/tao/PortableServer/IdAssignmentPolicyC.h index f7c43ec160d..07e80d1c413 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicyC.h +++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.h @@ -57,6 +57,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -228,6 +230,8 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer // TAO_IDL - Generated from // be\be_codegen.cpp:1028 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp index 49e84fb2d7e..0a9cd7862f4 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp +++ b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp @@ -37,6 +37,7 @@ #include "IdUniquenessPolicyA.h" #include "tao/CDR.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 @@ -110,3 +111,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyA.h b/TAO/tao/PortableServer/IdUniquenessPolicyA.h index 22d04465329..6b73c4023ec 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicyA.h +++ b/TAO/tao/PortableServer/IdUniquenessPolicyA.h @@ -41,6 +41,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -65,6 +67,8 @@ namespace PortableServer TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicyValue &); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp index 340160fd2fc..03262776418 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp +++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp @@ -36,6 +36,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -187,3 +189,5 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::IdUniquenessPoli return _tao_success; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.h b/TAO/tao/PortableServer/IdUniquenessPolicyC.h index dbdeb5d2ed6..fd9bc6d04b9 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicyC.h +++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.h @@ -57,6 +57,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -228,6 +230,8 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer // TAO_IDL - Generated from // be\be_codegen.cpp:1028 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp index dbf3b01f052..3532ef7e09c 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp @@ -38,6 +38,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 @@ -111,4 +113,6 @@ CORBA::Boolean operator>>= ( ); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyA.h b/TAO/tao/PortableServer/ImplicitActivationPolicyA.h index 70e35ef75ac..0d2f117c498 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicyA.h +++ b/TAO/tao/PortableServer/ImplicitActivationPolicyA.h @@ -41,6 +41,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -65,6 +67,8 @@ namespace PortableServer TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp index 825dd9af720..1ec3a6abc53 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp @@ -38,6 +38,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -190,4 +192,6 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::ImplicitActivati return _tao_success; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.h b/TAO/tao/PortableServer/ImplicitActivationPolicyC.h index 82f509d1bd9..00029e2e0e6 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.h +++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.h @@ -57,6 +57,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -235,6 +237,8 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer // TAO_IDL - Generated from // be\be_codegen.cpp:1028 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/LifespanPolicyA.cpp b/TAO/tao/PortableServer/LifespanPolicyA.cpp index bfee89df475..1e3eab01c54 100644 --- a/TAO/tao/PortableServer/LifespanPolicyA.cpp +++ b/TAO/tao/PortableServer/LifespanPolicyA.cpp @@ -36,6 +36,8 @@ #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Basic_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 @@ -108,3 +110,5 @@ CORBA::Boolean operator>>= ( _tao_elem ); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/LifespanPolicyA.h b/TAO/tao/PortableServer/LifespanPolicyA.h index cd12e1ef5b5..1c9efe26c1a 100644 --- a/TAO/tao/PortableServer/LifespanPolicyA.h +++ b/TAO/tao/PortableServer/LifespanPolicyA.h @@ -41,6 +41,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -65,6 +67,8 @@ namespace PortableServer TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicyValue &); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/LifespanPolicyC.cpp b/TAO/tao/PortableServer/LifespanPolicyC.cpp index 832e35bf202..dd60e004e5c 100644 --- a/TAO/tao/PortableServer/LifespanPolicyC.cpp +++ b/TAO/tao/PortableServer/LifespanPolicyC.cpp @@ -36,6 +36,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -187,3 +189,5 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::LifespanPolicyVa return _tao_success; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/LifespanPolicyC.h b/TAO/tao/PortableServer/LifespanPolicyC.h index 3213dce6668..08f87864cc0 100644 --- a/TAO/tao/PortableServer/LifespanPolicyC.h +++ b/TAO/tao/PortableServer/LifespanPolicyC.h @@ -57,6 +57,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -228,6 +230,8 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer // TAO_IDL - Generated from // be\be_codegen.cpp:1028 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/POAManagerC.cpp b/TAO/tao/PortableServer/POAManagerC.cpp index b29a3593b40..decbb1bb138 100644 --- a/TAO/tao/PortableServer/POAManagerC.cpp +++ b/TAO/tao/PortableServer/POAManagerC.cpp @@ -47,6 +47,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -328,3 +330,4 @@ namespace PortableServer } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POAManagerC.h b/TAO/tao/PortableServer/POAManagerC.h index 83cbbebcc56..55274122990 100644 --- a/TAO/tao/PortableServer/POAManagerC.h +++ b/TAO/tao/PortableServer/POAManagerC.h @@ -55,6 +55,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -314,6 +316,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1028 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/PS_CurrentC.cpp b/TAO/tao/PortableServer/PS_CurrentC.cpp index 3f50cd6386f..9c7570b1d50 100644 --- a/TAO/tao/PortableServer/PS_CurrentC.cpp +++ b/TAO/tao/PortableServer/PS_CurrentC.cpp @@ -45,6 +45,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -306,3 +308,4 @@ namespace PortableServer } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/PS_CurrentC.h b/TAO/tao/PortableServer/PS_CurrentC.h index 8e003dd23c1..f897b62f9ce 100644 --- a/TAO/tao/PortableServer/PS_CurrentC.h +++ b/TAO/tao/PortableServer/PS_CurrentC.h @@ -61,6 +61,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -281,6 +283,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1040 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/PS_ForwardA.cpp b/TAO/tao/PortableServer/PS_ForwardA.cpp index 777efdd75a0..38e34e157b3 100644 --- a/TAO/tao/PortableServer/PS_ForwardA.cpp +++ b/TAO/tao/PortableServer/PS_ForwardA.cpp @@ -32,6 +32,8 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -51,3 +53,4 @@ namespace PortableServer } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/PS_ForwardA.h b/TAO/tao/PortableServer/PS_ForwardA.h index 7818c218778..9f37e1a25d4 100644 --- a/TAO/tao/PortableServer/PS_ForwardA.h +++ b/TAO/tao/PortableServer/PS_ForwardA.h @@ -41,6 +41,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -54,6 +56,8 @@ namespace PortableServer } // module PortableServer +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/PS_ForwardC.cpp b/TAO/tao/PortableServer/PS_ForwardC.cpp index c39046225ac..d6ccb8cbbf8 100644 --- a/TAO/tao/PortableServer/PS_ForwardC.cpp +++ b/TAO/tao/PortableServer/PS_ForwardC.cpp @@ -36,8 +36,11 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/PS_ForwardC.h b/TAO/tao/PortableServer/PS_ForwardC.h index 24cb55a00f1..78d76a3c80d 100644 --- a/TAO/tao/PortableServer/PS_ForwardC.h +++ b/TAO/tao/PortableServer/PS_ForwardC.h @@ -52,6 +52,8 @@ #endif #define TAO_EXPORT_MACRO TAO_PortableServer_Export +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ServantBase; class TAO_ServantBase_var; class TAO_Local_ServantBase; @@ -117,6 +119,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1028 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp index 02b37e7afe3..57111f5cdc0 100644 --- a/TAO/tao/PortableServer/PolicyS.cpp +++ b/TAO/tao/PortableServer/PolicyS.cpp @@ -66,6 +66,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -1082,3 +1084,5 @@ POA_CORBA::Policy::_this (ACE_ENV_SINGLE_ARG_DECL) #endif /* ifndef */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h index 8a337b60d65..94b6935de27 100644 --- a/TAO/tao/PortableServer/PolicyS.h +++ b/TAO/tao/PortableServer/PolicyS.h @@ -65,6 +65,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_sh.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace POA_CORBA { @@ -306,6 +308,8 @@ namespace POA_CORBA // TAO_IDL - Generated from // be\be_codegen.cpp:995 +TAO_END_VERSIONED_NAMESPACE_DECL + #include "PolicyS_T.h" diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h index 2e8d80a5198..1feb0eef17c 100644 --- a/TAO/tao/PortableServer/PolicyS_T.h +++ b/TAO/tao/PortableServer/PolicyS_T.h @@ -39,6 +39,8 @@ #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_root/root_sth.cpp:116 @@ -129,6 +131,8 @@ namespace POA_CORBA // TAO_IDL - Generated from // be\be_codegen.cpp:1096 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "PolicyS_T.inl" #endif /* defined INLINE */ diff --git a/TAO/tao/PortableServer/PolicyS_T.inl b/TAO/tao/PortableServer/PolicyS_T.inl index 42c4ad90eac..4bccdaee36d 100644 --- a/TAO/tao/PortableServer/PolicyS_T.inl +++ b/TAO/tao/PortableServer/PolicyS_T.inl @@ -26,6 +26,8 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_interface/tie_si.cpp:96 @@ -167,3 +169,4 @@ void POA_CORBA::Policy_tie<T>::destroy ( ); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp index 4c59d1769ad..46f5df2e735 100644 --- a/TAO/tao/PortableServer/PortableServerC.cpp +++ b/TAO/tao/PortableServer/PortableServerC.cpp @@ -42,6 +42,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -1220,3 +1222,5 @@ PortableServer::POA::marshal (TAO_OutputCDR &) { return false; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h index 7d21fd57717..14948ad62df 100644 --- a/TAO/tao/PortableServer/PortableServerC.h +++ b/TAO/tao/PortableServer/PortableServerC.h @@ -83,6 +83,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -1446,6 +1448,8 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PortableServer/PortableServerS.h b/TAO/tao/PortableServer/PortableServerS.h index 5b1c718ab1c..c963aac74a9 100644 --- a/TAO/tao/PortableServer/PortableServerS.h +++ b/TAO/tao/PortableServer/PortableServerS.h @@ -54,6 +54,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_sh.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace POA_PortableServer { @@ -66,6 +68,8 @@ namespace POA_PortableServer // TAO_IDL - Generated from // be\be_codegen.cpp:1060 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "PortableServerS.inl" diff --git a/TAO/tao/PortableServer/PortableServer_includeC.h b/TAO/tao/PortableServer/PortableServer_includeC.h index 152ccaf4f6a..7de2ae4f9fe 100644 --- a/TAO/tao/PortableServer/PortableServer_includeC.h +++ b/TAO/tao/PortableServer/PortableServer_includeC.h @@ -55,11 +55,15 @@ // TAO_IDL - Generated from // be\be_visitor_traits.cpp:61 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Traits specializations. namespace TAO { } +TAO_END_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_codegen.cpp:1028 diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp index 69e96b2261c..57ce43c3f5b 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp +++ b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp @@ -38,6 +38,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 @@ -112,4 +114,6 @@ CORBA::Boolean operator>>= ( ); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyA.h b/TAO/tao/PortableServer/RequestProcessingPolicyA.h index a00d7522145..9b1693e09d5 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicyA.h +++ b/TAO/tao/PortableServer/RequestProcessingPolicyA.h @@ -41,6 +41,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -65,6 +67,8 @@ namespace PortableServer TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &); +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp index c33d79df47f..a9e2037a522 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp +++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp @@ -38,6 +38,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -190,4 +192,6 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::RequestProcessin return _tao_success; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.h b/TAO/tao/PortableServer/RequestProcessingPolicyC.h index ec1286f49ae..58b9470e78e 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicyC.h +++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.h @@ -57,6 +57,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -235,6 +237,8 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer // TAO_IDL - Generated from // be\be_codegen.cpp:1028 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/ServantActivatorA.cpp b/TAO/tao/PortableServer/ServantActivatorA.cpp index fb2ece136ab..1b1d0a06864 100644 --- a/TAO/tao/PortableServer/ServantActivatorA.cpp +++ b/TAO/tao/PortableServer/ServantActivatorA.cpp @@ -36,6 +36,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -52,4 +54,6 @@ namespace PortableServer &_tao_tc_PortableServer_ServantActivator; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantActivatorA.h b/TAO/tao/PortableServer/ServantActivatorA.h index da5bc2387bf..36249a277e3 100644 --- a/TAO/tao/PortableServer/ServantActivatorA.h +++ b/TAO/tao/PortableServer/ServantActivatorA.h @@ -43,6 +43,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -56,6 +58,8 @@ namespace PortableServer } // module PortableServer +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/ServantActivatorC.cpp b/TAO/tao/PortableServer/ServantActivatorC.cpp index 2a2333d0567..ea7903435e8 100644 --- a/TAO/tao/PortableServer/ServantActivatorC.cpp +++ b/TAO/tao/PortableServer/ServantActivatorC.cpp @@ -39,6 +39,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -170,4 +172,6 @@ PortableServer::ServantActivator::marshal (TAO_OutputCDR &) return false; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantActivatorC.h b/TAO/tao/PortableServer/ServantActivatorC.h index 53e28b18c8a..39fd81603f5 100644 --- a/TAO/tao/PortableServer/ServantActivatorC.h +++ b/TAO/tao/PortableServer/ServantActivatorC.h @@ -61,6 +61,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -215,6 +217,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1028 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/ServantLocatorA.cpp b/TAO/tao/PortableServer/ServantLocatorA.cpp index c08d031be92..94156c9aed6 100644 --- a/TAO/tao/PortableServer/ServantLocatorA.cpp +++ b/TAO/tao/PortableServer/ServantLocatorA.cpp @@ -37,6 +37,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -53,4 +55,6 @@ namespace PortableServer &_tao_tc_PortableServer_ServantLocator; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantLocatorA.h b/TAO/tao/PortableServer/ServantLocatorA.h index 223062154e4..bbfc60753ea 100644 --- a/TAO/tao/PortableServer/ServantLocatorA.h +++ b/TAO/tao/PortableServer/ServantLocatorA.h @@ -44,6 +44,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -57,6 +59,8 @@ namespace PortableServer } // module PortableServer +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/ServantLocatorC.cpp b/TAO/tao/PortableServer/ServantLocatorC.cpp index e20acbb995d..1a25ffb1436 100644 --- a/TAO/tao/PortableServer/ServantLocatorC.cpp +++ b/TAO/tao/PortableServer/ServantLocatorC.cpp @@ -39,6 +39,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -170,4 +172,6 @@ PortableServer::ServantLocator::marshal (TAO_OutputCDR &) return false; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantLocatorC.h b/TAO/tao/PortableServer/ServantLocatorC.h index d0333809f29..19225715457 100644 --- a/TAO/tao/PortableServer/ServantLocatorC.h +++ b/TAO/tao/PortableServer/ServantLocatorC.h @@ -62,6 +62,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -220,6 +222,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1028 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/ServantManagerA.cpp b/TAO/tao/PortableServer/ServantManagerA.cpp index 16d863620a4..f35fb1210bc 100644 --- a/TAO/tao/PortableServer/ServantManagerA.cpp +++ b/TAO/tao/PortableServer/ServantManagerA.cpp @@ -36,6 +36,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -52,4 +54,6 @@ namespace PortableServer &_tao_tc_PortableServer_ServantManager; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantManagerA.h b/TAO/tao/PortableServer/ServantManagerA.h index a3b630bc035..64ab7d6e30b 100644 --- a/TAO/tao/PortableServer/ServantManagerA.h +++ b/TAO/tao/PortableServer/ServantManagerA.h @@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -53,6 +55,8 @@ namespace PortableServer } // module PortableServer +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/ServantManagerC.cpp b/TAO/tao/PortableServer/ServantManagerC.cpp index a870d15bb09..1baa5eb47a8 100644 --- a/TAO/tao/PortableServer/ServantManagerC.cpp +++ b/TAO/tao/PortableServer/ServantManagerC.cpp @@ -36,6 +36,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -164,4 +166,6 @@ PortableServer::ServantManager::marshal (TAO_OutputCDR &) return false; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantManagerC.h b/TAO/tao/PortableServer/ServantManagerC.h index bc6f82dc2ce..d03fde2ae0b 100644 --- a/TAO/tao/PortableServer/ServantManagerC.h +++ b/TAO/tao/PortableServer/ServantManagerC.h @@ -56,6 +56,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -182,6 +184,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1028 +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp index 7fdc593fbac..54330776072 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp @@ -38,6 +38,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 @@ -111,4 +113,6 @@ CORBA::Boolean operator>>= ( ); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyA.h b/TAO/tao/PortableServer/ServantRetentionPolicyA.h index 15576579a76..303a75c039d 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicyA.h +++ b/TAO/tao/PortableServer/ServantRetentionPolicyA.h @@ -43,6 +43,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -67,6 +69,8 @@ namespace PortableServer TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicyValue &); +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp index a1593b6f7a5..25fb30ef661 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp @@ -38,6 +38,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -190,4 +192,6 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::ServantRetention return _tao_success; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.h b/TAO/tao/PortableServer/ServantRetentionPolicyC.h index 5aac210495d..5217f6e659c 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicyC.h +++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.h @@ -57,6 +57,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -230,6 +232,8 @@ namespace TAO TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ServantRetentionPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &); +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ // TAO_IDL - Generated from diff --git a/TAO/tao/PortableServer/ThreadPolicyA.cpp b/TAO/tao/PortableServer/ThreadPolicyA.cpp index 87d85d78165..7799450fd5e 100644 --- a/TAO/tao/PortableServer/ThreadPolicyA.cpp +++ b/TAO/tao/PortableServer/ThreadPolicyA.cpp @@ -41,6 +41,8 @@ #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Basic_Impl_T.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 @@ -114,5 +116,7 @@ CORBA::Boolean operator>>= ( ); } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/ThreadPolicyA.h b/TAO/tao/PortableServer/ThreadPolicyA.h index b74bf2f030e..0f0948e7ab6 100644 --- a/TAO/tao/PortableServer/ThreadPolicyA.h +++ b/TAO/tao/PortableServer/ThreadPolicyA.h @@ -42,6 +42,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -66,6 +68,8 @@ namespace PortableServer TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &); +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/ThreadPolicyC.cpp b/TAO/tao/PortableServer/ThreadPolicyC.cpp index ac2f91049f7..644822f747b 100644 --- a/TAO/tao/PortableServer/ThreadPolicyC.cpp +++ b/TAO/tao/PortableServer/ThreadPolicyC.cpp @@ -38,6 +38,8 @@ #if (TAO_HAS_MINIMUM_POA == 0) +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -190,4 +192,6 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::ThreadPolicyValu return _tao_success; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/ThreadPolicyC.h b/TAO/tao/PortableServer/ThreadPolicyC.h index 4af9f727a2b..398eba195a0 100644 --- a/TAO/tao/PortableServer/ThreadPolicyC.h +++ b/TAO/tao/PortableServer/ThreadPolicyC.h @@ -57,6 +57,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace PortableServer { @@ -230,6 +232,8 @@ namespace TAO TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ThreadPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &); +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ // TAO_IDL - Generated from diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp index bcf7695da87..26a6667a23c 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.cpp +++ b/TAO/tao/RTCORBA/RTCORBAC.cpp @@ -43,6 +43,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -2781,3 +2783,5 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h index 4b2fd379263..294b58b8746 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.h +++ b/TAO/tao/RTCORBA/RTCORBAC.h @@ -78,6 +78,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace RTCORBA { @@ -3498,6 +3500,8 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTCORBA/RTCORBA_includeC.h b/TAO/tao/RTCORBA/RTCORBA_includeC.h index a37e92f1656..0744f8c6611 100644 --- a/TAO/tao/RTCORBA/RTCORBA_includeC.h +++ b/TAO/tao/RTCORBA/RTCORBA_includeC.h @@ -66,6 +66,8 @@ // TAO_IDL - Generated from // .\be\be_visitor_traits.cpp:50 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Traits specializations. namespace TAO { @@ -74,6 +76,8 @@ namespace TAO // TAO_IDL - Generated from // w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/cdr_op.cpp:48 +TAO_END_VERSIONED_NAMESPACE_DECL + #ifndef __ACE_INLINE__ // TAO_IDL - Generated from diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp index cc437d5e9ba..2735dd9db24 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp +++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp @@ -41,6 +41,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -191,3 +193,5 @@ RTPortableServer::POA::marshal (TAO_OutputCDR &) { return false; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h index c6740079e07..78bc7eff130 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerC.h +++ b/TAO/tao/RTPortableServer/RTPortableServerC.h @@ -71,6 +71,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace RTPortableServer { @@ -264,6 +266,8 @@ TAO_RTPortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTPo // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTPortableServer/RTPortableServerS.h b/TAO/tao/RTPortableServer/RTPortableServerS.h index 253d03db8a3..a85828bca7d 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerS.h +++ b/TAO/tao/RTPortableServer/RTPortableServerS.h @@ -54,6 +54,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_sh.cpp:49 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace POA_RTPortableServer { @@ -66,6 +68,7 @@ namespace POA_RTPortableServer // TAO_IDL - Generated from // be\be_codegen.cpp:995 +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "RTPortableServerS.inl" diff --git a/TAO/tao/RTPortableServer/RTPortableServer_includeC.h b/TAO/tao/RTPortableServer/RTPortableServer_includeC.h index 5b6dbc0d6ca..d8cf0b2f527 100644 --- a/TAO/tao/RTPortableServer/RTPortableServer_includeC.h +++ b/TAO/tao/RTPortableServer/RTPortableServer_includeC.h @@ -64,6 +64,8 @@ // TAO_IDL - Generated from // be\be_visitor_traits.cpp:61 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Traits specializations. namespace TAO { @@ -72,6 +74,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTScheduling/RTSchedulerC.cpp b/TAO/tao/RTScheduling/RTSchedulerC.cpp index 464069748a1..93ec0c40352 100644 --- a/TAO/tao/RTScheduling/RTSchedulerC.cpp +++ b/TAO/tao/RTScheduling/RTSchedulerC.cpp @@ -42,6 +42,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -942,3 +944,5 @@ RTScheduling::Scheduler::marshal (TAO_OutputCDR &) { return false; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTScheduling/RTSchedulerC.h b/TAO/tao/RTScheduling/RTSchedulerC.h index 4955b9caf07..6d10850d4b9 100644 --- a/TAO/tao/RTScheduling/RTSchedulerC.h +++ b/TAO/tao/RTScheduling/RTSchedulerC.h @@ -81,6 +81,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -1279,6 +1281,8 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTScheduling/RTScheduler_includeA.h b/TAO/tao/RTScheduling/RTScheduler_includeA.h index d5d3403e8ef..c0d1fb47a98 100644 --- a/TAO/tao/RTScheduling/RTScheduler_includeA.h +++ b/TAO/tao/RTScheduling/RTScheduler_includeA.h @@ -66,6 +66,8 @@ // TAO_IDL - Generated from // C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:58 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Traits specializations. namespace TAO { @@ -74,6 +76,8 @@ namespace TAO // TAO_IDL - Generated from // C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48 +TAO_END_VERSIONED_NAMESPACE_DECL + #ifndef __ACE_INLINE__ // TAO_IDL - Generated from diff --git a/TAO/tao/RTScheduling/RTScheduler_includeC.h b/TAO/tao/RTScheduling/RTScheduler_includeC.h index c1624376b4d..41af68734d6 100644 --- a/TAO/tao/RTScheduling/RTScheduler_includeC.h +++ b/TAO/tao/RTScheduling/RTScheduler_includeC.h @@ -66,6 +66,8 @@ // TAO_IDL - Generated from // C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:58 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Traits specializations. namespace TAO { @@ -74,6 +76,8 @@ namespace TAO // TAO_IDL - Generated from // C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48 +TAO_END_VERSIONED_NAMESPACE_DECL + #ifndef __ACE_INLINE__ // TAO_IDL - Generated from diff --git a/TAO/tao/Strategies.mpc b/TAO/tao/Strategies.mpc index 2f0f709b8f9..256a3ba9f49 100644 --- a/TAO/tao/Strategies.mpc +++ b/TAO/tao/Strategies.mpc @@ -1,6 +1,7 @@ //$Id$ -project : taolib, core, acereactorlib_for_tao, acesocketslib_for_tao, acememorylib_for_tao, core_anytypecode { +project : taolib, core, core_anytypecode { + avoids += ace_for_tao // Requires Unix domain sockets and MEM stuff sharedname = TAO_Strategies dynamicflags = TAO_STRATEGIES_BUILD_DLL diff --git a/TAO/tao/Strategies/sciop_endpointsC.cpp b/TAO/tao/Strategies/sciop_endpointsC.cpp index 21e65ac0c8a..052868ee02b 100644 --- a/TAO/tao/Strategies/sciop_endpointsC.cpp +++ b/TAO/tao/Strategies/sciop_endpointsC.cpp @@ -46,6 +46,8 @@ // TAO_IDL - Generated from // be/be_visitor_arg_traits.cpp:69 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -264,3 +266,5 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_TAO_SCIOPEndpointSequence_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/sciop_endpointsC.h b/TAO/tao/Strategies/sciop_endpointsC.h index 4e89a5b4e47..fa4fd4c9cc2 100644 --- a/TAO/tao/Strategies/sciop_endpointsC.h +++ b/TAO/tao/Strategies/sciop_endpointsC.h @@ -62,6 +62,8 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -183,6 +185,8 @@ TAO_Strategies_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Strategies/uiop_endpointsC.cpp b/TAO/tao/Strategies/uiop_endpointsC.cpp index c3728f7bf79..8995489bae7 100644 --- a/TAO/tao/Strategies/uiop_endpointsC.cpp +++ b/TAO/tao/Strategies/uiop_endpointsC.cpp @@ -46,6 +46,8 @@ // TAO_IDL - Generated from // be/be_visitor_arg_traits.cpp:69 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -261,3 +263,5 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_TAO_UIOPEndpointSequence_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/uiop_endpointsC.h b/TAO/tao/Strategies/uiop_endpointsC.h index f85b1a69906..95307d2dd32 100644 --- a/TAO/tao/Strategies/uiop_endpointsC.h +++ b/TAO/tao/Strategies/uiop_endpointsC.h @@ -62,6 +62,8 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -182,6 +184,8 @@ TAO_Strategies_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/TAO_Singleton_Manager.h b/TAO/tao/TAO_Singleton_Manager.h index 718b9064d5b..50f478988b6 100644 --- a/TAO/tao/TAO_Singleton_Manager.h +++ b/TAO/tao/TAO_Singleton_Manager.h @@ -179,14 +179,13 @@ public: protected: /// Force allocation on the heap. - ~TAO_Singleton_Manager (void); - -private: - //@{ TAO_Singleton_Manager (void); + ~TAO_Singleton_Manager (void); //@} +private: + /// Disallow copying by not implementing the following ... //@{ TAO_Singleton_Manager (const TAO_Singleton_Manager &); diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp index abf38c85ea0..ede894d7dea 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp @@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -186,3 +188,5 @@ CORBA::TypeCodeFactory::marshal (TAO_OutputCDR &) { return false; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h index a620aa9caec..758be0ed147 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h @@ -68,6 +68,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -454,6 +456,8 @@ TAO_TypeCodeFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA // TAO_IDL - Generated from // be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Valuetype/StringValueC.cpp b/TAO/tao/Valuetype/StringValueC.cpp index bb93ab70c34..f5b0bf02e71 100644 --- a/TAO/tao/Valuetype/StringValueC.cpp +++ b/TAO/tao/Valuetype/StringValueC.cpp @@ -54,6 +54,8 @@ // TAO_IDL - Generated from // .\be\be_visitor_arg_traits.cpp:70 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -78,18 +80,16 @@ namespace CORBA &_tao_tc_CORBA_StringValue; } - - // TAO_IDL - Generated from // c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_valuebox/valuebox_cs.cpp:63 + +CORBA::StringValue::~StringValue (void) +{ +} + CORBA::StringValue * CORBA::StringValue::_downcast (CORBA::ValueBase *v) { - if (v == 0) - { - return 0; - } - return dynamic_cast< ::CORBA::StringValue * > (v); } @@ -166,14 +166,13 @@ namespace CORBA // TAO_IDL - Generated from // c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_valuebox/valuebox_cs.cpp:63 +CORBA::WStringValue::~WStringValue (void) +{ +} + CORBA::WStringValue * CORBA::WStringValue::_downcast (CORBA::ValueBase *v) { - if (v == 0) - { - return 0; - } - return dynamic_cast< ::CORBA::WStringValue * > (v); } @@ -402,3 +401,4 @@ operator>> ( return CORBA::WStringValue::_tao_unmarshal (strm, _tao_valuebox); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Valuetype/StringValueC.h b/TAO/tao/Valuetype/StringValueC.h index 19a0ffd5d62..144505c85fa 100644 --- a/TAO/tao/Valuetype/StringValueC.h +++ b/TAO/tao/Valuetype/StringValueC.h @@ -66,6 +66,8 @@ // TAO_IDL - Generated from // c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace CORBA { @@ -305,6 +307,8 @@ TAO_Valuetype_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WStringVa // TAO_IDL - Generated from // .\be\be_codegen.cpp:955 +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "StringValueC.inl" #endif /* defined INLINE */ diff --git a/TAO/tao/Valuetype/StringValueC.inl b/TAO/tao/Valuetype/StringValueC.inl index 493e7c34af6..adf7b097030 100644 --- a/TAO/tao/Valuetype/StringValueC.inl +++ b/TAO/tao/Valuetype/StringValueC.inl @@ -29,15 +29,13 @@ // TAO_IDL - Generated from // c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_valuebox/valuebox_ci.cpp:332 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE CORBA::StringValue::StringValue (void) {} ACE_INLINE -CORBA::StringValue::~StringValue (void) -{} - -ACE_INLINE CORBA::StringValue::StringValue (CORBA::Char * val) { this->_pd_value = val; @@ -170,10 +168,6 @@ CORBA::WStringValue::WStringValue (void) {} ACE_INLINE -CORBA::WStringValue::~WStringValue (void) -{} - -ACE_INLINE CORBA::WStringValue::WStringValue (CORBA::WChar * val) { this->_pd_value = val; @@ -297,3 +291,4 @@ CORBA::WStringValue::_tao_unmarshal_v (TAO_InputCDR & ) } +TAO_END_VERSIONED_NAMESPACE_DECL |