Avoid double underscore in macros

zayenz · zayenz · commit 9a5efb1566cf · 2020-08-14T14:16:15.000+02:00
Identifiers with double underscores are reserved, and using them is undefined behaviour. Similarly, identifiers using a single underscore followed by an uppercase letters are also reserved. See more at https://en.cppreference.com/w/cpp/language/identifiers This change is for code defined from macros in Gecode, suich as GECODE_ME_CHECK. Additional fix for issue #63
diff --git a/gecode/kernel/macros.hpp b/gecode/kernel/macros.hpp
@@ -39,7 +39,7 @@
  */
 #define GECODE_POST \
   if (home.failed()) return;             \
-  ::Gecode::PostInfo __gecode__pi(home);
+  ::Gecode::PostInfo gecode_pi_(home);
 
 
 /**
@@ -61,11 +61,11 @@
  * or the commit member function of a brancher.
  * \ingroup TaskActor
  */
-#define GECODE_ME_CHECK_MODIFIED(modified, me) do {        \
-    ::Gecode::ModEvent __me__ ## __LINE__ = (me);          \
-    if (::Gecode::me_failed(__me__ ## __LINE__))           \
-      return ::Gecode::ES_FAILED;                          \
-    modified |= ::Gecode::me_modified(__me__ ## __LINE__); \
+#define GECODE_ME_CHECK_MODIFIED(modified, me) do {             \
+    ::Gecode::ModEvent gecode_me_ ## __LINE__ = (me);           \
+    if (::Gecode::me_failed(gecode_me_ ## __LINE__))            \
+      return ::Gecode::ES_FAILED;                               \
+    modified |= ::Gecode::me_modified(gecode_me_ ## __LINE__);  \
   } while (0)
 
 /**
@@ -74,10 +74,10 @@
  * To be used inside post functions.
  * \ingroup TaskActor
  */
-#define GECODE_ME_FAIL(me) do {                 \
-  if (::Gecode::me_failed(me)) {                \
-    (home).fail();                              \
-    return;                                     \
+#define GECODE_ME_FAIL(me) do {   \
+  if (::Gecode::me_failed(me)) {  \
+    (home).fail();                \
+    return;                       \
   }} while (0)
 
 
@@ -89,9 +89,9 @@
  * \ingroup TaskActor
  */
 #define GECODE_ES_CHECK(es) do {                        \
-    ::Gecode::ExecStatus __es__ ## __LINE__ = (es);     \
-    if (__es__ ## __LINE__ < ::Gecode::ES_OK)           \
-      return __es__ ## __LINE__;                        \
+    ::Gecode::ExecStatus gecode_es_ ## __LINE__ = (es); \
+    if (gecode_es_ ## __LINE__ < ::Gecode::ES_OK)       \
+      return gecode_es_ ## __LINE__;                    \
   } while (0)
 
 /**
@@ -101,9 +101,9 @@
  * \ingroup TaskActor
  */
 #define GECODE_ES_FAIL(es) do {                                 \
-    ::Gecode::ExecStatus __es__ ## __LINE__ = (es);             \
-    assert(__es__ ## __LINE__ != ::Gecode::__ES_SUBSUMED);      \
-    if (__es__ ## __LINE__ < ::Gecode::ES_OK) {                 \
+    ::Gecode::ExecStatus gecode_es_ ## __LINE__ = (es);         \
+    assert(gecode_es_ ## __LINE__ != ::Gecode::ES_SUBSUMED_);   \
+    if (gecode_es_ ## __LINE__ < ::Gecode::ES_OK) {             \
       (home).fail(); return;                                    \
     }                                                           \
   } while (0)
@@ -113,13 +113,13 @@
  *
  * \ingroup TaskActor
  */
-#define GECODE_REWRITE(prop,post) do {                                   \
-  ::Gecode::Propagator& __p__ ## __LINE__ = (prop);                      \
-  size_t __s__ ## __LINE__  = __p__ ## __LINE__.dispose(home);           \
-  ::Gecode::ExecStatus __es__ ## __LINE__ = (post);                      \
-  if (__es__ ## __LINE__ != ::Gecode::ES_OK)                             \
-    return ::Gecode::ES_FAILED;                                          \
-  return home.ES_SUBSUMED_DISPOSED(__p__ ## __LINE__,__s__ ## __LINE__); \
+#define GECODE_REWRITE(prop,post) do {                                             \
+  ::Gecode::Propagator& gecode_p_ ## __LINE__ = (prop);                            \
+  size_t gecode_s_ ## __LINE__  = gecode_p_ ## __LINE__.dispose(home);             \
+  ::Gecode::ExecStatus gecode_es_ ## __LINE__ = (post);                            \
+  if (gecode_es_ ## __LINE__ != ::Gecode::ES_OK)                                   \
+    return ::Gecode::ES_FAILED;                                                    \
+  return home.ES_SUBSUMED_DISPOSED(gecode_p_ ## __LINE__, gecode_s_ ## __LINE__);  \
 } while (0)
 
 // STATISTICS: kernel-other
diff --git a/gecode/set/rel/common.hpp b/gecode/set/rel/common.hpp
@@ -38,15 +38,15 @@
  */
 
 #define GECODE_SET_ME_CHECK_VAL(p,f) {                   \
-    ModEvent _me_ ## __LINE__ = (p);                   \
-    if (me_failed(_me_ ## __LINE__)) return ES_FAILED; \
-    if (ME_GEN_ASSIGNED==(_me_ ## __LINE__))f=true; }
+    ModEvent gecode_me_ ## __LINE__ = (p);                   \
+    if (me_failed(gecode_me_ ## __LINE__)) return ES_FAILED; \
+    if (ME_GEN_ASSIGNED==(gecode_me_ ## __LINE__))f=true; }
 
 #define GECODE_SET_ME_CHECK_VAL_B(modified, tell, f) \
   {                                                  \
     ModEvent me = (tell);                            \
     modified |= me_modified(me);                     \
-    if (ME_GEN_ASSIGNED==(me))f=true;                \
+    if (ME_GEN_ASSIGNED==(me)) f=true;               \
     GECODE_ME_CHECK(me);                             \
   }
 
diff --git a/gecode/support/macros.hpp b/gecode/support/macros.hpp
@@ -36,7 +36,7 @@
 /// Concatenate macro-expanded \a R and \a LINE
 #define GECODE_CAT(R,LINE) GECODE_CAT2(R,LINE)
 /// Generate fresh name with prefix P
-#define GECODE_FRESH(P) GECODE_CAT(_GECODE_ ## P, __LINE__)
+#define GECODE_FRESH(P) GECODE_CAT(GECODE_ ## P, __LINE__)
 
 /**
  * \def GECODE_NEVER
