diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-10-07 21:11:03 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-10-07 21:11:03 +0000 |
| commit | 982d3bb611de036ee88f5807681ca6c8f26ca57d (patch) | |
| tree | 2582d992820c5cd5d88da9c34605c4a17fc06a2c | |
| parent | 0f97f9338591f0092812264b292ded84199f35b3 (diff) | |
| download | ATCD-982d3bb611de036ee88f5807681ca6c8f26ca57d.tar.gz | |
ChangeLogTag: Thu Oct 7 16:07:36 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/tao/Typecode.h | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6a495f0a518..c09405bdbdc 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Thu Oct 7 16:07:36 2004 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tao/Typecode.h: + + Added patch sent in by Frank Pilhofer <fp@mc.com> that makes + a guarded explicit template instantiation of + TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode>, as a + workaround for the VC 7.1 bug described in + http://support.microsoft.com/default.aspx?scid=kb;en-us;309801. + Thu Oct 7 11:39:46 2004 Chad Elliott <elliott_c@ociweb.com> * tests/Typedef_String_Array/client.cpp: diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h index e0cd99ddbe6..bb455335f06 100644 --- a/TAO/tao/Typecode.h +++ b/TAO/tao/Typecode.h @@ -36,6 +36,7 @@ #include "tao/TC_Constants_Forward.h" #include "tao/OBV_Constants.h" #include "tao/CORBA_methods.h" +#include "tao/Sequence_T.h" // Forward declarations. class TAO_InputCDR; @@ -688,6 +689,15 @@ 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 +#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT + template class TAO_Export TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode>; +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ + TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR& cdr, const CORBA::TypeCode *x); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR& cdr, |