From 56b264206539d4d81229e449ce7a5805220f6b5f Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 24 Jul 2017 03:26:15 +0200 Subject: options: disable extern template on non-msvc --- options/value.hpp | 46 +++++++++++++++++++++++++--------------------- 1 file 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; + OTR_OPT_VALUE value; + OTR_OPT_VALUE value; + OTR_OPT_VALUE value; + OTR_OPT_VALUE value; + OTR_OPT_VALUE value; + OTR_OPT_VALUE value; + OTR_OPT_VALUE value; + + OTR_OPT_VALUE value>; + OTR_OPT_VALUE value>; + OTR_OPT_VALUE value>; + OTR_OPT_VALUE value>; + OTR_OPT_VALUE value>; + OTR_OPT_VALUE value>; + OTR_OPT_VALUE value>; -OTR_OPT_VALUE value; -OTR_OPT_VALUE value; -OTR_OPT_VALUE value; -OTR_OPT_VALUE value; -OTR_OPT_VALUE value; -OTR_OPT_VALUE value; -OTR_OPT_VALUE value; -OTR_OPT_VALUE value; - -OTR_OPT_VALUE value>; -OTR_OPT_VALUE value>; -OTR_OPT_VALUE value>; -OTR_OPT_VALUE value>; -OTR_OPT_VALUE value>; -OTR_OPT_VALUE value>; -OTR_OPT_VALUE value>; +#endif } // ns options -- cgit v1.2.3