diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-05-02 16:53:21 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-05-02 16:53:21 +0000 |
| commit | 5990bca832f320e3e8263feb8299c541e5d04a77 (patch) | |
| tree | 9b0d787ba253acef8d251770c6dd4c069c8a7c9b | |
| parent | f139009a733876917d8a0e2f08f83e0981cf9ac3 (diff) | |
| download | ATCD-5990bca832f320e3e8263feb8299c541e5d04a77.tar.gz | |
ChangeLogTag:Mon May 2 09:50:21 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Trader.h | 8 |
2 files changed, 18 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d3b50230680..17958d52922 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,6 +1,15 @@ +Mon May 2 09:50:21 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/Trader/Trader.h: + + Work around Borland unresolved symbol errors concerning the + out-of-line virtual destructor. The virtual destructor should + not be inlined, nor should we have to export TAO_Lockable from + the DSO/DLL. *sigh* + Mon May 2 10:36:43 2005 Douglas C. Schmidt <schmidt@cs.wustl.edu> - * tao/PortableServer/PortableServer_WFunctions.cpp (PortableServer): + * tao/PortableServer/PortableServer_WFunctions.cpp (PortableServer): Remove the "+ 1" from the string length so things will work better for wstrings. Thanks to Wolfgang Fischer <fiw@arcor.de> for reporting this. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h index 2eb09074b1c..25d731b8fbe 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h @@ -122,7 +122,15 @@ private: * Class used to remove the circular dependencies between the * Attribute classes and the Trader class. */ +#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572) +// Work around Borland unresolved symbol errors concerning the +// out-of-line virtual destructor. The virtual destructor should +// not be inlined, nor should we have to export TAO_Lockable from the +// DSO/DLL. *sigh* +class TAO_Trading_Serv_Export TAO_Lockable +#else class TAO_Lockable +#endif /* __BORLANDC__ < 0x572 */ { public: virtual ~TAO_Lockable (void); |