diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-03-31 12:36:24 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-03-31 12:36:24 +0000 |
commit | 6c28c2a448eedef348dd6083dc938477e0e8fb11 (patch) | |
tree | e8cca44396b2dd873a51ed7516f5a3674c62d5b6 /TAO/tao | |
parent | 7ba84906c3ba005f0bee0315580ba4a68bdf3d8c (diff) | |
download | ATCD-6c28c2a448eedef348dd6083dc938477e0e8fb11.tar.gz |
ChangeLogTag: Thu Mar 31 13:05:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao')
91 files changed, 401 insertions, 627 deletions
diff --git a/TAO/tao/BooleanSeqA.cpp b/TAO/tao/BooleanSeqA.cpp index fed7af80e80..b35e8a57a90 100644 --- a/TAO/tao/BooleanSeqA.cpp +++ b/TAO/tao/BooleanSeqA.cpp @@ -35,12 +35,12 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:743 +// be\be_visitor_typecode/typecode_defn.cpp:808 namespace TAO { @@ -74,7 +74,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/BooleanSeqC.cpp b/TAO/tao/BooleanSeqC.cpp index bb662aab409..d11a87d5977 100644 --- a/TAO/tao/BooleanSeqC.cpp +++ b/TAO/tao/BooleanSeqC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "BooleanSeqC.h" diff --git a/TAO/tao/BooleanSeqC.h b/TAO/tao/BooleanSeqC.h index e2318be372f..3c0538ed7a7 100644 --- a/TAO/tao/BooleanSeqC.h +++ b/TAO/tao/BooleanSeqC.h @@ -52,13 +52,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -125,7 +118,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_BooleanSeq; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_BooleanSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -166,7 +159,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_BooleanSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:969 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "BooleanSeqC.inl" diff --git a/TAO/tao/BoundsA.cpp b/TAO/tao/BoundsA.cpp index 734d9a1dfb6..0e1c260bc9b 100644 --- a/TAO/tao/BoundsA.cpp +++ b/TAO/tao/BoundsA.cpp @@ -35,9 +35,9 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:34 -static TAO::TypeCode::Struct_Field<char const *> * const _tao_fields_CORBA_Bounds = 0; +static TAO::TypeCode::Struct_Field<char const *> const * const _tao_fields_CORBA_Bounds = 0; static TAO::TypeCode::Struct<char const *, TAO::TypeCode::Struct_Field<char const *> const *, CORBA::tk_except, @@ -57,7 +57,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp index 3931f405829..750b351b0dd 100644 --- a/TAO/tao/BoundsC.cpp +++ b/TAO/tao/BoundsC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "BoundsC.h" diff --git a/TAO/tao/BoundsC.h b/TAO/tao/BoundsC.h index 8c1b11163ed..6027f08959d 100644 --- a/TAO/tao/BoundsC.h +++ b/TAO/tao/BoundsC.h @@ -49,13 +49,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -117,7 +110,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Bounds; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Bounds; #endif /* end #if !defined */ @@ -149,7 +142,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Bounds &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Bounds &); // TAO_IDL - Generated from -// be\be_codegen.cpp:969 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "BoundsC.inl" diff --git a/TAO/tao/CONV_FRAMEA.cpp b/TAO/tao/CONV_FRAMEA.cpp index b66f94a6e2e..8a737582cbc 100644 --- a/TAO/tao/CONV_FRAMEA.cpp +++ b/TAO/tao/CONV_FRAMEA.cpp @@ -36,7 +36,7 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, TAO::Null_RefCount_Policy> @@ -54,12 +54,12 @@ namespace CONV_FRAME // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:743 +// be\be_visitor_typecode/typecode_defn.cpp:808 namespace TAO { @@ -93,9 +93,9 @@ namespace CONV_FRAME // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:34 -static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CONV_FRAME_CodeSetComponent[] = +static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CONV_FRAME_CodeSetComponent[] = { { "native_code_set", &CONV_FRAME::_tc_CodeSetId }, { "conversion_code_sets", &CONV_FRAME::_tc_CodeSetIdSeq } @@ -120,9 +120,9 @@ namespace CONV_FRAME // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:34 -static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CONV_FRAME_CodeSetComponentInfo[] = +static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CONV_FRAME_CodeSetComponentInfo[] = { { "ForCharData", &CONV_FRAME::_tc_CodeSetComponent }, { "ForWcharData", &CONV_FRAME::_tc_CodeSetComponent } @@ -147,9 +147,9 @@ namespace CONV_FRAME // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:34 -static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CONV_FRAME_CodeSetContext[] = +static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CONV_FRAME_CodeSetContext[] = { { "char_data", &CONV_FRAME::_tc_CodeSetId }, { "wchar_data", &CONV_FRAME::_tc_CodeSetId } @@ -174,7 +174,7 @@ namespace CONV_FRAME // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -232,7 +232,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -290,7 +290,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -348,7 +348,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp index 2f188c4d724..c07691d0ca6 100644 --- a/TAO/tao/CONV_FRAMEC.cpp +++ b/TAO/tao/CONV_FRAMEC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "CONV_FRAMEC.h" diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h index a6ad32cc808..6af8922cd57 100644 --- a/TAO/tao/CONV_FRAMEC.h +++ b/TAO/tao/CONV_FRAMEC.h @@ -53,13 +53,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -84,7 +77,7 @@ namespace CONV_FRAME // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_CodeSetId; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CodeSetId; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -137,7 +130,7 @@ namespace CONV_FRAME // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_CodeSetIdSeq; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CodeSetIdSeq; // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -172,7 +165,7 @@ namespace CONV_FRAME // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_CodeSetComponent; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CodeSetComponent; // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -207,7 +200,7 @@ namespace CONV_FRAME // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_CodeSetComponentInfo; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CodeSetComponentInfo; // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -239,7 +232,7 @@ namespace CONV_FRAME // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_CodeSetContext; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CodeSetContext; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -322,7 +315,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSet TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext &); // TAO_IDL - Generated from -// be\be_codegen.cpp:969 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "CONV_FRAMEC.inl" diff --git a/TAO/tao/CharSeqA.cpp b/TAO/tao/CharSeqA.cpp index 8ec3c645225..bb796eabd4b 100644 --- a/TAO/tao/CharSeqA.cpp +++ b/TAO/tao/CharSeqA.cpp @@ -35,12 +35,12 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:743 +// be\be_visitor_typecode/typecode_defn.cpp:808 namespace TAO { @@ -74,7 +74,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/CharSeqC.cpp b/TAO/tao/CharSeqC.cpp index dd8244dfafc..e8e6f665acc 100644 --- a/TAO/tao/CharSeqC.cpp +++ b/TAO/tao/CharSeqC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "CharSeqC.h" diff --git a/TAO/tao/CharSeqC.h b/TAO/tao/CharSeqC.h index 206df3f374a..cc38b649cc9 100644 --- a/TAO/tao/CharSeqC.h +++ b/TAO/tao/CharSeqC.h @@ -52,13 +52,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -125,7 +118,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_CharSeq; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CharSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -166,7 +159,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_CharSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:969 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "CharSeqC.inl" diff --git a/TAO/tao/CurrentA.cpp b/TAO/tao/CurrentA.cpp index ed90b556c34..c384360e38d 100644 --- a/TAO/tao/CurrentA.cpp +++ b/TAO/tao/CurrentA.cpp @@ -35,7 +35,7 @@ #include "tao/Any_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:73 static TAO::TypeCode::Objref<char const *, CORBA::tk_local_interface, @@ -53,7 +53,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -62,7 +62,7 @@ TAO::Any_Impl_T<CORBA::Current>::to_object ( ) const { _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; + return true; } template<> diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp index da9703c222d..1b33e0c1c99 100644 --- a/TAO/tao/CurrentC.cpp +++ b/TAO/tao/CurrentC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "CurrentC.h" diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h index dc9898ff8d1..a50c0407f89 100644 --- a/TAO/tao/CurrentC.h +++ b/TAO/tao/CurrentC.h @@ -51,13 +51,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -67,17 +60,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from -// be\be_visitor_root/root_ch.cpp:62 - -namespace TAO -{ - class Collocation_Proxy_Broker; - - template<typename T> class Narrow_Utils; - template<typename T> class AbstractBase_Narrow_Utils; -} - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 @@ -171,7 +153,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Current; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Current; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -215,7 +197,7 @@ TAO_Export void operator<<= (CORBA::Any &, CORBA::Current_ptr *); // non-copying TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Current_ptr &); // TAO_IDL - Generated from -// be\be_codegen.cpp:969 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "CurrentC.inl" diff --git a/TAO/tao/DomainA.cpp b/TAO/tao/DomainA.cpp index e10ffd80b14..0bd437524cb 100644 --- a/TAO/tao/DomainA.cpp +++ b/TAO/tao/DomainA.cpp @@ -37,7 +37,7 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:73 static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, @@ -55,7 +55,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:73 static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, @@ -73,12 +73,12 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:743 +// be\be_visitor_typecode/typecode_defn.cpp:808 namespace TAO { @@ -112,7 +112,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -121,7 +121,7 @@ TAO::Any_Impl_T<CORBA::DomainManager>::to_object ( ) const { _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; + return true; } // Copying insertion. @@ -167,7 +167,7 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -176,7 +176,7 @@ TAO::Any_Impl_T<CORBA::ConstructionPolicy>::to_object ( ) const { _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; + return true; } // Copying insertion. @@ -222,7 +222,7 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp index 2b43a8a7cd6..e72746b103d 100644 --- a/TAO/tao/DomainC.cpp +++ b/TAO/tao/DomainC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "DomainC.h" @@ -65,7 +65,7 @@ namespace CORBA #if TAO_HAS_INTERCEPTORS == 1 -template<> +ACE_TEMPLATE_SPECIALIZATION void TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::interceptor_param (Dynamic::Parameter & p) { @@ -80,7 +80,7 @@ TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::interceptor_param (Dynamic:: #endif /* TAO_HAS_INTERCEPTORS */ -template<> +ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::marshal (TAO_OutputCDR & cdr) { @@ -98,7 +98,7 @@ namespace TAO #if !defined (_CORBA_POLICY__ARG_TRAITS_CS_) #define _CORBA_POLICY__ARG_TRAITS_CS_ - + template<> class TAO_Export Arg_Traits<CORBA::Policy> : public @@ -115,7 +115,7 @@ namespace TAO #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_CS_) #define _CORBA_INTERFACEDEF__ARG_TRAITS_CS_ - + template<> class TAO_Export Arg_Traits<CORBA::InterfaceDef> : public @@ -169,7 +169,7 @@ TAO::Objref_Traits<CORBA::DomainManager>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -189,21 +189,21 @@ TAO::Collocation_Proxy_Broker * { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_DomainManager_Proxy_Broker_ == 0) { CORBA_DomainManager_setup_collocation (); } - + TAO::Arg_Traits< CORBA::Policy>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::PolicyType>::in_arg_val _tao_policy_type (policy_type); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_policy_type }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -212,10 +212,10 @@ TAO::Collocation_Proxy_Broker * 17, this->the_TAO_DomainManager_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -238,7 +238,7 @@ CORBA::DomainManager::CORBA_DomainManager_setup_collocation () CORBA::DomainManager::~DomainManager (void) {} -void +void CORBA::DomainManager::_tao_any_destructor (void *_tao_void_pointer) { DomainManager *_tao_tmp_pointer = @@ -283,7 +283,7 @@ CORBA::DomainManager::_duplicate (DomainManager_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -369,7 +369,7 @@ TAO::Objref_Traits<CORBA::ConstructionPolicy>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -390,23 +390,23 @@ void CORBA::ConstructionPolicy::make_domain_manager ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_ConstructionPolicy_Proxy_Broker_ == 0) { CORBA_ConstructionPolicy_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_object_type (object_type); TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_constr_policy (constr_policy); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_object_type, &_tao_constr_policy }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -415,7 +415,7 @@ void CORBA::ConstructionPolicy::make_domain_manager ( 19, this->the_TAO_ConstructionPolicy_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -434,14 +434,14 @@ CORBA::ConstructionPolicy::CORBA_ConstructionPolicy_setup_collocation () this->the_TAO_ConstructionPolicy_Proxy_Broker_ = ::CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_Policy_setup_collocation (); } CORBA::ConstructionPolicy::~ConstructionPolicy (void) {} -void +void CORBA::ConstructionPolicy::_tao_any_destructor (void *_tao_void_pointer) { ConstructionPolicy *_tao_tmp_pointer = @@ -486,7 +486,7 @@ CORBA::ConstructionPolicy::_duplicate (ConstructionPolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -539,7 +539,7 @@ CORBA::ConstructionPolicy::marshal (TAO_OutputCDR &cdr) return (cdr << this); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_DOMAINMANAGERLIST_CS_) @@ -613,21 +613,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::DomainManager RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -649,21 +649,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ConstructionPolicy RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -679,12 +679,12 @@ CORBA::Boolean operator<< ( ) { const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. CORBA::Boolean _tao_marshal_flag = true; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = @@ -692,10 +692,10 @@ CORBA::Boolean operator<< ( _tao_sequence[i].in (), strm ); } - + return _tao_marshal_flag; } - + return false; } @@ -705,7 +705,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -715,28 +715,28 @@ CORBA::Boolean operator>> ( { return false; } - + // Set the length of the sequence. _tao_sequence.length (_tao_seq_len); - + // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) { return true; } - + // Retrieve all the elements. CORBA::Boolean _tao_marshal_flag = true; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); } - + return _tao_marshal_flag; - + } - + return false; } @@ -798,7 +798,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< CORBA::DomainManager >; - + template class TAO_Objref_Out_T< CORBA::DomainManager @@ -823,7 +823,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< CORBA::ConstructionPolicy >; - + template class TAO_Objref_Out_T< CORBA::ConstructionPolicy @@ -932,7 +932,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ CORBA::DomainManager > - + # pragma instantiate \ TAO_Objref_Out_T< \ CORBA::DomainManager @@ -957,7 +957,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ CORBA::ConstructionPolicy > - + # pragma instantiate \ TAO_Objref_Out_T< \ CORBA::ConstructionPolicy @@ -1007,4 +1007,4 @@ CORBA::Boolean operator>> ( #endif /* end #if !defined */ -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h index bf39bdea9f1..23cea895aab 100644 --- a/TAO/tao/DomainC.h +++ b/TAO/tao/DomainC.h @@ -57,13 +57,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -79,9 +72,7 @@ namespace TAO { class Collocation_Proxy_Broker; - template<typename T> class Narrow_Utils; - template<typename T> class AbstractBase_Narrow_Utils; } // TAO_IDL - Generated from @@ -209,7 +200,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_DomainManager; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_DomainManager; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -336,7 +327,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ConstructionPolicy; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ConstructionPolicy; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -396,7 +387,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_DomainManagerList; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_DomainManagerList; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -522,7 +513,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_DomainManagerList_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:969 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "DomainC.inl" diff --git a/TAO/tao/DoubleSeqA.cpp b/TAO/tao/DoubleSeqA.cpp index 761282a124c..2f05bdaff01 100644 --- a/TAO/tao/DoubleSeqA.cpp +++ b/TAO/tao/DoubleSeqA.cpp @@ -35,12 +35,12 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:743 +// be\be_visitor_typecode/typecode_defn.cpp:808 namespace TAO { @@ -74,7 +74,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/DoubleSeqC.cpp b/TAO/tao/DoubleSeqC.cpp index 6d4903ca1d8..beac4f164d8 100644 --- a/TAO/tao/DoubleSeqC.cpp +++ b/TAO/tao/DoubleSeqC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "DoubleSeqC.h" diff --git a/TAO/tao/DoubleSeqC.h b/TAO/tao/DoubleSeqC.h index b530efa077b..85c233047fb 100644 --- a/TAO/tao/DoubleSeqC.h +++ b/TAO/tao/DoubleSeqC.h @@ -52,13 +52,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -125,7 +118,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_DoubleSeq; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_DoubleSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -166,7 +159,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_DoubleSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:969 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "DoubleSeqC.inl" diff --git a/TAO/tao/DynamicA.cpp b/TAO/tao/DynamicA.cpp index d8823c207cd..b8fa59c2960 100644 --- a/TAO/tao/DynamicA.cpp +++ b/TAO/tao/DynamicA.cpp @@ -36,12 +36,12 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:743 +// be\be_visitor_typecode/typecode_defn.cpp:808 namespace TAO { @@ -75,7 +75,7 @@ namespace Dynamic // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, TAO::Null_RefCount_Policy> @@ -93,12 +93,12 @@ namespace Dynamic // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:743 +// be\be_visitor_typecode/typecode_defn.cpp:808 namespace TAO { @@ -132,7 +132,7 @@ namespace Dynamic // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, TAO::Null_RefCount_Policy> @@ -150,7 +150,7 @@ namespace Dynamic // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -208,7 +208,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/DynamicC.cpp b/TAO/tao/DynamicC.cpp index c7d80e77bb4..e01d54ee368 100644 --- a/TAO/tao/DynamicC.cpp +++ b/TAO/tao/DynamicC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "DynamicC.h" diff --git a/TAO/tao/DynamicC.h b/TAO/tao/DynamicC.h index 20d9df1e524..75729e8f80b 100644 --- a/TAO/tao/DynamicC.h +++ b/TAO/tao/DynamicC.h @@ -58,13 +58,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -131,7 +124,7 @@ namespace Dynamic // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ParameterList; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ParameterList; // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:472 @@ -143,7 +136,7 @@ namespace Dynamic // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ContextList; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ContextList; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -200,7 +193,7 @@ namespace Dynamic // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ExceptionList; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ExceptionList; // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:472 @@ -212,7 +205,7 @@ namespace Dynamic // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_RequestContext; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_RequestContext; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -278,7 +271,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_Dynamic_ExceptionList_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:969 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "DynamicC.inl" diff --git a/TAO/tao/Dynamic_ParameterA.cpp b/TAO/tao/Dynamic_ParameterA.cpp index 5556e05ccc2..4627dc83a0c 100644 --- a/TAO/tao/Dynamic_ParameterA.cpp +++ b/TAO/tao/Dynamic_ParameterA.cpp @@ -35,9 +35,9 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:34 -static TAO::TypeCode::Struct_Field<char const *> _tao_fields_Dynamic_Parameter[] = +static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_Dynamic_Parameter[] = { { "argument", &CORBA::_tc_any }, { "mode", &CORBA::_tc_ParameterMode } @@ -62,7 +62,7 @@ namespace Dynamic // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/Dynamic_ParameterC.cpp b/TAO/tao/Dynamic_ParameterC.cpp index 08b77d9c582..96a36ffa108 100644 --- a/TAO/tao/Dynamic_ParameterC.cpp +++ b/TAO/tao/Dynamic_ParameterC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "Dynamic_ParameterC.h" diff --git a/TAO/tao/Dynamic_ParameterC.h b/TAO/tao/Dynamic_ParameterC.h index 3eaaa523576..485bfdf9c8e 100644 --- a/TAO/tao/Dynamic_ParameterC.h +++ b/TAO/tao/Dynamic_ParameterC.h @@ -54,13 +54,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -109,7 +102,7 @@ namespace Dynamic // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Parameter; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Parameter; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -139,7 +132,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Dynamic::Parameter TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Dynamic::Parameter &); // TAO_IDL - Generated from -// be\be_codegen.cpp:969 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "Dynamic_ParameterC.inl" diff --git a/TAO/tao/FloatSeqA.cpp b/TAO/tao/FloatSeqA.cpp index 4f986f41775..38a9011f0e7 100644 --- a/TAO/tao/FloatSeqA.cpp +++ b/TAO/tao/FloatSeqA.cpp @@ -35,12 +35,12 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:743 +// be\be_visitor_typecode/typecode_defn.cpp:808 namespace TAO { @@ -74,7 +74,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/FloatSeqC.cpp b/TAO/tao/FloatSeqC.cpp index c494d4ad780..8098d13e131 100644 --- a/TAO/tao/FloatSeqC.cpp +++ b/TAO/tao/FloatSeqC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "FloatSeqC.h" diff --git a/TAO/tao/FloatSeqC.h b/TAO/tao/FloatSeqC.h index c7494f1fce2..e13f51e6b2a 100644 --- a/TAO/tao/FloatSeqC.h +++ b/TAO/tao/FloatSeqC.h @@ -52,13 +52,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -125,7 +118,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_FloatSeq; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_FloatSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -166,7 +159,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_FloatSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:969 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "FloatSeqC.inl" diff --git a/TAO/tao/GIOPA.cpp b/TAO/tao/GIOPA.cpp index fbcdf9eaaff..1fb0bad9d23 100644 --- a/TAO/tao/GIOPA.cpp +++ b/TAO/tao/GIOPA.cpp @@ -39,7 +39,7 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, TAO::Null_RefCount_Policy> @@ -57,9 +57,9 @@ namespace GIOP // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:34 -static TAO::TypeCode::Struct_Field<char const *> _tao_fields_GIOP_Version[] = +static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_GIOP_Version[] = { { "major", &CORBA::_tc_octet }, { "minor", &CORBA::_tc_octet } @@ -84,9 +84,9 @@ namespace GIOP // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:34 -static TAO::TypeCode::Struct_Field<char const *> _tao_fields_GIOP_IORAddressingInfo[] = +static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_GIOP_IORAddressingInfo[] = { { "selected_profile_index", &CORBA::_tc_ulong }, { "ior", &IOP::_tc_IOR } @@ -111,7 +111,7 @@ namespace GIOP // TAO_IDL - Generated from -// be/be_visitor_typecode/union_typecode.cpp:29 +// be\be_visitor_typecode/union_typecode.cpp:29 static TAO::TypeCode::Non_Default_Case<CORBA::Short, char const *> const _tao_cases_GIOP_TargetAddress_0 (0, "object_key", &CORBA::_tc_OctetSeq); static TAO::TypeCode::Non_Default_Case<CORBA::Short, char const *> const _tao_cases_GIOP_TargetAddress_1 (1, "profile", &IOP::_tc_TaggedProfile); @@ -144,7 +144,7 @@ namespace GIOP // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -202,7 +202,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -260,7 +260,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_union/any_op_cs.cpp:54 +// be\be_visitor_union/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp index dfba85ab4cb..64bc0196e73 100644 --- a/TAO/tao/GIOPC.cpp +++ b/TAO/tao/GIOPC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "GIOPC.h" diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h index 05098bdc807..e8b1dff20ef 100644 --- a/TAO/tao/GIOPC.h +++ b/TAO/tao/GIOPC.h @@ -52,13 +52,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -83,7 +76,7 @@ namespace GIOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_AddressingDisposition; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_AddressingDisposition; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -130,7 +123,7 @@ namespace GIOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Version; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Version; // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -165,7 +158,7 @@ namespace GIOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_IORAddressingInfo; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_IORAddressingInfo; // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -258,7 +251,7 @@ namespace GIOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_TargetAddress; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TargetAddress; #endif /* end #if !defined */ @@ -318,7 +311,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::TargetAddress TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::TargetAddress &); // TAO_IDL - Generated from -// be\be_codegen.cpp:969 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "GIOPC.inl" diff --git a/TAO/tao/IIOPA.cpp b/TAO/tao/IIOPA.cpp index 19514a02c1f..58b7bdfeceb 100644 --- a/TAO/tao/IIOPA.cpp +++ b/TAO/tao/IIOPA.cpp @@ -37,9 +37,9 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:34 -static TAO::TypeCode::Struct_Field<char const *> _tao_fields_IIOP_ListenPoint[] = +static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_IIOP_ListenPoint[] = { { "host", &CORBA::_tc_string }, { "port", &CORBA::_tc_ushort } @@ -64,12 +64,12 @@ namespace IIOP // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:743 +// be\be_visitor_typecode/typecode_defn.cpp:808 namespace TAO { @@ -103,9 +103,9 @@ namespace IIOP // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:34 -static TAO::TypeCode::Struct_Field<char const *> _tao_fields_IIOP_BiDirIIOPServiceContext[] = +static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_IIOP_BiDirIIOPServiceContext[] = { { "listen_points", &IIOP::_tc_ListenPointList } @@ -129,7 +129,7 @@ namespace IIOP // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -187,7 +187,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -245,7 +245,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp index 57ec370ca20..e6914de4112 100644 --- a/TAO/tao/IIOPC.cpp +++ b/TAO/tao/IIOPC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "IIOPC.h" diff --git a/TAO/tao/IIOPC.h b/TAO/tao/IIOPC.h index 6893d89e5cc..5503cb0dfc3 100644 --- a/TAO/tao/IIOPC.h +++ b/TAO/tao/IIOPC.h @@ -53,13 +53,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -108,7 +101,7 @@ namespace IIOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ListenPoint; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ListenPoint; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -161,7 +154,7 @@ namespace IIOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ListenPointList; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ListenPointList; // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -195,7 +188,7 @@ namespace IIOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_BiDirIIOPServiceContext; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_BiDirIIOPServiceContext; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -264,7 +257,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IIOP::BiDirIIOPServ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::BiDirIIOPServiceContext &); // TAO_IDL - Generated from -// be\be_codegen.cpp:969 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "IIOPC.inl" diff --git a/TAO/tao/IIOP_EndpointsA.cpp b/TAO/tao/IIOP_EndpointsA.cpp index af723c72814..e14f13e977f 100644 --- a/TAO/tao/IIOP_EndpointsA.cpp +++ b/TAO/tao/IIOP_EndpointsA.cpp @@ -37,9 +37,9 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:34 -static TAO::TypeCode::Struct_Field<char const *> _tao_fields_TAO_IIOP_Endpoint_Info[] = +static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_TAO_IIOP_Endpoint_Info[] = { { "host", &CORBA::_tc_string }, { "port", &CORBA::_tc_short }, @@ -65,12 +65,12 @@ namespace TAO // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:743 +// be\be_visitor_typecode/typecode_defn.cpp:808 namespace TAO { @@ -104,7 +104,7 @@ namespace TAO // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -162,7 +162,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/IIOP_EndpointsC.cpp b/TAO/tao/IIOP_EndpointsC.cpp index bad5610ddac..ceda7c4d237 100644 --- a/TAO/tao/IIOP_EndpointsC.cpp +++ b/TAO/tao/IIOP_EndpointsC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "IIOP_EndpointsC.h" diff --git a/TAO/tao/IIOP_EndpointsC.h b/TAO/tao/IIOP_EndpointsC.h index d1e002520a6..599b2affc7c 100644 --- a/TAO/tao/IIOP_EndpointsC.h +++ b/TAO/tao/IIOP_EndpointsC.h @@ -53,13 +53,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -109,7 +102,7 @@ namespace TAO // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_IIOP_Endpoint_Info; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_IIOP_Endpoint_Info; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -162,7 +155,7 @@ namespace TAO // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_IIOPEndpointSequence; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_IIOPEndpointSequence; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -217,7 +210,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:969 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "IIOP_EndpointsC.inl" diff --git a/TAO/tao/ImR_Client/ImplRepoC.h b/TAO/tao/ImR_Client/ImplRepoC.h index 42a7807e2fe..e4a7ff62078 100644 --- a/TAO/tao/ImR_Client/ImplRepoC.h +++ b/TAO/tao/ImR_Client/ImplRepoC.h @@ -73,9 +73,7 @@ namespace TAO { class Collocation_Proxy_Broker; - template<typename T> class Narrow_Utils; - template<typename T> class AbstractBase_Narrow_Utils; } // TAO_IDL - Generated from diff --git a/TAO/tao/ImR_Client/ServerObjectC.h b/TAO/tao/ImR_Client/ServerObjectC.h index 0d33c487864..54b10690c72 100644 --- a/TAO/tao/ImR_Client/ServerObjectC.h +++ b/TAO/tao/ImR_Client/ServerObjectC.h @@ -67,9 +67,7 @@ namespace TAO { class Collocation_Proxy_Broker; - template<typename T> class Narrow_Utils; - template<typename T> class AbstractBase_Narrow_Utils; } // TAO_IDL - Generated from diff --git a/TAO/tao/LongDoubleSeqA.cpp b/TAO/tao/LongDoubleSeqA.cpp index 6cd2f558d2e..8911b2373c3 100644 --- a/TAO/tao/LongDoubleSeqA.cpp +++ b/TAO/tao/LongDoubleSeqA.cpp @@ -35,12 +35,12 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:743 +// be\be_visitor_typecode/typecode_defn.cpp:808 namespace TAO { @@ -74,7 +74,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/LongDoubleSeqC.cpp b/TAO/tao/LongDoubleSeqC.cpp index 963ef411786..532bbad43f8 100644 --- a/TAO/tao/LongDoubleSeqC.cpp +++ b/TAO/tao/LongDoubleSeqC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "LongDoubleSeqC.h" diff --git a/TAO/tao/LongDoubleSeqC.h b/TAO/tao/LongDoubleSeqC.h index 59baeaedad8..e235ac46325 100644 --- a/TAO/tao/LongDoubleSeqC.h +++ b/TAO/tao/LongDoubleSeqC.h @@ -52,13 +52,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -125,7 +118,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_LongDoubleSeq; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_LongDoubleSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -166,7 +159,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_LongDoubleSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:969 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "LongDoubleSeqC.inl" diff --git a/TAO/tao/LongLongSeqA.cpp b/TAO/tao/LongLongSeqA.cpp index 87401e668c7..f61d6bf4eb7 100644 --- a/TAO/tao/LongLongSeqA.cpp +++ b/TAO/tao/LongLongSeqA.cpp @@ -35,12 +35,12 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:743 +// be\be_visitor_typecode/typecode_defn.cpp:808 namespace TAO { @@ -74,7 +74,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/LongLongSeqC.cpp b/TAO/tao/LongLongSeqC.cpp index e98354c6632..3b546b9ac72 100644 --- a/TAO/tao/LongLongSeqC.cpp +++ b/TAO/tao/LongLongSeqC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "LongLongSeqC.h" diff --git a/TAO/tao/LongLongSeqC.h b/TAO/tao/LongLongSeqC.h index 8855fa10d0e..47486ecabc7 100644 --- a/TAO/tao/LongLongSeqC.h +++ b/TAO/tao/LongLongSeqC.h @@ -52,13 +52,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -125,7 +118,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_LongLongSeq; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_LongLongSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -166,7 +159,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_LongLongSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:969 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "LongLongSeqC.inl" diff --git a/TAO/tao/LongSeqA.cpp b/TAO/tao/LongSeqA.cpp index 2f6201aad09..330833f2321 100644 --- a/TAO/tao/LongSeqA.cpp +++ b/TAO/tao/LongSeqA.cpp @@ -35,12 +35,12 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:743 +// be\be_visitor_typecode/typecode_defn.cpp:808 namespace TAO { @@ -74,7 +74,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/LongSeqC.cpp b/TAO/tao/LongSeqC.cpp index 6332363e731..70a4389c083 100644 --- a/TAO/tao/LongSeqC.cpp +++ b/TAO/tao/LongSeqC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "LongSeqC.h" diff --git a/TAO/tao/LongSeqC.h b/TAO/tao/LongSeqC.h index e53029fa883..94e2db6295c 100644 --- a/TAO/tao/LongSeqC.h +++ b/TAO/tao/LongSeqC.h @@ -52,13 +52,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -125,7 +118,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_LongSeq; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_LongSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -166,7 +159,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_LongSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:969 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "LongSeqC.inl" diff --git a/TAO/tao/Messaging/MessagingA.cpp b/TAO/tao/Messaging/MessagingA.cpp index c4b4a5234db..88813bde1a7 100644 --- a/TAO/tao/Messaging/MessagingA.cpp +++ b/TAO/tao/Messaging/MessagingA.cpp @@ -150,7 +150,7 @@ TAO::Any_Impl_T<Messaging::ReplyHandler>::to_object ( ) const { _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; + return true; } // Copying insertion. diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h index 6c4ef7563b7..f796169ff19 100644 --- a/TAO/tao/Messaging/MessagingC.h +++ b/TAO/tao/Messaging/MessagingC.h @@ -81,9 +81,7 @@ namespace TAO { class Collocation_Proxy_Broker; - template<typename T> class Narrow_Utils; - template<typename T> class AbstractBase_Narrow_Utils; } // TAO_IDL - Generated from @@ -216,7 +214,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ExceptionHolder; + extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_ExceptionHolder; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -326,7 +324,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ReplyHandler; + extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_ReplyHandler; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/Messaging/Messaging_No_ImplA.cpp b/TAO/tao/Messaging/Messaging_No_ImplA.cpp index 6c799d43548..391d554360e 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplA.cpp +++ b/TAO/tao/Messaging/Messaging_No_ImplA.cpp @@ -370,7 +370,7 @@ TAO::Any_Impl_T<Messaging::RebindPolicy>::to_object ( ) const { _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; + return true; } template<> @@ -497,7 +497,7 @@ TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::to_object ( ) const { _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; + return true; } template<> @@ -566,7 +566,7 @@ TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::to_object ( ) const { _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; + return true; } template<> @@ -635,7 +635,7 @@ TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::to_object ( ) const { _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; + return true; } template<> @@ -704,7 +704,7 @@ TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::to_object ( ) const { _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; + return true; } template<> @@ -773,7 +773,7 @@ TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::to_object ( ) const { _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; + return true; } template<> @@ -842,7 +842,7 @@ TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::to_object ( ) const { _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; + return true; } template<> @@ -911,7 +911,7 @@ TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::to_object ( ) const { _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; + return true; } template<> @@ -1038,7 +1038,7 @@ TAO::Any_Impl_T<Messaging::RoutingPolicy>::to_object ( ) const { _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; + return true; } template<> @@ -1107,7 +1107,7 @@ TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::to_object ( ) const { _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; + return true; } template<> @@ -1176,7 +1176,7 @@ TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::to_object ( ) const { _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; + return true; } template<> diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.h b/TAO/tao/Messaging/Messaging_No_ImplC.h index cae527dc841..9095741261f 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplC.h +++ b/TAO/tao/Messaging/Messaging_No_ImplC.h @@ -71,17 +71,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from -// be\be_visitor_root/root_ch.cpp:62 - -namespace TAO -{ - class Collocation_Proxy_Broker; - - template<typename T> class Narrow_Utils; - template<typename T> class AbstractBase_Narrow_Utils; -} - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 @@ -97,7 +86,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Priority; + extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_Priority; // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:379 @@ -108,7 +97,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_RebindMode; + extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RebindMode; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -134,7 +123,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_RoutingType; + extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RoutingType; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -160,7 +149,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Ordering; + extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_Ordering; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -304,7 +293,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_RebindPolicy; + extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RebindPolicy; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -341,7 +330,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PriorityRange; + extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_PriorityRange; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -460,7 +449,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_RequestPriorityPolicy; + extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RequestPriorityPolicy; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -584,7 +573,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ReplyPriorityPolicy; + extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_ReplyPriorityPolicy; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -708,7 +697,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_RequestStartTimePolicy; + extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RequestStartTimePolicy; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -832,7 +821,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_RequestEndTimePolicy; + extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RequestEndTimePolicy; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -956,7 +945,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ReplyStartTimePolicy; + extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_ReplyStartTimePolicy; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -1080,7 +1069,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ReplyEndTimePolicy; + extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_ReplyEndTimePolicy; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -1204,7 +1193,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_RelativeRequestTimeoutPolicy; + extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RelativeRequestTimeoutPolicy; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -1241,7 +1230,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_RoutingTypeRange; + extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RoutingTypeRange; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -1360,7 +1349,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_RoutingPolicy; + extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RoutingPolicy; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -1484,7 +1473,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_MaxHopsPolicy; + extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_MaxHopsPolicy; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -1608,7 +1597,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_QueueOrderPolicy; + extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_QueueOrderPolicy; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp index d59767d0735..4190a8b0560 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp +++ b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp @@ -80,7 +80,7 @@ TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::to_object ( ) const { _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; + return true; } template<> diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.h b/TAO/tao/Messaging/Messaging_RT_PolicyC.h index fa2590bcb12..06f80692e73 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyC.h +++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.h @@ -64,17 +64,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from -// be\be_visitor_root/root_ch.cpp:62 - -namespace TAO -{ - class Collocation_Proxy_Broker; - - template<typename T> class Narrow_Utils; - template<typename T> class AbstractBase_Narrow_Utils; -} - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 @@ -90,7 +79,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Timeout; + extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_Timeout; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -214,7 +203,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_RelativeRoundtripTimeoutPolicy; + extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RelativeRoundtripTimeoutPolicy; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp index df4540f4ba1..40bc7fc0569 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp @@ -62,7 +62,7 @@ TAO::Any_Impl_T<Messaging::SyncScopePolicy>::to_object ( ) const { _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; + return true; } template<> diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h index a97a268cc48..96d4bc09a7b 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h @@ -64,17 +64,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from -// be\be_visitor_root/root_ch.cpp:62 - -namespace TAO -{ - class Collocation_Proxy_Broker; - - template<typename T> class Narrow_Utils; - template<typename T> class AbstractBase_Narrow_Utils; -} - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 @@ -203,7 +192,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_SyncScopePolicy; + extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_SyncScopePolicy; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/Messaging/TAO_ExtA.cpp b/TAO/tao/Messaging/TAO_ExtA.cpp index b1ba5e34d2e..0819e377680 100644 --- a/TAO/tao/Messaging/TAO_ExtA.cpp +++ b/TAO/tao/Messaging/TAO_ExtA.cpp @@ -62,7 +62,7 @@ TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::to_object ( ) const { _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; + return true; } template<> diff --git a/TAO/tao/Messaging/TAO_ExtC.h b/TAO/tao/Messaging/TAO_ExtC.h index ed39cd3745c..13f08ae3a30 100644 --- a/TAO/tao/Messaging/TAO_ExtC.h +++ b/TAO/tao/Messaging/TAO_ExtC.h @@ -64,17 +64,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from -// be\be_visitor_root/root_ch.cpp:62 - -namespace TAO -{ - class Collocation_Proxy_Broker; - - template<typename T> class Narrow_Utils; - template<typename T> class AbstractBase_Narrow_Utils; -} - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 @@ -203,7 +192,7 @@ namespace TAO // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ConnectionTimeoutPolicy; + extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_ConnectionTimeoutPolicy; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/Messaging_PolicyValueA.cpp b/TAO/tao/Messaging_PolicyValueA.cpp index 14ed725bf43..d3de39db7c0 100644 --- a/TAO/tao/Messaging_PolicyValueA.cpp +++ b/TAO/tao/Messaging_PolicyValueA.cpp @@ -37,9 +37,9 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:34 -static TAO::TypeCode::Struct_Field<char const *> _tao_fields_Messaging_PolicyValue[] = +static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_Messaging_PolicyValue[] = { { "ptype", &CORBA::_tc_PolicyType }, { "pvalue", &CORBA::_tc_OctetSeq } @@ -64,12 +64,12 @@ namespace Messaging // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:743 +// be\be_visitor_typecode/typecode_defn.cpp:808 namespace TAO { @@ -103,7 +103,7 @@ namespace Messaging // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -161,7 +161,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp index c1755ac773c..98102c4f261 100644 --- a/TAO/tao/Messaging_PolicyValueC.cpp +++ b/TAO/tao/Messaging_PolicyValueC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "Messaging_PolicyValueC.h" diff --git a/TAO/tao/Messaging_PolicyValueC.h b/TAO/tao/Messaging_PolicyValueC.h index 9c9691d7f13..a86f7991114 100644 --- a/TAO/tao/Messaging_PolicyValueC.h +++ b/TAO/tao/Messaging_PolicyValueC.h @@ -56,13 +56,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -111,7 +104,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PolicyValue; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyValue; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -164,7 +157,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PolicyValueSeq; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyValueSeq; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -229,7 +222,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:969 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "Messaging_PolicyValueC.inl" diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.h b/TAO/tao/ObjRefTemplate/Default_ORTC.h index fd15a763402..05e80790978 100644 --- a/TAO/tao/ObjRefTemplate/Default_ORTC.h +++ b/TAO/tao/ObjRefTemplate/Default_ORTC.h @@ -147,7 +147,7 @@ namespace TAO_Default_ORT // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplate; + extern TAO_ORT_Export ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplate; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h index abd9aa18d0e..c9a65e11749 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h @@ -155,7 +155,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ObjectReferenceFactory; + extern TAO_ORT_Export ::CORBA::TypeCode_ptr const _tc_ObjectReferenceFactory; // TAO_IDL - Generated from // be\be_valuetype.cpp:524 @@ -250,7 +250,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplate; + extern TAO_ORT_Export ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplate; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -310,7 +310,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplateSeq; + extern TAO_ORT_Export ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplateSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 diff --git a/TAO/tao/OctetSeqA.cpp b/TAO/tao/OctetSeqA.cpp index 614af8511bd..2d4a03c4d28 100644 --- a/TAO/tao/OctetSeqA.cpp +++ b/TAO/tao/OctetSeqA.cpp @@ -35,12 +35,12 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:743 +// be\be_visitor_typecode/typecode_defn.cpp:808 namespace TAO { @@ -74,7 +74,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp index 7966d877516..91cf74942f7 100644 --- a/TAO/tao/OctetSeqC.cpp +++ b/TAO/tao/OctetSeqC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "OctetSeqC.h" diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h index bddfb0e52be..c7f139af3eb 100644 --- a/TAO/tao/OctetSeqC.h +++ b/TAO/tao/OctetSeqC.h @@ -52,13 +52,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -133,7 +126,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_OctetSeq; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_OctetSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -186,7 +179,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_OctetSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:969 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "OctetSeqC.inl" diff --git a/TAO/tao/Policy_ForwardA.cpp b/TAO/tao/Policy_ForwardA.cpp index f5d65dd56e5..7fec5e13e54 100644 --- a/TAO/tao/Policy_ForwardA.cpp +++ b/TAO/tao/Policy_ForwardA.cpp @@ -38,7 +38,7 @@ #include "tao/Any_Basic_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, TAO::Null_RefCount_Policy> @@ -56,12 +56,17 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:743 +// be\be_visitor_typecode/typecode_defn.cpp:808 + +namespace CORBA +{ + extern ::CORBA::TypeCode_ptr const _tc_Policy; +} namespace TAO { @@ -95,12 +100,12 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:743 +// be\be_visitor_typecode/typecode_defn.cpp:808 namespace TAO { @@ -134,7 +139,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/enum_typecode.cpp:34 +// be\be_visitor_typecode/enum_typecode.cpp:34 static TAO::TypeCode::Enumerator<char const *> const _tao_enumerators_CORBA_SetOverrideType[] = { @@ -161,7 +166,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -219,7 +224,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -277,7 +282,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_enum/any_op_cs.cpp:52 +// be\be_visitor_enum/any_op_cs.cpp:52 void operator<<= ( CORBA::Any &_tao_any, diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp index cf0e8ab7348..a5e7f622afa 100644 --- a/TAO/tao/Policy_ForwardC.cpp +++ b/TAO/tao/Policy_ForwardC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "Policy_ForwardC.h" diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h index 3971e9b992d..e1f27151aa8 100644 --- a/TAO/tao/Policy_ForwardC.h +++ b/TAO/tao/Policy_ForwardC.h @@ -52,13 +52,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -83,7 +76,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PolicyType; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyType; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -166,7 +159,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PolicyList; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyList; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -219,7 +212,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PolicyTypeSeq; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyTypeSeq; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -258,7 +251,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_SetOverrideType; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_SetOverrideType; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -350,7 +343,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, CORBA::SetOverrideType); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &); // TAO_IDL - Generated from -// be\be_codegen.cpp:969 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "Policy_ForwardC.inl" diff --git a/TAO/tao/PortableServer/AdapterActivatorC.h b/TAO/tao/PortableServer/AdapterActivatorC.h index a97220a5525..2f949336a20 100644 --- a/TAO/tao/PortableServer/AdapterActivatorC.h +++ b/TAO/tao/PortableServer/AdapterActivatorC.h @@ -75,16 +75,16 @@ namespace PortableServer #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__VAR_OUT_CH_) #define _PORTABLESERVER_ADAPTERACTIVATOR__VAR_OUT_CH_ - + class AdapterActivator; typedef AdapterActivator *AdapterActivator_ptr; - + typedef TAO_Objref_Var_T< AdapterActivator > AdapterActivator_var; - + typedef TAO_Objref_Out_T< AdapterActivator @@ -92,45 +92,45 @@ namespace PortableServer AdapterActivator_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR_CH_) #define _PORTABLESERVER_ADAPTERACTIVATOR_CH_ - + class TAO_PortableServer_Export AdapterActivator : public virtual CORBA::Object { public: typedef AdapterActivator_ptr _ptr_type; typedef AdapterActivator_var _var_type; - + // The static operations. static AdapterActivator_ptr _duplicate (AdapterActivator_ptr obj); - + static void _tao_release (AdapterActivator_ptr obj); - + static AdapterActivator_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static AdapterActivator_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static AdapterActivator_ptr _nil (void) { return static_cast<AdapterActivator_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean unknown_adapter ( ::PortableServer::POA_ptr parent, const char * name @@ -139,36 +139,36 @@ namespace PortableServer ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. AdapterActivator (void); - + virtual ~AdapterActivator (void); - + private: // Private and unimplemented for concrete interfaces. AdapterActivator (const AdapterActivator &); - + void operator= (const AdapterActivator &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_AdapterActivator; // TAO_IDL - Generated from @@ -185,7 +185,7 @@ namespace TAO #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_CH_) #define _PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_CH_ - + template<> struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::AdapterActivator> { diff --git a/TAO/tao/PortableServer/ServantActivatorC.h b/TAO/tao/PortableServer/ServantActivatorC.h index c243ac7fec0..becf91a32f8 100644 --- a/TAO/tao/PortableServer/ServantActivatorC.h +++ b/TAO/tao/PortableServer/ServantActivatorC.h @@ -72,22 +72,22 @@ namespace PortableServer { - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_PORTABLESERVER_SERVANTACTIVATOR__VAR_OUT_CH_) #define _PORTABLESERVER_SERVANTACTIVATOR__VAR_OUT_CH_ - + class ServantActivator; typedef ServantActivator *ServantActivator_ptr; - + typedef TAO_Objref_Var_T< ServantActivator > ServantActivator_var; - + typedef TAO_Objref_Out_T< ServantActivator @@ -95,45 +95,45 @@ namespace PortableServer ServantActivator_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLESERVER_SERVANTACTIVATOR_CH_) #define _PORTABLESERVER_SERVANTACTIVATOR_CH_ - + class TAO_PortableServer_Export ServantActivator : public virtual ::PortableServer::ServantManager { public: typedef ServantActivator_ptr _ptr_type; typedef ServantActivator_var _var_type; - + // The static operations. static ServantActivator_ptr _duplicate (ServantActivator_ptr obj); - + static void _tao_release (ServantActivator_ptr obj); - + static ServantActivator_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServantActivator_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServantActivator_ptr _nil (void) { return static_cast<ServantActivator_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableServer::Servant incarnate ( const ::PortableServer::ObjectId & oid, ::PortableServer::POA_ptr adapter @@ -143,10 +143,10 @@ namespace PortableServer CORBA::SystemException, ::PortableServer::ForwardRequest )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void etherealize ( const ::PortableServer::ObjectId & oid, ::PortableServer::POA_ptr adapter, @@ -158,36 +158,36 @@ namespace PortableServer ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. ServantActivator (void); - + virtual ~ServantActivator (void); - + private: // Private and unimplemented for concrete interfaces. ServantActivator (const ServantActivator &); - + void operator= (const ServantActivator &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantActivator; // TAO_IDL - Generated from diff --git a/TAO/tao/PortableServer/ServantLocatorC.h b/TAO/tao/PortableServer/ServantLocatorC.h index e36462441c0..77d2b5dc03c 100644 --- a/TAO/tao/PortableServer/ServantLocatorC.h +++ b/TAO/tao/PortableServer/ServantLocatorC.h @@ -73,22 +73,22 @@ namespace PortableServer { - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_PORTABLESERVER_SERVANTLOCATOR__VAR_OUT_CH_) #define _PORTABLESERVER_SERVANTLOCATOR__VAR_OUT_CH_ - + class ServantLocator; typedef ServantLocator *ServantLocator_ptr; - + typedef TAO_Objref_Var_T< ServantLocator > ServantLocator_var; - + typedef TAO_Objref_Out_T< ServantLocator @@ -96,13 +96,13 @@ namespace PortableServer ServantLocator_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLESERVER_SERVANTLOCATOR_CH_) #define _PORTABLESERVER_SERVANTLOCATOR_CH_ - + class TAO_PortableServer_Export ServantLocator : public virtual ::PortableServer::ServantManager { @@ -111,32 +111,32 @@ namespace PortableServer typedef ServantLocator_ptr _ptr_type; typedef ServantLocator_var _var_type; - + // The static operations. static ServantLocator_ptr _duplicate (ServantLocator_ptr obj); - + static void _tao_release (ServantLocator_ptr obj); - + static ServantLocator_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServantLocator_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServantLocator_ptr _nil (void) { return static_cast<ServantLocator_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableServer::Servant preinvoke ( const ::PortableServer::ObjectId & oid, ::PortableServer::POA_ptr adapter, @@ -148,10 +148,10 @@ namespace PortableServer CORBA::SystemException, ::PortableServer::ForwardRequest )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void postinvoke ( const ::PortableServer::ObjectId & oid, ::PortableServer::POA_ptr adapter, @@ -163,36 +163,36 @@ namespace PortableServer ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. ServantLocator (void); - + virtual ~ServantLocator (void); - + private: // Private and unimplemented for concrete interfaces. ServantLocator (const ServantLocator &); - + void operator= (const ServantLocator &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantLocator; // TAO_IDL - Generated from diff --git a/TAO/tao/PortableServer/ServantManagerC.h b/TAO/tao/PortableServer/ServantManagerC.h index 96a4580c438..87b36ebf822 100644 --- a/TAO/tao/PortableServer/ServantManagerC.h +++ b/TAO/tao/PortableServer/ServantManagerC.h @@ -67,22 +67,22 @@ namespace PortableServer { - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_PORTABLESERVER_SERVANTMANAGER__VAR_OUT_CH_) #define _PORTABLESERVER_SERVANTMANAGER__VAR_OUT_CH_ - + class ServantManager; typedef ServantManager *ServantManager_ptr; - + typedef TAO_Objref_Var_T< ServantManager > ServantManager_var; - + typedef TAO_Objref_Out_T< ServantManager @@ -90,71 +90,71 @@ namespace PortableServer ServantManager_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLESERVER_SERVANTMANAGER_CH_) #define _PORTABLESERVER_SERVANTMANAGER_CH_ - + class TAO_PortableServer_Export ServantManager : public virtual CORBA::Object { public: typedef ServantManager_ptr _ptr_type; typedef ServantManager_var _var_type; - + // The static operations. static ServantManager_ptr _duplicate (ServantManager_ptr obj); - + static void _tao_release (ServantManager_ptr obj); - + static ServantManager_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServantManager_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServantManager_ptr _nil (void) { return static_cast<ServantManager_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. ServantManager (void); - + virtual ~ServantManager (void); - + private: // Private and unimplemented for concrete interfaces. ServantManager (const ServantManager &); - + void operator= (const ServantManager &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantManager; // TAO_IDL - Generated from @@ -171,7 +171,7 @@ namespace TAO #if !defined (_PORTABLESERVER_SERVANTMANAGER__TRAITS_CH_) #define _PORTABLESERVER_SERVANTMANAGER__TRAITS_CH_ - + template<> struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantManager> { diff --git a/TAO/tao/ULongSeqA.cpp b/TAO/tao/ULongSeqA.cpp index 5cf45175cd6..f0b4b86f710 100644 --- a/TAO/tao/ULongSeqA.cpp +++ b/TAO/tao/ULongSeqA.cpp @@ -35,12 +35,12 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:743 +// be\be_visitor_typecode/typecode_defn.cpp:808 namespace TAO { @@ -74,7 +74,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/ULongSeqC.cpp b/TAO/tao/ULongSeqC.cpp index f1a05d2f97e..94ac4b27c8d 100644 --- a/TAO/tao/ULongSeqC.cpp +++ b/TAO/tao/ULongSeqC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "ULongSeqC.h" diff --git a/TAO/tao/ULongSeqC.h b/TAO/tao/ULongSeqC.h index bf9670e6c76..65d86041e68 100644 --- a/TAO/tao/ULongSeqC.h +++ b/TAO/tao/ULongSeqC.h @@ -52,13 +52,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -125,7 +118,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ULongSeq; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ULongSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -166,7 +159,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ULongSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:969 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "ULongSeqC.inl" diff --git a/TAO/tao/UShortSeqA.cpp b/TAO/tao/UShortSeqA.cpp index 4394a533723..f7fecdcb766 100644 --- a/TAO/tao/UShortSeqA.cpp +++ b/TAO/tao/UShortSeqA.cpp @@ -35,12 +35,12 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:743 +// be\be_visitor_typecode/typecode_defn.cpp:808 namespace TAO { @@ -74,7 +74,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/UShortSeqC.cpp b/TAO/tao/UShortSeqC.cpp index 223d4062dcc..f63ca9b525c 100644 --- a/TAO/tao/UShortSeqC.cpp +++ b/TAO/tao/UShortSeqC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "UShortSeqC.h" diff --git a/TAO/tao/UShortSeqC.h b/TAO/tao/UShortSeqC.h index 28783b3edab..33a2ce8d2bd 100644 --- a/TAO/tao/UShortSeqC.h +++ b/TAO/tao/UShortSeqC.h @@ -52,13 +52,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -125,7 +118,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_UShortSeq; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_UShortSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -178,7 +171,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_UShortSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:969 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "UShortSeqC.inl" diff --git a/TAO/tao/VisibilityC.h b/TAO/tao/VisibilityC.h index 388d2472bcb..1ce2222cfa2 100644 --- a/TAO/tao/VisibilityC.h +++ b/TAO/tao/VisibilityC.h @@ -73,7 +73,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Visibility; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Visibility; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -99,7 +99,7 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:958 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "VisibilityC.inl" diff --git a/TAO/tao/WCharSeqA.cpp b/TAO/tao/WCharSeqA.cpp index ec92357e171..c01ce82f065 100644 --- a/TAO/tao/WCharSeqA.cpp +++ b/TAO/tao/WCharSeqA.cpp @@ -35,12 +35,12 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:743 +// be\be_visitor_typecode/typecode_defn.cpp:808 namespace TAO { @@ -74,7 +74,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/WCharSeqC.cpp b/TAO/tao/WCharSeqC.cpp index ec59f73ab15..94932151d7a 100644 --- a/TAO/tao/WCharSeqC.cpp +++ b/TAO/tao/WCharSeqC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "WCharSeqC.h" diff --git a/TAO/tao/WCharSeqC.h b/TAO/tao/WCharSeqC.h index 16063336c0b..3db3aae7d63 100644 --- a/TAO/tao/WCharSeqC.h +++ b/TAO/tao/WCharSeqC.h @@ -52,13 +52,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -125,7 +118,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_WCharSeq; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_WCharSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -166,7 +159,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_WCharSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:969 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "WCharSeqC.inl" diff --git a/TAO/tao/WStringSeqA.cpp b/TAO/tao/WStringSeqA.cpp index 89aee1beff8..a4639a0c3fb 100644 --- a/TAO/tao/WStringSeqA.cpp +++ b/TAO/tao/WStringSeqA.cpp @@ -36,12 +36,12 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:743 +// be\be_visitor_typecode/typecode_defn.cpp:808 namespace TAO { @@ -75,7 +75,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/WStringSeqC.cpp b/TAO/tao/WStringSeqC.cpp index aba434c6df1..72bbd8b4a6c 100644 --- a/TAO/tao/WStringSeqC.cpp +++ b/TAO/tao/WStringSeqC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "WStringSeqC.h" diff --git a/TAO/tao/WStringSeqC.h b/TAO/tao/WStringSeqC.h index 3168ba274a9..f0cc4aba79a 100644 --- a/TAO/tao/WStringSeqC.h +++ b/TAO/tao/WStringSeqC.h @@ -52,13 +52,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -123,7 +116,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_WStringSeq; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_WStringSeq; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -164,7 +157,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_WStringSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:969 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "WStringSeqC.inl" diff --git a/TAO/tao/WrongTransactionA.cpp b/TAO/tao/WrongTransactionA.cpp index 405939d04d0..035911d4de1 100644 --- a/TAO/tao/WrongTransactionA.cpp +++ b/TAO/tao/WrongTransactionA.cpp @@ -35,9 +35,9 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:34 -static TAO::TypeCode::Struct_Field<char const *> * const _tao_fields_CORBA_WrongTransaction = 0; +static TAO::TypeCode::Struct_Field<char const *> const * const _tao_fields_CORBA_WrongTransaction = 0; static TAO::TypeCode::Struct<char const *, TAO::TypeCode::Struct_Field<char const *> const *, CORBA::tk_except, @@ -57,7 +57,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp index f90138af938..d135ac77efc 100644 --- a/TAO/tao/WrongTransactionC.cpp +++ b/TAO/tao/WrongTransactionC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "WrongTransactionC.h" diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h index ded0464974e..dc4af210e10 100644 --- a/TAO/tao/WrongTransactionC.h +++ b/TAO/tao/WrongTransactionC.h @@ -49,13 +49,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -117,7 +110,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_WrongTransaction; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_WrongTransaction; #endif /* end #if !defined */ @@ -149,7 +142,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::WrongTransac TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WrongTransaction &); // TAO_IDL - Generated from -// be\be_codegen.cpp:969 +// be\be_codegen.cpp:947 #if defined (__ACE_INLINE__) #include "WrongTransactionC.inl" |