From e3e8caf61bbc22c3b278ce8bd36501b73806d524 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 22 Mar 2019 04:28:00 +0100 Subject: actually expand __COUNTER__ --- options/metatype.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'options') diff --git a/options/metatype.cpp b/options/metatype.cpp index 64df3b1a..7962b81b 100644 --- a/options/metatype.cpp +++ b/options/metatype.cpp @@ -12,15 +12,16 @@ void declare_metatype_for_type(const char* str) } // ns options::detail -#define OPENTRACK_DEFINE_METATYPE2(t, ctr) \ - namespace { /* NOLINT(cert-dcl59-cpp) */ \ - [[maybe_unused]] \ - static const char ctr = /* NOLINT(misc-definitions-in-headers) */ \ - (::options::detail::declare_metatype_for_type(#t), 0); \ - } // anon ns +#define OPENTRACK_DEFINE_METATYPE3(t, ctr) \ + static \ + const char init_##ctr = /* NOLINT(misc-definitions-in-headers) */ \ + (::options::detail::declare_metatype_for_type(#t), 0); \ + +#define OPENTRACK_DEFINE_METATYPE2(t, ctr) \ + OPENTRACK_DEFINE_METATYPE3(t, ctr) #define OPENTRACK_DEFINE_METATYPE(t) \ - OPENTRACK_DEFINE_METATYPE2(t, PP_CAT(kipple_, __COUNTER__)) + OPENTRACK_DEFINE_METATYPE2(t, __COUNTER__) #define OPENTRACK_METATYPE_(x) OPENTRACK_DEFINE_METATYPE(x) #include "metatype.hpp" -- cgit v1.2.3