diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-04 15:46:04 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-04 15:46:04 -0400 |
| commit | d81b6a0c4cecbe087fae28bd6a3a40d1f5f45df4 (patch) | |
| tree | e4840ddf79404f5cebc4fd659707aef69c8f3b4c /googlemock | |
| parent | a608d4a36274d4bcbae3ed1216cb22f289348b57 (diff) | |
| download | googletest-d81b6a0c4cecbe087fae28bd6a3a40d1f5f45df4.tar.gz googletest-d81b6a0c4cecbe087fae28bd6a3a40d1f5f45df4.tar.bz2 googletest-d81b6a0c4cecbe087fae28bd6a3a40d1f5f45df4.zip | |
bad cut/paste
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index 41407548..3cc5d35c 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -61,7 +61,7 @@ // Disable MSVC2015 warning for std::pair: // "decorated name length exceeded, name was truncated". -#if defined(_MSC_VER) && (_MSC_VER == 1900) +# include <type_traits> +#if defined(_MSC_VER) && (_MSC_VER == 1900) # pragma warning(disable:4503) #endif |