Skip to content

GitLab

Unverified Commit 88cd6651 authored by Gennadiy Civil's avatar Gennadiy Civil Committed by GitHub
Browse files

Minor formatting/style changes

parent 687964c8
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 8 deletions
googletest/src/gtest.cc
View file @ 88cd6651
...@@ -138,11 +138,10 @@ ...@@ -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) { ...@@ -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) {
......
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