diff options
| author | Adam Mitz <mitza@objectcomputing.com> | 2021-11-10 14:53:28 -0600 |
|---|---|---|
| committer | Adam Mitz <mitza@objectcomputing.com> | 2021-11-10 14:53:28 -0600 |
| commit | 65c0af62568253959345d73f01af0dc94fb1e11c (patch) | |
| tree | aaacfbd570ca8440e4b5dc32928b2de881e43102 | |
| parent | 6d33d4c7345ae8f7c56470554428d3d0797a1731 (diff) | |
| download | ATCD-65c0af62568253959345d73f01af0dc94fb1e11c.tar.gz | |
SystemExceptions shouldn't use a different export
All classes defined in libTAO should use the same export macro.
This avoids MSVC creating import libs for all executables that use
libTAO -- see https://github.com/DOCGroup/MPC/issues/130 and
https://github.com/microsoft/vcpkg/issues/16551
(cherry picked from commit 0f879fd3f8a6e4d0b1762bd6c1424af735813ccc)
# Conflicts:
# TAO/tao/SystemException.h
| -rw-r--r-- | TAO/tao/SystemException.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h index 9a1da6ec170..5e7ce64700a 100644 --- a/TAO/tao/SystemException.h +++ b/TAO/tao/SystemException.h @@ -26,16 +26,6 @@ #include "tao/Exception.h" -#ifndef TAO_Exception_Export -# if (__GNUC__ > 3) -// Exceptions found in DLL A but potentially thrown in DLL B must -// always be exported. -# define TAO_Exception_Export ACE_Proper_Export_Flag -# else -# define TAO_Exception_Export TAO_Export -# endif /* __GNUC__ > 3*/ -#endif /* !TAO_Exception_Export */ - #ifdef THREAD_CANCELLED # undef THREAD_CANCELLED #endif /* THREAD_CANCELLED */ @@ -185,7 +175,7 @@ namespace CORBA // inside the ORB. All minor codes should be symbolically catalogued. #define TAO_SYSTEM_EXCEPTION(name) \ - class TAO_Exception_Export name : public SystemException \ + class TAO_Export name : public SystemException \ { \ public: \ name (void); \ |