diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-03-05 08:04:01 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-03-05 08:04:01 +0000 |
| commit | ed1042b09b7d6f7857ff3a4ad33acef08a016960 (patch) | |
| tree | 38e1e22186034693ba63f609100fcd1d4cd6e368 /include/gtest/gtest.h | |
| parent | 66d8d6b9c4e8af839780a7241e596eaee5ae1956 (diff) | |
| download | gtest-ed1042b09b7d6f7857ff3a4ad33acef08a016960.tar.gz gtest-ed1042b09b7d6f7857ff3a4ad33acef08a016960.tar.bz2 gtest-ed1042b09b7d6f7857ff3a4ad33acef08a016960.tar.xz | |
Fixes compatibility with Borland C++Builder. Original patch by Josh
Kelley. Simplified by Zhanyong Wan.
git-svn-id: http://googletest.googlecode.com/svn/trunk@553 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'include/gtest/gtest.h')
| -rw-r--r-- | include/gtest/gtest.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/gtest/gtest.h b/include/gtest/gtest.h index 03ade85..cd01c7b 100644 --- a/include/gtest/gtest.h +++ b/include/gtest/gtest.h @@ -1296,7 +1296,9 @@ namespace internal { template <typename T1, typename T2> String FormatForComparisonFailureMessage(const T1& value, const T2& /* other_operand */) { - return PrintToString(value); + // C++Builder compiles this incorrectly if the namespace isn't explicitly + // given. + return ::testing::PrintToString(value); } // The helper function for {ASSERT|EXPECT}_EQ. |