From 99788d751da80001db223de2cd6178046ff5bad0 Mon Sep 17 00:00:00 2001 From: "zhanyong.wan" Date: Thu, 28 Feb 2013 23:29:06 +0000 Subject: Implements RUN_ALL_TESTS() as a function. git-svn-id: http://googletest.googlecode.com/svn/trunk@641 861a406c-534a-0410-8894-cb66d6ee9925 --- include/gtest/gtest.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/include/gtest/gtest.h b/include/gtest/gtest.h index e53cd9f..e06082c 100644 --- a/include/gtest/gtest.h +++ b/include/gtest/gtest.h @@ -2227,15 +2227,20 @@ bool StaticAssertTypeEq() { GTEST_TEST_(test_fixture, test_name, test_fixture, \ ::testing::internal::GetTypeId()) -// Use this macro in main() to run all tests. It returns 0 if all +} // namespace testing + +// Use this function in main() to run all tests. It returns 0 if all // tests are successful, or 1 otherwise. // // RUN_ALL_TESTS() should be invoked after the command line has been // parsed by InitGoogleTest(). +// +// This function was formerly a macro; thus, it is in the global +// namespace and has an all-caps name. +int RUN_ALL_TESTS() GTEST_MUST_USE_RESULT_; -#define RUN_ALL_TESTS()\ - (::testing::UnitTest::GetInstance()->Run()) - -} // namespace testing +inline int RUN_ALL_TESTS() { + return ::testing::UnitTest::GetInstance()->Run(); +} #endif // GTEST_INCLUDE_GTEST_GTEST_H_ -- cgit v1.2.3