diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2017-07-24 03:26:15 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-07-24 03:26:15 +0200 |
| commit | 56b264206539d4d81229e449ce7a5805220f6b5f (patch) | |
| tree | 80ce681c6da9dae613ce1defb2c9ce3fc7cdca07 /options/value.hpp | |
| parent | e3bc507ed3b2d89738429bd6ade1a127abf11781 (diff) | |
options: disable extern template on non-msvc
Diffstat (limited to 'options/value.hpp')
| -rw-r--r-- | options/value.hpp | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/options/value.hpp b/options/value.hpp index be3e4be2..cdaffcaf 100644 --- a/options/value.hpp +++ b/options/value.hpp @@ -130,27 +130,31 @@ private: const t def; }; -#if defined OTR_OPT_VALUE_TMPL_EXPORT && defined BUILD_OPTIONS -# define OTR_OPT_VALUE OTR_TEMPLATE_EXPORT -#else -# define OTR_OPT_VALUE OTR_TEMPLATE_IMPORT -#endif +#if defined _MSC_VER + +# if defined OTR_OPT_VALUE_TMPL_EXPORT && defined BUILD_OPTIONS +# define OTR_OPT_VALUE OTR_TEMPLATE_EXPORT +# else +# define OTR_OPT_VALUE OTR_TEMPLATE_IMPORT +# endif + + OTR_OPT_VALUE value<double>; + OTR_OPT_VALUE value<float>; + OTR_OPT_VALUE value<int>; + OTR_OPT_VALUE value<bool>; + OTR_OPT_VALUE value<QString>; + OTR_OPT_VALUE value<slider_value>; + OTR_OPT_VALUE value<QPointF>; + OTR_OPT_VALUE value<QVariant>; + + OTR_OPT_VALUE value<QList<double>>; + OTR_OPT_VALUE value<QList<float>>; + OTR_OPT_VALUE value<QList<int>>; + OTR_OPT_VALUE value<QList<bool>>; + OTR_OPT_VALUE value<QList<QString>>; + OTR_OPT_VALUE value<QList<slider_value>>; + OTR_OPT_VALUE value<QList<QPointF>>; -OTR_OPT_VALUE value<double>; -OTR_OPT_VALUE value<float>; -OTR_OPT_VALUE value<int>; -OTR_OPT_VALUE value<bool>; -OTR_OPT_VALUE value<QString>; -OTR_OPT_VALUE value<slider_value>; -OTR_OPT_VALUE value<QPointF>; -OTR_OPT_VALUE value<QVariant>; - -OTR_OPT_VALUE value<QList<double>>; -OTR_OPT_VALUE value<QList<float>>; -OTR_OPT_VALUE value<QList<int>>; -OTR_OPT_VALUE value<QList<bool>>; -OTR_OPT_VALUE value<QList<QString>>; -OTR_OPT_VALUE value<QList<slider_value>>; -OTR_OPT_VALUE value<QList<QPointF>>; +#endif } // ns options |