3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-01-14 00:20:57 +08:00
Code Issues Projects Releases Wiki Activity

Fix build under msvc

Browse Source
This commit is contained in:
Vladimir Goncharov 2020-07-07 19:28:24 +03:00
parent 92d0a6f7e2
commit 0a80845e73
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
googlemock/include/gmock/gmock-matchers.h
View File

@ -4734,6 +4734,13 @@ namespace internal {
template <typename Err>
class ExceptionMatcherImpl {
class NeverThrown {
public:
const char* what() const noexcept {
return "this exception should never be thrown";
}
};
public:
ExceptionMatcherImpl(Matcher<const Err&> matcher)
: matcher_(std::move(matcher)) {}
@ -4764,7 +4771,14 @@ class ExceptionMatcherImpl {
} else {
return true;
}
} catch (const std::exception& err) {
} catch (
typename std::conditional<
std::is_same<
typename std::remove_cv<
typename std::remove_reference<Err>::type>::type,
std::exception>::value,
const NeverThrown&,
const std::exception&>::type const& err) {
#if GTEST_HAS_RTTI
*listener << "throws an exception of type "
<< GetTypeName(typeid(err)) << " ";