From 561b89409551119833acf7abbb77d4afd632a657 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Wed, 30 May 2018 07:21:23 +0200 Subject: compat/linkage: extern template works on GNU now --- compat/macros.hpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'compat/macros.hpp') diff --git a/compat/macros.hpp b/compat/macros.hpp index c0bc66f4..01d9cd83 100644 --- a/compat/macros.hpp +++ b/compat/macros.hpp @@ -46,23 +46,21 @@ # define OTR_FUNNAME (__PRETTY_FUNCTION__) #endif +#if !defined PP_CAT +# define PP_CAT(x,y) PP_CAT1(x,y) +# define PP_CAT1(x,y) x##y +#endif + #if defined __cplusplus // from now only C++ macros -# define thunk(...) ([&]() { __VA_ARGS__; }) - #if defined _MSC_VER # define OTR_DEPRECATE(msg, decl, body) __declspec(deprecated(msg)) decl body #else # define OTR_DEPRECATE(msg, decl, body) decl body __attribute__((deprecated(msg))) #endif -#if !defined PP_CAT -# define PP_CAT(x,y) PP_CAT1(x,y) -# define PP_CAT1(x,y) x##y -#endif - namespace static_warning_detail { template struct test___132; -- cgit v1.2.3