diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-09-13 09:00:27 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-09-13 09:00:27 +0000 |
| commit | 7efb6d6d1094a864bebec93186ac7d8c08f108aa (patch) | |
| tree | c00327a670ec4a28a384dacbdbfac8463ba6b4b7 | |
| parent | c4a53a42c23cd084cd7833c737797bf6fa543d14 (diff) | |
| download | ATCD-7efb6d6d1094a864bebec93186ac7d8c08f108aa.tar.gz | |
ChangeLogTag: Mon Sep 13 09:00:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/tao/UShortSeqC.h | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/TAO/tao/UShortSeqC.h b/TAO/tao/UShortSeqC.h index 1ba78ecea0e..0a7cf275a8b 100644 --- a/TAO/tao/UShortSeqC.h +++ b/TAO/tao/UShortSeqC.h @@ -72,22 +72,22 @@ namespace CORBA { - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_USHORTSEQ_CH_) #define _CORBA_USHORTSEQ_CH_ - + class UShortSeq; - + typedef TAO_FixedSeq_Var_T< UShortSeq, CORBA::UShort > UShortSeq_var; - + typedef TAO_Seq_Out_T< UShortSeq, @@ -95,7 +95,7 @@ namespace CORBA CORBA::UShort > UShortSeq_out; - + class TAO_Export UShortSeq : public TAO_Unbounded_Sequence< @@ -108,22 +108,22 @@ namespace CORBA UShortSeq ( CORBA::ULong max, CORBA::ULong length, - CORBA::UShort* buffer, + CORBA::UShort* buffer, CORBA::Boolean release = 0 ); UShortSeq (const UShortSeq &); ~UShortSeq (void); - + static void _tao_any_destructor (void *); - + typedef UShortSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UShortSeq; // TAO_IDL - Generated from @@ -139,6 +139,18 @@ namespace TAO { } +// Workaround for a Visual Studio .NET bug where this class is not +// properly imported by an application if typedef'd or subclassed, +// resulting in 'multiply defined' link errors. The export macro +// here forces an explicit import by the application. Please see +// http://support.microsoft.com/default.aspx?scid=kb;en-us;309801 +// The problem stems from use of the type below in DsLogAdmin, +// but we put the instantiation here because the application will +// need to see it in *C.h to avoid the error. +#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT + template class TAO_Export TAO_Unbounded_Sequence<CORBA::UShortSeq>; +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ + // TAO_IDL - Generated from // be\be_visitor_sequence/any_op_ch.cpp:52 |