diff options
author | seibelr <seibelr@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-11-24 22:12:20 +0000 |
---|---|---|
committer | seibelr <seibelr@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-11-24 22:12:20 +0000 |
commit | 47b676670dc9373bc77af80388e0b51e36134738 (patch) | |
tree | aacce0809279e1d142e7b196a84ff10dfbdae4d0 /TAO/tao/diffs/OctetSeq.diff | |
parent | 3dd4e2fe6c64de3a9db04757eade78d764b578f1 (diff) | |
download | ATCD-GH5_0port.tar.gz |
Added the ACE and TAO for this branchGH5_0port
Diffstat (limited to 'TAO/tao/diffs/OctetSeq.diff')
-rw-r--r-- | TAO/tao/diffs/OctetSeq.diff | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/TAO/tao/diffs/OctetSeq.diff b/TAO/tao/diffs/OctetSeq.diff new file mode 100644 index 00000000000..fb15f742a61 --- /dev/null +++ b/TAO/tao/diffs/OctetSeq.diff @@ -0,0 +1,21 @@ +--- orig/OctetSeqC.h 2005-04-08 10:17:34.108726400 +0200 ++++ OctetSeqC.h 2005-04-08 10:17:41.829828800 +0200 +@@ -141,6 +141,18 @@ + { + } + ++// 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 PortableServer, ++// 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_value_sequence<CORBA::OctetSeq>; ++#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ ++ + // TAO_IDL - Generated from + // be\be_visitor_sequence/any_op_ch.cpp:52 + |