From 31cb16207abd9ac03516dc69ffcc9125769b1e08 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 22 Sep 2017 14:17:27 +0200 Subject: options: simplify macro --- options/value.cpp | 4 +++- options/value.hpp | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/options/value.cpp b/options/value.cpp index 39bf0506..5796dcd6 100644 --- a/options/value.cpp +++ b/options/value.cpp @@ -1,3 +1,5 @@ // instantiate the "template class" value symbols -#define OTR_OPT_VALUE_TMPL_EXPORT + +#define OTR_OPT_VALUE OTR_TEMPLATE_EXPORT #include "value.hpp" + diff --git a/options/value.hpp b/options/value.hpp index be4ff367..0f5d876f 100644 --- a/options/value.hpp +++ b/options/value.hpp @@ -126,9 +126,7 @@ private: #if defined _MSC_VER -# if defined OTR_OPT_VALUE_TMPL_EXPORT && defined BUILD_OPTIONS -# define OTR_OPT_VALUE OTR_TEMPLATE_EXPORT -# else +# if !defined OTR_OPT_VALUE # define OTR_OPT_VALUE OTR_TEMPLATE_IMPORT # endif -- cgit v1.2.3