diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-11-07 10:32:23 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-07 10:32:23 -0800 |
| commit | 49eb76df471857fe1bd573b0636b1f9dd4fc8e4f (patch) | |
| tree | 156d379675f771d096d84a2ced2972b46ed83a4a /googlemock/test/gmock-matchers_test.cc | |
| parent | ceee80c383d6f34af1a4e0fbb464f3f144cded68 (diff) | |
| parent | d175c8bf823e709d570772b038757fadf63bc632 (diff) | |
| download | googletest-49eb76df471857fe1bd573b0636b1f9dd4fc8e4f.tar.gz googletest-49eb76df471857fe1bd573b0636b1f9dd4fc8e4f.tar.bz2 googletest-49eb76df471857fe1bd573b0636b1f9dd4fc8e4f.zip | |
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
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); } }; |