diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2018-08-27 16:58:01 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-08-27 16:58:01 +0200 |
| commit | 87929a9a2168b1634be69fbdcf97d1a41167de6a (patch) | |
| tree | 6c05f82813eafc3bfbce2dcd92bdf4b43bc61dd3 /options | |
| parent | 2ec151886274452fd54024302f5f71760a9665d5 (diff) | |
compat/linkage-macros: simplify
Diffstat (limited to 'options')
| -rw-r--r-- | options/value.cpp | 3 | ||||
| -rw-r--r-- | options/value.hpp | 40 |
2 files changed, 21 insertions, 22 deletions
diff --git a/options/value.cpp b/options/value.cpp index 0e0725f8..e0be69ae 100644 --- a/options/value.cpp +++ b/options/value.cpp @@ -1,5 +1,6 @@ // instantiate the "template class" value<t> symbols -#define OTR_INST_VALUE OTR_TEMPLATE_EXPORT +#include "compat/linkage-macros.hpp" +#define OTR_INST_VALUE(x) OTR_TEMPLATE_EXPORT(x) #include "value.hpp" diff --git a/options/value.hpp b/options/value.hpp index 7c0a8d56..bfa8b352 100644 --- a/options/value.hpp +++ b/options/value.hpp @@ -150,27 +150,25 @@ public: }; // some linker problems -#if !defined __APPLE__ -# if !defined OTR_INST_VALUE -# define OTR_INST_VALUE OTR_TEMPLATE_IMPORT -# endif - - OTR_INST_VALUE(value<double>); - OTR_INST_VALUE(value<float>); - OTR_INST_VALUE(value<int>); - OTR_INST_VALUE(value<bool>); - OTR_INST_VALUE(value<QString>); - OTR_INST_VALUE(value<slider_value>); - OTR_INST_VALUE(value<QPointF>); - OTR_INST_VALUE(value<QVariant>); - OTR_INST_VALUE(value<QList<double>>); - OTR_INST_VALUE(value<QList<float>>); - OTR_INST_VALUE(value<QList<int>>); - OTR_INST_VALUE(value<QList<bool>>); - OTR_INST_VALUE(value<QList<QString>>); - OTR_INST_VALUE(value<QList<slider_value>>); - OTR_INST_VALUE(value<QList<QPointF>>); - OTR_INST_VALUE(value<QList<QVariant>>); +#if !defined OTR_INST_VALUE +# define OTR_INST_VALUE OTR_TEMPLATE_IMPORT #endif +OTR_INST_VALUE(value<double>); +OTR_INST_VALUE(value<float>); +OTR_INST_VALUE(value<int>); +OTR_INST_VALUE(value<bool>); +OTR_INST_VALUE(value<QString>); +OTR_INST_VALUE(value<slider_value>); +OTR_INST_VALUE(value<QPointF>); +OTR_INST_VALUE(value<QVariant>); +OTR_INST_VALUE(value<QList<double>>); +OTR_INST_VALUE(value<QList<float>>); +OTR_INST_VALUE(value<QList<int>>); +OTR_INST_VALUE(value<QList<bool>>); +OTR_INST_VALUE(value<QList<QString>>); +OTR_INST_VALUE(value<QList<slider_value>>); +OTR_INST_VALUE(value<QList<QPointF>>); +OTR_INST_VALUE(value<QList<QVariant>>); + } // ns options |