diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-11-23 08:42:10 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-11-23 08:42:10 +0000 |
| commit | 685d80cdd61ee53ef418f1a0c153d1efde33118c (patch) | |
| tree | cb1afcdc51bbb83de68fbfa9ef730a51a22f69d7 /TAO/tao/diffs | |
| parent | e64d7669db9746e2878c3695a436432c80f23165 (diff) | |
| download | ATCD-685d80cdd61ee53ef418f1a0c153d1efde33118c.tar.gz | |
Thu Nov 23 07:41:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/diffs')
| -rw-r--r-- | TAO/tao/diffs/OctetSeq.diff | 21 | ||||
| -rw-r--r-- | TAO/tao/diffs/UShortSeq.diff | 21 |
2 files changed, 0 insertions, 42 deletions
diff --git a/TAO/tao/diffs/OctetSeq.diff b/TAO/tao/diffs/OctetSeq.diff deleted file mode 100644 index fb15f742a61..00000000000 --- a/TAO/tao/diffs/OctetSeq.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- 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 - diff --git a/TAO/tao/diffs/UShortSeq.diff b/TAO/tao/diffs/UShortSeq.diff deleted file mode 100644 index 1938744506a..00000000000 --- a/TAO/tao/diffs/UShortSeq.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- orig/UShortSeqC.h 2005-04-08 10:17:34.909878400 +0200 -+++ UShortSeqC.h 2005-04-08 10:17:41.759728000 +0200 -@@ -133,6 +133,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 - |