Revert "ts: expand arguments before stringifications in CV_ENUM and CV_FLAGS"

hrnr · hrnr · commit acce2ded7695 · 2017-06-08T11:41:10.000+02:00
This reverts commit 19538ca. This wasn't a great idea after all. There is a lot of flags implemented as #define, that we don't want to expand.
diff --git a/modules/ts/include/opencv2/ts/ts_perf.hpp b/modules/ts/include/opencv2/ts/ts_perf.hpp
@@ -93,11 +93,6 @@ class MatType
 *     CV_ENUM and CV_FLAGS - macro to create printable wrappers for defines and enums     *
 \*****************************************************************************************/
 
-// helper macros to force expansion of macro arguments before stringification
-// "#" normally blocks argument expansion
-#define CV_STRINGIFY_ARGS(...) CV_STRINGIFY_ARGS_(__VA_ARGS__)
-#define CV_STRINGIFY_ARGS_(...) #__VA_ARGS__
-
 #define CV_ENUM(class_name, ...)                                                        \
     namespace {                                                                         \
     using namespace cv;using namespace cv::cuda; using namespace cv::ocl;               \
@@ -106,7 +101,7 @@ class MatType
         operator int() const { return val_; }                                           \
         void PrintTo(std::ostream* os) const {                                          \
             const int vals[] = { __VA_ARGS__ };                                         \
-            const char* svals = CV_STRINGIFY_ARGS(__VA_ARGS__);                         \
+            const char* svals = #__VA_ARGS__;                                           \
             for(int i = 0, pos = 0; i < (int)(sizeof(vals)/sizeof(int)); ++i) {         \
                 while(isspace(svals[pos]) || svals[pos] == ',') ++pos;                  \
                 int start = pos;                                                        \
@@ -135,7 +130,7 @@ class MatType
         void PrintTo(std::ostream* os) const {                                          \
             using namespace cv;using namespace cv::cuda; using namespace cv::ocl;        \
             const int vals[] = { __VA_ARGS__ };                                         \
-            const char* svals = CV_STRINGIFY_ARGS(__VA_ARGS__);                         \
+            const char* svals = #__VA_ARGS__;                                           \
             int value = val_;                                                           \
             bool first = true;                                                          \
             for(int i = 0, pos = 0; i < (int)(sizeof(vals)/sizeof(int)); ++i) {         \
