diff options
| author | Tanzinul Islam <tanzislam@users.noreply.github.com> | 2017-11-19 20:17:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-19 20:17:46 +0000 |
| commit | 4ba3803f936a2f432e60841bc9358ea2f3a951eb (patch) | |
| tree | 778e7ffd3bfda62cd3be3e01a2d0207d5ffe1d82 /googlemock/test/gmock-matchers_test.cc | |
| parent | 78b1ff074799c776f90a77203fcd7adc98e11736 (diff) | |
| parent | d175c8bf823e709d570772b038757fadf63bc632 (diff) | |
| download | googletest-4ba3803f936a2f432e60841bc9358ea2f3a951eb.tar.gz googletest-4ba3803f936a2f432e60841bc9358ea2f3a951eb.tar.bz2 googletest-4ba3803f936a2f432e60841bc9358ea2f3a951eb.zip | |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
Diffstat (limited to 'googlemock/test/gmock-matchers_test.cc')
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index fc867487..4beaec4c 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -58,6 +58,11 @@ # include <forward_list> // NOLINT #endif +// Disable MSVC2015 warning for std::pair: "decorated name length exceeded, name was truncated". +#if defined(_MSC_VER) && (_MSC_VER == 1900) +# pragma warning(disable:4503) +#endif + namespace testing { namespace internal { @@ -3931,8 +3936,11 @@ TEST(ResultOfTest, WorksForFunctionReferences) { // Tests that ResultOf(f, ...) compiles and works as expected when f is a // function object. -struct Functor : public ::std::unary_function<int, std::string> { - result_type operator()(argument_type input) const { +struct Functor { + typedef std::string result_type; + typedef int argument_type; + + std::string operator()(int input) const { return IntToStringFunction(input); } }; |