Indents preprocessor directives.
diff --git a/include/gmock/gmock-actions.h b/include/gmock/gmock-actions.h
index af3483f..cfd5850 100644
--- a/include/gmock/gmock-actions.h
+++ b/include/gmock/gmock-actions.h
@@ -40,7 +40,7 @@
#include <string>
#ifndef _WIN32_WCE
-#include <errno.h>
+# include <errno.h>
#endif
#include "gmock/internal/gmock-internal-utils.h"
diff --git a/include/gmock/gmock-generated-actions.h b/include/gmock/gmock-generated-actions.h
index 6ab014d..635bb59 100644
--- a/include/gmock/gmock-generated-actions.h
+++ b/include/gmock/gmock-generated-actions.h
@@ -2228,8 +2228,8 @@
// is expanded and macro expansion cannot contain #pragma. Therefore
// we suppress them here.
#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4100)
+# pragma warning(push)
+# pragma warning(disable:4100)
#endif
// Various overloads for InvokeArgument<N>().
@@ -2411,7 +2411,7 @@
}
#ifdef _MSC_VER
-#pragma warning(pop)
+# pragma warning(pop)
#endif
} // namespace testing
diff --git a/include/gmock/gmock-generated-actions.h.pump b/include/gmock/gmock-generated-actions.h.pump
index 4d7c5ce..001fd7d 100644
--- a/include/gmock/gmock-generated-actions.h.pump
+++ b/include/gmock/gmock-generated-actions.h.pump
@@ -751,8 +751,8 @@
// is expanded and macro expansion cannot contain #pragma. Therefore
// we suppress them here.
#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4100)
+# pragma warning(push)
+# pragma warning(disable:4100)
#endif
// Various overloads for InvokeArgument<N>().
@@ -817,7 +817,7 @@
]]
#ifdef _MSC_VER
-#pragma warning(pop)
+# pragma warning(pop)
#endif
} // namespace testing
diff --git a/include/gmock/gmock-matchers.h b/include/gmock/gmock-matchers.h
index 86c3db7..dfb7259 100644
--- a/include/gmock/gmock-matchers.h
+++ b/include/gmock/gmock-matchers.h
@@ -1394,12 +1394,12 @@
MatchResultListener* /* listener */) const {
#if GTEST_OS_WINDOWS
// MSVC warns about converting a value into bool (warning 4800).
-#pragma warning(push) // Saves the current warning state.
-#pragma warning(disable:4800) // Temporarily disables warning 4800.
+# pragma warning(push) // Saves the current warning state.
+# pragma warning(disable:4800) // Temporarily disables warning 4800.
#endif // GTEST_OS_WINDOWS
return predicate_(x);
#if GTEST_OS_WINDOWS
-#pragma warning(pop) // Restores the warning state.
+# pragma warning(pop) // Restores the warning state.
#endif // GTEST_OS_WINDOWS
}
diff --git a/include/gmock/gmock-more-actions.h b/include/gmock/gmock-more-actions.h
index a547a64..fc5e5ca 100644
--- a/include/gmock/gmock-more-actions.h
+++ b/include/gmock/gmock-more-actions.h
@@ -136,8 +136,8 @@
// is expanded and macro expansion cannot contain #pragma. Therefore
// we suppress them here.
#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4100)
+# pragma warning(push)
+# pragma warning(disable:4100)
#endif
// Action ReturnArg<k>() returns the k-th argument of the mock function.
@@ -188,12 +188,12 @@
// Microsoft compiler deprecates ::std::copy, so we want to suppress warning
// 4996 (Function call with parameters that may be unsafe) there.
#ifdef _MSC_VER
-#pragma warning(push) // Saves the current warning state.
-#pragma warning(disable:4996) // Temporarily disables warning 4996.
+# pragma warning(push) // Saves the current warning state.
+# pragma warning(disable:4996) // Temporarily disables warning 4996.
#endif
::std::copy(first, last, ::std::tr1::get<k>(args));
#ifdef _MSC_VER
-#pragma warning(pop) // Restores the warning state.
+# pragma warning(pop) // Restores the warning state.
#endif
}
@@ -213,19 +213,19 @@
#if GTEST_HAS_EXCEPTIONS
// Suppresses the 'unreachable code' warning that VC generates in opt modes.
-#ifdef _MSC_VER
-#pragma warning(push) // Saves the current warning state.
-#pragma warning(disable:4702) // Temporarily disables warning 4702.
-#endif
+# ifdef _MSC_VER
+# pragma warning(push) // Saves the current warning state.
+# pragma warning(disable:4702) // Temporarily disables warning 4702.
+# endif
ACTION_P(Throw, exception) { throw exception; }
-#ifdef _MSC_VER
-#pragma warning(pop) // Restores the warning state.
-#endif
+# ifdef _MSC_VER
+# pragma warning(pop) // Restores the warning state.
+# endif
#endif // GTEST_HAS_EXCEPTIONS
#ifdef _MSC_VER
-#pragma warning(pop)
+# pragma warning(pop)
#endif
} // namespace testing
diff --git a/include/gmock/gmock-spec-builders.h b/include/gmock/gmock-spec-builders.h
index 9e18508..6ae807a 100644
--- a/include/gmock/gmock-spec-builders.h
+++ b/include/gmock/gmock-spec-builders.h
@@ -1279,8 +1279,8 @@
// the constructor only.
#ifdef _MSC_VER
-#pragma warning(push) // Saves the current warning state.
-#pragma warning(disable:4355) // Temporarily disables warning 4355.
+# pragma warning(push) // Saves the current warning state.
+# pragma warning(disable:4355) // Temporarily disables warning 4355.
#endif // _MSV_VER
// C++ treats the void type specially. For example, you cannot define
@@ -1686,7 +1686,7 @@
}; // class FunctionMockerBase
#ifdef _MSC_VER
-#pragma warning(pop) // Restores the warning state.
+# pragma warning(pop) // Restores the warning state.
#endif // _MSV_VER
// Implements methods of FunctionMockerBase.
diff --git a/include/gmock/internal/gmock-internal-utils.h b/include/gmock/internal/gmock-internal-utils.h
index 7aaf6de..48fadba 100644
--- a/include/gmock/internal/gmock-internal-utils.h
+++ b/include/gmock/internal/gmock-internal-utils.h
@@ -101,7 +101,7 @@
(defined(_MSC_VER) && !defined(_NATIVE_WCHAR_T_DEFINED))
// wchar_t is a typedef.
#else
-#define GMOCK_WCHAR_T_IS_NATIVE_ 1
+# define GMOCK_WCHAR_T_IS_NATIVE_ 1
#endif
// signed wchar_t and unsigned wchar_t are NOT in the C++ standard.
@@ -114,7 +114,8 @@
// To gcc,
// wchar_t == signed wchar_t != unsigned wchar_t == unsigned int
#ifdef __GNUC__
-#define GMOCK_HAS_SIGNED_WCHAR_T_ 1 // signed/unsigned wchar_t are valid types.
+// signed/unsigned wchar_t are valid types.
+# define GMOCK_HAS_SIGNED_WCHAR_T_ 1
#endif
// In what follows, we use the term "kind" to indicate whether a type
diff --git a/include/gmock/internal/gmock-port.h b/include/gmock/internal/gmock-port.h
index bb3f583..3b9cc47 100644
--- a/include/gmock/internal/gmock-port.h
+++ b/include/gmock/internal/gmock-port.h
@@ -53,7 +53,7 @@
// For MS Visual C++, check the compiler version. At least VS 2003 is
// required to compile Google Mock.
#if defined(_MSC_VER) && _MSC_VER < 1310
-#error "At least Visual C++ 2003 (7.1) is required to compile Google Mock."
+# error "At least Visual C++ 2003 (7.1) is required to compile Google Mock."
#endif
// Macro for referencing flags. This is public as we want the user to
diff --git a/src/gmock-spec-builders.cc b/src/gmock-spec-builders.cc
index a99caef..aa33cc4 100644
--- a/src/gmock-spec-builders.cc
+++ b/src/gmock-spec-builders.cc
@@ -45,7 +45,7 @@
#include "gtest/gtest.h"
#if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC
-#include <unistd.h> // NOLINT
+# include <unistd.h> // NOLINT
#endif
namespace testing {
diff --git a/src/gmock_main.cc b/src/gmock_main.cc
index 3725ae7..9d8aea2 100644
--- a/src/gmock_main.cc
+++ b/src/gmock_main.cc
@@ -39,7 +39,7 @@
// Windows. See the following link to track the current status of this bug:
// http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=394464 // NOLINT
#if GTEST_OS_WINDOWS_MOBILE
-#include <tchar.h> // NOLINT
+# include <tchar.h> // NOLINT
int _tmain(int argc, TCHAR** argv) {
#else
diff --git a/test/gmock-generated-actions_test.cc b/test/gmock-generated-actions_test.cc
index 982be1b..436f1a2 100644
--- a/test/gmock-generated-actions_test.cc
+++ b/test/gmock-generated-actions_test.cc
@@ -593,8 +593,8 @@
// is expanded and macro expansion cannot contain #pragma. Therefore
// we suppress them here.
#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4100)
+# pragma warning(push)
+# pragma warning(disable:4100)
#endif
// Tests the ACTION*() macro family.
@@ -1205,7 +1205,7 @@
}
#ifdef _MSC_VER
-#pragma warning(pop)
+# pragma warning(pop)
#endif
} // namespace gmock_generated_actions_test
diff --git a/test/gmock-generated-function-mockers_test.cc b/test/gmock-generated-function-mockers_test.cc
index d000386..0d90ded 100644
--- a/test/gmock-generated-function-mockers_test.cc
+++ b/test/gmock-generated-function-mockers_test.cc
@@ -44,14 +44,14 @@
// MSDN says the header file to be included for STDMETHOD is BaseTyps.h but
// we are getting compiler errors if we use basetyps.h, hence including
// objbase.h for definition of STDMETHOD.
-#include <objbase.h>
+# include <objbase.h>
#endif // GTEST_OS_WINDOWS
// There is a bug in MSVC (fixed in VS 2008) that prevents creating a
// mock for a function with const arguments, so we don't test such
// cases for MSVC versions older than 2008.
#if !GTEST_OS_WINDOWS || (_MSC_VER >= 1500)
-#define GMOCK_ALLOWS_CONST_PARAM_FUNCTIONS
+# define GMOCK_ALLOWS_CONST_PARAM_FUNCTIONS
#endif // !GTEST_OS_WINDOWS || (_MSC_VER >= 1500)
namespace testing {
diff --git a/test/gmock-generated-matchers_test.cc b/test/gmock-generated-matchers_test.cc
index 2a7f498..5e18471 100644
--- a/test/gmock-generated-matchers_test.cc
+++ b/test/gmock-generated-matchers_test.cc
@@ -144,8 +144,8 @@
// is expanded and macro expansion cannot contain #pragma. Therefore
// we suppress them here.
#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4100)
+# pragma warning(push)
+# pragma warning(disable:4100)
#endif
MATCHER(SumIsZero, "") {
@@ -1092,7 +1092,7 @@
}
#ifdef _MSC_VER
-#pragma warning(pop)
+# pragma warning(pop)
#endif
} // namespace
diff --git a/test/gmock-internal-utils_test.cc b/test/gmock-internal-utils_test.cc
index 5b0e804..ae743c1 100644
--- a/test/gmock-internal-utils_test.cc
+++ b/test/gmock-internal-utils_test.cc
@@ -45,7 +45,7 @@
#include "gtest/gtest-spi.h"
#if GTEST_OS_CYGWIN
-#include <sys/types.h> // For ssize_t. NOLINT
+# include <sys/types.h> // For ssize_t. NOLINT
#endif
class ProtocolMessage;
@@ -416,18 +416,21 @@
CaptureStdout();
Log(WARNING, "Test log.\n", 100);
const String log = GetCapturedStdout();
-#if defined(NDEBUG) && GTEST_GOOGLE3_MODE_
+
+# if defined(NDEBUG) && GTEST_GOOGLE3_MODE_
+
// In opt mode, no stack frame should be skipped.
EXPECT_THAT(log, ContainsRegex("\nGMOCK WARNING:\n"
"Test log\\.\n"
"Stack trace:\n"
".+"));
-#else
+# else
+
// In dbg mode, the stack frames should be skipped.
EXPECT_STREQ("\nGMOCK WARNING:\n"
"Test log.\n"
"Stack trace:\n", log.c_str());
-#endif
+# endif
}
// Tests that all logs are printed when the value of the
diff --git a/test/gmock-spec-builders_test.cc b/test/gmock-spec-builders_test.cc
index aea5228..29d47d1 100644
--- a/test/gmock-spec-builders_test.cc
+++ b/test/gmock-spec-builders_test.cc
@@ -1717,14 +1717,14 @@
// Suppresses warning on unreferenced formal parameter in MSVC with
// -W4.
#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4100)
+# pragma warning(push)
+# pragma warning(disable:4100)
#endif
ACTION_P(Delete, ptr) { delete ptr; }
#ifdef _MSC_VER
-#pragma warning(pop)
+# pragma warning(pop)
#endif
TEST(DeletingMockEarlyTest, CanDeleteSelfInActionReturningVoid) {
@@ -1890,7 +1890,9 @@
const String output = GetCapturedStdout();
EXPECT_PRED_FORMAT2(IsSubstring, "GMOCK WARNING", output);
EXPECT_PRED_FORMAT2(IsSubstring, "Stack trace:", output);
-#ifndef NDEBUG
+
+# ifndef NDEBUG
+
// We check the stack trace content in dbg-mode only, as opt-mode
// may inline the call we are interested in seeing.
@@ -1904,7 +1906,8 @@
c.NonVoidMethod();
const String output2 = GetCapturedStdout();
EXPECT_PRED_FORMAT2(IsSubstring, "NonVoidMethod(", output2);
-#endif // NDEBUG
+
+# endif // NDEBUG
}
// Tests that an uninteresting mock function call causes the function
@@ -1949,14 +1952,14 @@
const string& function_name) {
if (should_print) {
EXPECT_THAT(output.c_str(), HasSubstr(expected_substring));
-#ifndef NDEBUG
+# ifndef NDEBUG
// We check the stack trace content in dbg-mode only, as opt-mode
// may inline the call we are interested in seeing.
EXPECT_THAT(output.c_str(), HasSubstr(function_name));
-#else
+# else
// Suppresses 'unused function parameter' warnings.
static_cast<void>(function_name);
-#endif // NDEBUG
+# endif // NDEBUG
} else {
EXPECT_STREQ("", output.c_str());
}
diff --git a/test/gmock_link_test.h b/test/gmock_link_test.h
index 499cc18..ab5af4b 100644
--- a/test/gmock_link_test.h
+++ b/test/gmock_link_test.h
@@ -117,7 +117,7 @@
#include "gmock/gmock.h"
#if !GTEST_OS_WINDOWS_MOBILE
-#include <errno.h>
+# include <errno.h>
#endif
#include "gmock/internal/gmock-port.h"
@@ -419,8 +419,8 @@
// is expanded and macro expansion cannot contain #pragma. Therefore
// we suppress them here.
#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4100)
+# pragma warning(push)
+# pragma warning(disable:4100)
#endif
// Tests the linkage of actions created using ACTION macro.
@@ -455,7 +455,7 @@
}
#ifdef _MSC_VER
-#pragma warning(pop)
+# pragma warning(pop)
#endif
TEST(LinkTest, TestActionP2Macro) {