From 88cd66513c6414cdc6f1d4f7733bd520337864a9 Mon Sep 17 00:00:00 2001 From: Gennadiy Civil Date: Fri, 17 Aug 2018 13:25:52 -0400 Subject: [PATCH] Minor formatting/style changes --- googletest/src/gtest.cc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 7832aa31..a229549f 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -138,11 +138,10 @@ # define vsnprintf _vsnprintf #endif // GTEST_OS_WINDOWS - #if GTEST_OS_MAC -# ifndef GTEST_OS_IOS -# include -# endif +#ifndef GTEST_OS_IOS +#include +#endif #endif #if GTEST_HAS_ABSL @@ -5832,16 +5831,16 @@ void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) { // other parts of Google Test. void ParseGoogleTestFlagsOnly(int* argc, char** argv) { ParseGoogleTestFlagsOnlyImpl(argc, argv); - - // Fix the value of *_NSGetArgc() on macOS, but iff + + // Fix the value of *_NSGetArgc() on macOS, but iff // *_NSGetArgv() == argv // Only applicable to char** version of argv #if GTEST_OS_MAC -# ifndef GTEST_OS_IOS +#ifndef GTEST_OS_IOS if (*_NSGetArgv() == argv) { *_NSGetArgc() = *argc; } -# endif +#endif #endif } void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv) {