Fix build issues

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

View File

@@ -7155,11 +7155,21 @@ GTEST_API_ std::string AppendUserMessage(
// errors presumably detectable only at run time. Since
// 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.