Skip to content

GitLab

Commit 881ee307 authored by Gennadiy Civil's avatar Gennadiy Civil
Browse files 

typo
parent 10e8ec27
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
googlemock/test/gmock-matchers_test.cc
View file @ 881ee307
...@@ -33,6 +33,13 @@ ...@@ -33,6 +33,13 @@
// //
// This file tests some commonly used argument matchers. // This file tests some commonly used argument matchers.
// Disable MSVC2015 warning for std::pair:
// "decorated name length exceeded, name was truncated".
#if defined _MSC_VER
# pragma warning(push)
# pragma warning(disable:4503)
#endif
#include "gmock/gmock-matchers.h" #include "gmock/gmock-matchers.h"
#include "gmock/gmock-more-matchers.h" #include "gmock/gmock-more-matchers.h"
...@@ -59,13 +66,6 @@ ...@@ -59,13 +66,6 @@
# include <forward_list> // NOLINT # include <forward_list> // NOLINT
#endif #endif
// Disable MSVC2015 warning for std::pair:
// "decorated name length exceeded, name was truncated".
#if defined _MSC_VER
# pragma warning(push)
# pragma warning(disable:4503)
#endif
#if GTEST_LANG_CXX11 #if GTEST_LANG_CXX11
# include <type_traits> # include <type_traits>
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment