generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix build issues

Browse Source
This commit is contained in:
Andrey Kamaev 2013-04-13 16:53:59 +04:00
parent 9deea80b83
commit 802d004bbb
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/ts/include/opencv2/ts/ts_gtest.h
View File

@ -7155,11 +7155,21 @@ GTEST_API_ std::string AppendUserMessage(
// errors presumably detectable only at run time. Since // errors presumably detectable only at run time. Since
// std::runtime_error inherits from std::exception, many testing // std::runtime_error inherits from std::exception, many testing
// frameworks know how to extract and print the message inside it. // 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 { class GTEST_API_ GoogleTestFailureException : public ::std::runtime_error {
public: public:
explicit GoogleTestFailureException(const TestPartResult& failure); explicit GoogleTestFailureException(const TestPartResult& failure);
}; };
#ifdef _MSC_VER
# pragma warning(pop) // Restores the warning state.
#endif // _MSC_VER
#endif // GTEST_HAS_EXCEPTIONS #endif // GTEST_HAS_EXCEPTIONS
// A helper class for creating scoped traces in user programs. // A helper class for creating scoped traces in user programs.

2
modules/ts/src/ts_gtest.cpp
View File

@ -3284,7 +3284,7 @@ static std::string FormatWordList(const std::vector<std::string>& words) {
return word_list.GetString(); return word_list.GetString();
} }
bool ValidateTestPropertyName(const std::string& property_name, static bool ValidateTestPropertyName(const std::string& property_name,
const std::vector<std::string>& reserved_names) { const std::vector<std::string>& reserved_names) {
if (std::find(reserved_names.begin(), reserved_names.end(), property_name) != if (std::find(reserved_names.begin(), reserved_names.end(), property_name) !=
reserved_names.end()) { reserved_names.end()) {