diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-11-13 21:10:41 -0500 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-11-13 21:10:42 -0500 |
| commit | 7a0680dc223088211807f1b19598dfe01b3bab8b (patch) | |
| tree | 8cc0e01ea848a037e681143cb521bc08e4132c5b /googlemock/include/gmock/gmock-matchers.h | |
| parent | b18d39bd2ea2d2b508228a9a1d8ae9f7fba32f78 (diff) | |
| parent | 48021336904c12e129e372a46b0995647a345b1e (diff) | |
| download | googletest-7a0680dc223088211807f1b19598dfe01b3bab8b.tar.gz googletest-7a0680dc223088211807f1b19598dfe01b3bab8b.tar.bz2 googletest-7a0680dc223088211807f1b19598dfe01b3bab8b.zip | |
Merge pull request #1959 from robinlinden:remove-msvc-workarounds
PiperOrigin-RevId: 221356626
Diffstat (limited to 'googlemock/include/gmock/gmock-matchers.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 13f27ae6..c1b29e6d 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -2485,15 +2485,8 @@ class PropertyMatcher { *listener << whose_property_ << "is "; // Cannot pass the return value (for example, int) to MatchPrintAndExplain, // which takes a non-const reference as argument. -#if defined(_PREFAST_ ) && _MSC_VER == 1800 - // Workaround bug in VC++ 2013's /analyze parser. - // https://connect.microsoft.com/VisualStudio/feedback/details/1106363/internal-compiler-error-with-analyze-due-to-failure-to-infer-move - posix::Abort(); // To make sure it is never run. - return false; -#else RefToConstProperty result = (obj.*property_)(); return MatchPrintAndExplain(result, matcher_, listener); -#endif } bool MatchAndExplainImpl(true_type /* is_pointer */, const Class* p, |