diff --git a/src/amdis/common/ConceptsBase.hpp b/src/amdis/common/ConceptsBase.hpp index 6716d4cf897dccc4866de1b2d1865b731ba0d59b..67b1d6b4beb090128ea6b17d6a91360a14ec4e49 100644 --- a/src/amdis/common/ConceptsBase.hpp +++ b/src/amdis/common/ConceptsBase.hpp @@ -4,7 +4,7 @@ #include <dune/common/typetraits.hh> #define AMDIS_CONCAT_IMPL( x, y ) x##y -#define AMDIS_MACRO_CONCAT( x, y ) CONCAT_IMPL( x, y ) +#define AMDIS_MACRO_CONCAT( x, y ) AMDIS_CONCAT_IMPL( x, y ) #ifdef DOXYGEN #define REQUIRES(...) @@ -15,7 +15,7 @@ #define REQUIRES(...) std::enable_if_t<__VA_ARGS__ , int> = 0 #define REQUIRES_(...) std::enable_if_t<__VA_ARGS__ , int> #define CONCEPT constexpr - #define CHECK_CONCEPT(...) static __VA_ARGS__ MACRO_CONCAT( _concept_check_, __COUNTER__ ) + #define CHECK_CONCEPT(...) static __VA_ARGS__ AMDIS_MACRO_CONCAT( _concept_check_, __COUNTER__ ) #endif namespace AMDiS