[lmi-commits] [lmi] master 8ecde06f 6/8: Avoid reserved names in token pasting

[Greg Chicares]

branch: master
commit 8ecde06f39e479e5f224bc1f9c3ea0e4d3a3314b
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Avoid reserved names in token pasting
    
    This##_example is the same as This##_##example.
---
 mc_enum_type_enums.hpp | 2 +-
 mc_enum_types.cpp      | 6 +++---
 wx_test_case.hpp       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mc_enum_type_enums.hpp b/mc_enum_type_enums.hpp
index c5acc607..26a8a557 100644
--- a/mc_enum_type_enums.hpp
+++ b/mc_enum_type_enums.hpp
@@ -105,7 +105,7 @@ enum mcenum_mode
 
 #define MC_DEFINE_ENUMS(TYPE) \
 enum mcenum_##TYPE \
-TYPE##_VALUES
+TYPE##_##VALUES
 
 MC_DEFINE_ENUMS(yes_or_no)
 MC_DEFINE_ENUMS(gender)
diff --git a/mc_enum_types.cpp b/mc_enum_types.cpp
index 649931da..02e52a3d 100644
--- a/mc_enum_types.cpp
+++ b/mc_enum_types.cpp
@@ -119,10 +119,10 @@ template class mc_enum<rounding_style>;
 #include "mc_enum_types.xpp"
 
 #define MC_DEFINE(TYPE,NUMBER) \
-extern mcenum_##TYPE const TYPE##_enums[] = TYPE##_VALUES \
-extern char const*const TYPE##_strings[] = TYPE##_NAMES \
+extern mcenum_##TYPE const TYPE##_##enums[] = TYPE##_##VALUES \
+extern char const*const TYPE##_##strings[] = TYPE##_##NAMES \
 template<> struct mc_enum_key<mcenum_##TYPE> \
-  :public mc_enum_data<mcenum_##TYPE, NUMBER, TYPE##_enums, TYPE##_strings> 
{}; \
+  :public mc_enum_data<mcenum_##TYPE, NUMBER, TYPE##_##enums, 
TYPE##_##strings> {}; \
 template class mc_enum<mcenum_##TYPE>;
 
 MC_DEFINE(yes_or_no,2)
diff --git a/wx_test_case.hpp b/wx_test_case.hpp
index 91bdf48e..4dd2ef77 100644
--- a/wx_test_case.hpp
+++ b/wx_test_case.hpp
@@ -119,7 +119,7 @@ class wx_test_case_##name \
  \
     void run() override; \
 }; \
-static wx_test_case_##name wx_test_case_##name##_instance; \
+static wx_test_case_##name wx_test_case_##name##_##instance; \
 void wx_test_case_##name::run()
 
 #endif // wx_test_case_hpp