diff options
| author | Robin Lindén <dev@robinlinden.eu> | 2018-11-10 14:05:55 (GMT) |
|---|---|---|
| committer | Robin Lindén <dev@robinlinden.eu> | 2018-11-10 14:20:26 (GMT) |
| commit | 826656b25f62ed0a2fadc7c5dde303616e621c08 (patch) | |
| tree | 01db8e689dc6d256d0a5d65dad6d714cc39b8273 /googlemock/include/gmock/gmock-matchers.h | |
| parent | de5be0eb28b74ecd6335e3bd61d9dc8914ce0e57 (diff) | |
| download | googletest-826656b25f62ed0a2fadc7c5dde303616e621c08.zip googletest-826656b25f62ed0a2fadc7c5dde303616e621c08.tar.gz googletest-826656b25f62ed0a2fadc7c5dde303616e621c08.tar.bz2 | |
Remove workarounds for unsupported MSVC versions
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 95bc22c..18a1c94 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -2484,15 +2484,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, |