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

Merge branch 'master' into missing-declarations

Browse Source
This commit is contained in:
Gennadiy Civil
2018-01-04 22:01:38 -05:00
committed by GitHub
parent b3d9be5c1d abbc0f8174
commit 6b4967a23a
28 changed files with 215 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
googletest/include/gtest/internal/gtest-port.h
View File

@@ -879,7 +879,7 @@ using ::std::tuple_size;
#endif
// Use this annotation before a function that takes a printf format string.
#if defined(__GNUC__) && !defined(COMPILER_ICC)
#if (defined(__GNUC__) || defined(__clang__)) && !defined(COMPILER_ICC)
# if defined(__MINGW_PRINTF_FORMAT)
// MinGW has two different printf implementations. Ensure the format macro
// matches the selected implementation. See