mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 05:29:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix CV_ENUM macro instability

Browse Source
This commit is contained in:
Andrey Kamaev 2012-10-08 21:30:40 +04:00
parent 4be7619ce4
commit a3ab6d147d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/ts/include/opencv2/ts/ts_perf.hpp
View File

@ -90,7 +90,7 @@ private:
\*****************************************************************************************/ \*****************************************************************************************/
#define CV_ENUM(class_name, ...) \ #define CV_ENUM(class_name, ...) \
class CV_EXPORTS class_name {\ namespace { class CV_EXPORTS class_name {\
public:\ public:\
class_name(int val = 0) : _val(val) {}\ class_name(int val = 0) : _val(val) {}\
operator int() const {return _val;}\ operator int() const {return _val;}\
@ -116,12 +116,12 @@ public:\
private: class_name *_begin, *_end;\ private: class_name *_begin, *_end;\
};\ };\
static Container all(){\ static Container all(){\
static class_name vals[] = {__VA_ARGS__};\ static int vals[] = {__VA_ARGS__};\
return Container(vals, sizeof(vals)/sizeof(vals[0]));\ return Container((class_name*)vals, sizeof(vals)/sizeof(vals[0]));\
}\ }\
private: int _val;\ private: int _val;\
};\ };\
inline void PrintTo(const class_name& t, std::ostream* os) { t.PrintTo(os); } inline void PrintTo(const class_name& t, std::ostream* os) { t.PrintTo(os); } }
#define CV_FLAGS(class_name, ...) \ #define CV_FLAGS(class_name, ...) \
class CV_EXPORTS class_name {\ class CV_EXPORTS class_name {\