merge from ReForm

merging the latest updates from the ReForm team.

Debug/DebOut.hh

@@ -9,7 +9,9 @@
 #ifndef DEB_ON
 
 #define DEB_enter_func PROGRESS_TICK;
-#define DEB_only(CC)
+#define DEB_only(EXPR)
+#define DEB_onlyc(EXPR)
+#define DEB_only_if(CC, EXPR)
 #define DEB_exec(LL, AA) { PROGRESS_TICK; }
 #define DEB_exec_if(CC, LL, AA) { PROGRESS_TICK; }
 #define DEB_out(LL, AA) { PROGRESS_TICK; }
@@ -138,7 +140,9 @@ std::string to_string(const T& _t)
   static int deb_lvl = ::Debug::INVALID_LEVEL; \
   ::Debug::Enter deb(__FILE__, __FUNCTION__, deb_nmbr, deb_lvl);
 
-#define DEB_only(CC) CC
+#define DEB_only(EXPR) EXPR
+#define DEB_onlyc(EXPR) , EXPR // useful when comma is optionally required
+#define DEB_only_if(CC, EXPR) if (CC) { (EXPR); }
 
 #define DEB_if(CC, LL, EXPR) \
   { \