Skip to content

GitLab

Commit f5871009 authored by Gennadiy Civil's avatar Gennadiy Civil
Browse files 

yet more
parent 05b5a538
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump
View file @ f5871009
$$ -*- mode: c++; -*- $$ -*- mode: c++; -*-
$$ This is a Pump source file (http://go/pump). Please use Pump to convert $$ This is a Pump source file. Please use Pump to convert
$$ it to callback-actions.h. $$ it to callback-actions.h.
$$ $$
$var max_callback_arity = 5 $var max_callback_arity = 5
......
googletest/include/gtest/gtest.h
View file @ f5871009
...@@ -83,12 +83,12 @@ ...@@ -83,12 +83,12 @@
namespace testing { namespace testing {
// Silence C4100 (unreferenced formal parameter) and 4805 // Silence C4100 (unreferenced formal parameter) and 4805
// unsafe mix of bool and type int for MSVC 14 and 15 // unsafe mix of type 'const int' and type 'const bool'
#ifdef _MSC_VER #ifdef _MSC_VER
# pragma warning(push)
# pragma warning(disable:4805)
# if _MSC_VER <= 1900 # if _MSC_VER <= 1900
# pragma warning(push)
# pragma warning(disable:4100) # pragma warning(disable:4100)
# pragma warning(disable:4805)
# endif # endif
#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