potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #6414 from mshabunin:fix-macosx-warnings

Browse Source
This commit is contained in:
Maksim Shabunin
2016-04-17 22:11:57 +00:00
parent 169b5e9fde ba3b1de93f
commit 809c159e11
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ts/include/opencv2/ts/ts_perf.hpp
+6 -1
View File
@@ -369,7 +369,12 @@ public:
static enum PERF_STRATEGY getCurrentModulePerformanceStrategy();
static enum PERF_STRATEGY setModulePerformanceStrategy(enum PERF_STRATEGY strategy);
class PerfSkipTestException: public cv::Exception {};
class PerfSkipTestException: public cv::Exception
{
int dummy; // workaround for MacOSX Xcode 7.3 bug (don't make class "empty")
public:
PerfSkipTestException() : dummy(0) {}
};
protected:
virtual void PerfTestBody() = 0;