From 2e84934bc0eb39c940efd53e1143ddb991622207 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 31 Mar 2005 12:36:24 +0000 Subject: ChangeLogTag: Thu Mar 31 13:05:12 UTC 2005 Johnny Willemsen --- TAO/tao/CONV_FRAMEC.h | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'TAO/tao/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" -- cgit v1.2.1