mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

instrumentation: fix build on Linux

Browse Source 
- enable C++11
- fix macro
This commit is contained in:
Alexander Alekhin 2016-08-26 15:08:50 +03:00
parent 10d18a315c
commit d855608e6e
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/OpenCVCompilerOptions.cmake
View File

@ -233,6 +233,11 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(OPENCV_EXTRA_CXX_FLAGS "${OPENCV_EXTRA_CXX_FLAGS} --coverage") set(OPENCV_EXTRA_CXX_FLAGS "${OPENCV_EXTRA_CXX_FLAGS} --coverage")
endif() endif()
if(ENABLE_INSTRUMENTATION)
set(OPENCV_EXTRA_CXX_FLAGS "${OPENCV_EXTRA_CXX_FLAGS} --std=c++11")
set(WITH_VTK OFF) # There are issues with VTK 6.0
endif()
set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} -DNDEBUG") set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} -DNDEBUG")
set(OPENCV_EXTRA_FLAGS_DEBUG "${OPENCV_EXTRA_FLAGS_DEBUG} -O0 -DDEBUG -D_DEBUG") set(OPENCV_EXTRA_FLAGS_DEBUG "${OPENCV_EXTRA_FLAGS_DEBUG} -O0 -DDEBUG -D_DEBUG")
endif() endif()

8
modules/core/include/opencv2/core/private.hpp
View File

@ -502,12 +502,12 @@ CV_EXPORTS InstrNode* getCurrentNode();
auto status = ((FUN)(__VA_ARGS__));\ auto status = ((FUN)(__VA_ARGS__));\
if(ERROR_COND){\ if(ERROR_COND){\
::cv::instr::getCurrentNode()->m_payload.m_funError = true;\ ::cv::instr::getCurrentNode()->m_payload.m_funError = true;\
CV_INSTRUMENT_MARK_META(IMPL, ##FUN - BadExit);\ CV_INSTRUMENT_MARK_META(IMPL, #FUN " - BadExit");\
}\ }\
return status;\ return status;\
}catch(...){\ }catch(...){\
::cv::instr::getCurrentNode()->m_payload.m_funError = true;\ ::cv::instr::getCurrentNode()->m_payload.m_funError = true;\
CV_INSTRUMENT_MARK_META(IMPL, ##FUN - BadExit);\ CV_INSTRUMENT_MARK_META(IMPL, #FUN " - BadExit");\
throw;\ throw;\
}\ }\
}else{\ }else{\
@ -523,7 +523,7 @@ CV_EXPORTS InstrNode* getCurrentNode();
(FUN)(__VA_ARGS__);\ (FUN)(__VA_ARGS__);\
}catch(...){\ }catch(...){\
::cv::instr::getCurrentNode()->m_payload.m_funError = true;\ ::cv::instr::getCurrentNode()->m_payload.m_funError = true;\
CV_INSTRUMENT_MARK_META(IMPL, ##FUN - BadExit);\ CV_INSTRUMENT_MARK_META(IMPL, #FUN "- BadExit");\
throw;\ throw;\
}\ }\
}else{\ }else{\
@ -531,7 +531,7 @@ CV_EXPORTS InstrNode* getCurrentNode();
}\ }\
}()) }())
// Instrumentation information marker // Instrumentation information marker
#define CV_INSTRUMENT_MARK_META(IMPL, NAME, ...) {::cv::instr::IntrumentationRegion __instr_mark__(#NAME, __FILE__, __LINE__, ::cv::instr::TYPE_MARKER, IMPL);} #define CV_INSTRUMENT_MARK_META(IMPL, NAME, ...) {::cv::instr::IntrumentationRegion __instr_mark__(NAME, __FILE__, __LINE__, ::cv::instr::TYPE_MARKER, IMPL);}
///// General instrumentation ///// General instrumentation
// General OpenCV region instrumentation macro // General OpenCV region instrumentation macro