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

clean up the code

Browse Source 
* disable the warning in CMake, not int the code using pragma
This commit is contained in:
Tomoaki Teshima
2017-12-22 08:42:21 +09:00
parent 1bc1f3d311
commit fe7b3f1228
11 changed files with 4 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ts/include/opencv2/ts.hpp
-1
View File
@@ -34,7 +34,6 @@
#endif
#ifdef _MSC_VER
#pragma warning( disable: 4127 ) // conditional expression is constant
#pragma warning( disable: 4503 ) // decorated name length exceeded, name was truncated
#endif
modules/ts/include/opencv2/ts/ts_gtest.h
-9
View File
@@ -7976,20 +7976,11 @@ GTEST_API_ std::string AppendUserMessage(
// std::runtime_error inherits from std::exception, many testing
// frameworks know how to extract and print the message inside it.
#ifdef _MSC_VER
# pragma warning(push) // Saves the current warning state.
# pragma warning(disable:4275) // Temporarily disables warning 4275.
#endif // _MSC_VER
class GTEST_API_ GoogleTestFailureException : public ::std::runtime_error {
public:
explicit GoogleTestFailureException(const TestPartResult& failure);
};
#ifdef _MSC_VER
# pragma warning(pop) // Restores the warning state.
#endif // _MSC_VER
#endif // GTEST_HAS_EXCEPTIONS
// A helper class for creating scoped traces in user programs.