summaryrefslogtreecommitdiffstats
path: root/include/gtest/internal
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2010-07-26 21:59:50 (GMT)
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2010-07-26 21:59:50 (GMT)
commit7c598c4f1a44fdda5f97587484c85bef9e93fa98 (patch)
treea393db9c0cebf32d9a62a2a95e8ade4f5750c62c /include/gtest/internal
parent598fe2288e8e102d6e6748d496a8dcd59fa5f8a8 (diff)
downloadgoogletest-7c598c4f1a44fdda5f97587484c85bef9e93fa98.zip
googletest-7c598c4f1a44fdda5f97587484c85bef9e93fa98.tar.gz
googletest-7c598c4f1a44fdda5f97587484c85bef9e93fa98.tar.bz2
Adds ADD_FAILURE_AT (by Zhanyong Wan); disables -Wswitch-default (by Vlad Losev).
Diffstat (limited to 'include/gtest/internal')
-rw-r--r--include/gtest/internal/gtest-internal.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/gtest/internal/gtest-internal.h b/include/gtest/internal/gtest-internal.h
index 4a20c53..1e453df 100644
--- a/include/gtest/internal/gtest-internal.h
+++ b/include/gtest/internal/gtest-internal.h
@@ -1064,10 +1064,13 @@ class NativeArray {
} // namespace internal
} // namespace testing
-#define GTEST_MESSAGE_(message, result_type) \
- ::testing::internal::AssertHelper(result_type, __FILE__, __LINE__, message) \
+#define GTEST_MESSAGE_AT_(file, line, message, result_type) \
+ ::testing::internal::AssertHelper(result_type, file, line, message) \
= ::testing::Message()
+#define GTEST_MESSAGE_(message, result_type) \
+ GTEST_MESSAGE_AT_(__FILE__, __LINE__, message, result_type)
+
#define GTEST_FATAL_FAILURE_(message) \
return GTEST_MESSAGE_(message, ::testing::TestPartResult::kFatalFailure)