summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Mitz <mitza@objectcomputing.com>2021-11-10 11:42:07 -0600
committerAdam Mitz <mitza@objectcomputing.com>2021-11-10 11:42:07 -0600
commit0f879fd3f8a6e4d0b1762bd6c1424af735813ccc (patch)
tree14c020998d873bf0ca910fc84940d2556cb8f19f
parent069d2366ec47e59371fa92d70f5e74dcb003971f (diff)
downloadATCD-0f879fd3f8a6e4d0b1762bd6c1424af735813ccc.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
-rw-r--r--TAO/tao/SystemException.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h
index 10ffd265862..70ce210ec9a 100644
--- a/TAO/tao/SystemException.h
+++ b/TAO/tao/SystemException.h
@@ -26,12 +26,6 @@
#include "tao/Exception.h"
-#ifndef TAO_Exception_Export
-# define TAO_Exception_Export ACE_Proper_Export_Flag
-# else
-# define TAO_Exception_Export TAO_Export
-#endif /* !TAO_Exception_Export */
-
#ifdef THREAD_CANCELLED
# undef THREAD_CANCELLED
#endif /* THREAD_CANCELLED */
@@ -181,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); \