diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-01-04 10:50:56 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-01-04 10:50:56 +0000 |
| commit | ea3d37015a5f2230f31088bd82d2e065d507cd8f (patch) | |
| tree | 3c039ee0b38bbeeafe6ba9d7482f3c6537fe7cc2 | |
| parent | bbda9ce62e9526953512e9921b72a84738e7e150 (diff) | |
| download | ATCD-ea3d37015a5f2230f31088bd82d2e065d507cd8f.tar.gz | |
ChangeLogTag: Tue Jan 4 10:44:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/tao/UShortSeq.pidl | 3 | ||||
| -rw-r--r-- | TAO/tao/diffs/UShortSeq.diff | 29 |
2 files changed, 32 insertions, 0 deletions
diff --git a/TAO/tao/UShortSeq.pidl b/TAO/tao/UShortSeq.pidl index 25315316a28..1a2e0a44ab1 100644 --- a/TAO/tao/UShortSeq.pidl +++ b/TAO/tao/UShortSeq.pidl @@ -14,6 +14,9 @@ * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" * UShortSeq.pidl + * + * Patches for changes to the generated code are available in the + * `diffs' directory. */ // ================================================================ diff --git a/TAO/tao/diffs/UShortSeq.diff b/TAO/tao/diffs/UShortSeq.diff new file mode 100644 index 00000000000..f10510e70c4 --- /dev/null +++ b/TAO/tao/diffs/UShortSeq.diff @@ -0,0 +1,29 @@ +--- orig/UShortSeqC.h 2004-11-17 09:35:38.102251200 +0100 ++++ UShortSeqC.h 2004-11-17 09:55:41.000000000 +0100 +@@ -1,6 +1,6 @@ + // -*- C++ -*- + // +-// $Id$ ++// $Id$ + + // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** + // TAO and the TAO IDL Compiler have been developed by: +@@ -140,6 +140,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 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 + |