summaryrefslogtreecommitdiffstats
path: root/include/gtest
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2010-09-27 17:42:52 (GMT)
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2010-09-27 17:42:52 (GMT)
commitb5d3a17805fe0ed2ccde463412ae1fd206c4df21 (patch)
tree267c18d6dd6ee179748ea46e790f3c32c42a100e /include/gtest
parent345d9ebf30ccc2747c4e4c224b95fd8406093e29 (diff)
downloadgoogletest-b5d3a17805fe0ed2ccde463412ae1fd206c4df21.zip
googletest-b5d3a17805fe0ed2ccde463412ae1fd206c4df21.tar.gz
googletest-b5d3a17805fe0ed2ccde463412ae1fd206c4df21.tar.bz2
Allows EXPECT_FATAL_FAILURE() and friends to accept a string object as the second argument.
Diffstat (limited to 'include/gtest')
-rw-r--r--include/gtest/gtest-spi.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/gtest/gtest-spi.h b/include/gtest/gtest-spi.h
index e338e36..b226e55 100644
--- a/include/gtest/gtest-spi.h
+++ b/include/gtest/gtest-spi.h
@@ -98,12 +98,12 @@ class GTEST_API_ SingleFailureChecker {
// The constructor remembers the arguments.
SingleFailureChecker(const TestPartResultArray* results,
TestPartResult::Type type,
- const char* substr);
+ const string& substr);
~SingleFailureChecker();
private:
const TestPartResultArray* const results_;
const TestPartResult::Type type_;
- const String substr_;
+ const string substr_;
GTEST_DISALLOW_COPY_AND_ASSIGN_(SingleFailureChecker);
};