diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-12-18 11:38:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-18 11:38:08 -0500 |
| commit | a7bd3725f08fe38374544bbf8f03699fc0d32a0b (patch) | |
| tree | 09510ad34eef68866ade872c73640ccef268cc48 /googlemock/test/gmock-matchers_test.cc | |
| parent | 79cdf971fbf8f1efb1573df97bcc6f5e8ef3215a (diff) | |
| parent | 1865ecaf1779c2a2f210ca3768aa030206ef74ba (diff) | |
| download | googletest-a7bd3725f08fe38374544bbf8f03699fc0d32a0b.tar.gz googletest-a7bd3725f08fe38374544bbf8f03699fc0d32a0b.tar.bz2 googletest-a7bd3725f08fe38374544bbf8f03699fc0d32a0b.zip | |
Merge branch 'master' into bazel
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); } }; |