diff options
Diffstat (limited to 'libs/pbd')
| -rw-r--r-- | libs/pbd/pbd/abstract_ui.h | 19 | ||||
| -rw-r--r-- | libs/pbd/pbd/libpbd_visibility.h | 2 |
2 files changed, 18 insertions, 3 deletions
diff --git a/libs/pbd/pbd/abstract_ui.h b/libs/pbd/pbd/abstract_ui.h index e78cf1ce28..f78ba26090 100644 --- a/libs/pbd/pbd/abstract_ui.h +++ b/libs/pbd/pbd/abstract_ui.h @@ -32,10 +32,27 @@ #include "pbd/signals.h" #include "pbd/base_ui.h" +/* We have a special case in libpbd of a template class that gets instantiated + * as the base class of several classes in other libraries. It is not possible + * to use LIBFOO_API to mark this visible, because the FOO in each case is + * different. So we define this generic visible/export/hidden/import pair + * of macros to try to deal with this special case. These should NEVER be + * used anywhere except AbstractUI<T> (or similar cases if they arise. + * + * Note the assumption here that other libs are being built as DLLs if this one is. + */ + +#ifdef ABSTRACT_UI_EXPORTS +#define ABSTRACT_UI_API LIBPBD_DLL_EXPORT +#else +#define ABSTRACT_UI_API LIBPBD_DLL_IMPORT +#endif + + class Touchable; template<typename RequestObject> -class AbstractUI : public BaseUI +class ABSTRACT_UI_API AbstractUI : public BaseUI /* see notes in visibility.h about why this is not LIBPBD_API */ { public: AbstractUI (const std::string& name); diff --git a/libs/pbd/pbd/libpbd_visibility.h b/libs/pbd/pbd/libpbd_visibility.h index 0aa309a4a4..e2c6235f0b 100644 --- a/libs/pbd/pbd/libpbd_visibility.h +++ b/libs/pbd/pbd/libpbd_visibility.h @@ -38,8 +38,6 @@ #define LIBPBD_DLL_IMPORT #define LIBPBD_DLL_EXPORT #define LIBPBD_DLL_LOCAL - #define LIBPBD_DLL_IMPORT_CLASS - #define LIBPBD_DLL_EXPORT_CLASS #endif #endif |