diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-09 19:50:19 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-09 19:50:19 (GMT) |
| commit | 05b5a53898c2466e49f37e84324644949d279b34 (patch) | |
| tree | c16ffae0ea09c666885b228c2cc45acb5ecab1cb /googletest | |
| parent | 2de24fbf7a26e679e8dc7d185addd3dc820f347c (diff) | |
| download | googletest-05b5a53898c2466e49f37e84324644949d279b34.zip googletest-05b5a53898c2466e49f37e84324644949d279b34.tar.gz googletest-05b5a53898c2466e49f37e84324644949d279b34.tar.bz2 | |
formatting
Diffstat (limited to 'googletest')
| -rw-r--r-- | googletest/include/gtest/gtest.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index 16183e1..c5d1b7c 100644 --- a/googletest/include/gtest/gtest.h +++ b/googletest/include/gtest/gtest.h @@ -82,7 +82,8 @@ namespace testing { -// Silence C4100 (unreferenced formal parameter) for MSVC 14 and 15 +// Silence C4100 (unreferenced formal parameter) and 4805 +// unsafe mix of bool and type int for MSVC 14 and 15 #ifdef _MSC_VER # if _MSC_VER <= 1900 # pragma warning(push) @@ -91,6 +92,7 @@ namespace testing { # endif #endif + // Declares the flags. // This flag temporary enables the disabled tests. |