Skip to content

GitLab

Commit 6525044c authored by Gennadiy Civil's avatar Gennadiy Civil
Browse files 

And also silence for MSVS14
parent 35a709a7
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
googlemock/src/gmock-spec-builders.cc
View file @ 6525044c
...@@ -50,9 +50,9 @@ ...@@ -50,9 +50,9 @@
#endif #endif
// Silence C4800 (C4800: 'int *const ': forcing value // Silence C4800 (C4800: 'int *const ': forcing value
// to bool 'true' or 'false') for MSVC 14 // to bool 'true' or 'false') for MSVC 14,15
#ifdef _MSC_VER #ifdef _MSC_VER
#if _MSC_VER == 1900 #if _MSC_VER <= 1900
# pragma warning(push) # pragma warning(push)
# pragma warning(disable:4800) # pragma warning(disable:4800)
#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