eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor formatting/style changes

Browse Source
This commit is contained in:
Gennadiy Civil 2018-08-17 13:25:52 -04:00 committed by GitHub
parent 687964c84f
commit 88cd66513c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
googletest/src/gtest.cc
View File

@ -138,11 +138,10 @@
# define vsnprintf _vsnprintf # define vsnprintf _vsnprintf
#endif // GTEST_OS_WINDOWS #endif // GTEST_OS_WINDOWS
#if GTEST_OS_MAC #if GTEST_OS_MAC
# ifndef GTEST_OS_IOS #ifndef GTEST_OS_IOS
# include <crt_externs.h> #include <crt_externs.h>
# endif #endif
#endif #endif
#if GTEST_HAS_ABSL #if GTEST_HAS_ABSL
@ -5832,16 +5831,16 @@ void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
// other parts of Google Test. // other parts of Google Test.
void ParseGoogleTestFlagsOnly(int* argc, char** argv) { void ParseGoogleTestFlagsOnly(int* argc, char** argv) {
ParseGoogleTestFlagsOnlyImpl(argc, argv); ParseGoogleTestFlagsOnlyImpl(argc, argv);
// Fix the value of *_NSGetArgc() on macOS, but iff // Fix the value of *_NSGetArgc() on macOS, but iff
// *_NSGetArgv() == argv // *_NSGetArgv() == argv
// Only applicable to char** version of argv // Only applicable to char** version of argv
#if GTEST_OS_MAC #if GTEST_OS_MAC
# ifndef GTEST_OS_IOS #ifndef GTEST_OS_IOS
if (*_NSGetArgv() == argv) { if (*_NSGetArgv() == argv) {
*_NSGetArgc() = *argc; *_NSGetArgc() = *argc;
} }
# endif #endif
#endif #endif
} }
void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv) { void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv) {