gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

yet more

Browse Source
This commit is contained in:
Gennadiy Civil 2018-04-09 16:04:48 -04:00
parent 05b5a53898
commit f5871009e6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump
View File

@ -1,5 +1,5 @@
$$ -*- 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

6
googletest/include/gtest/gtest.h
View File

@ -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