From 616180e6847dd3cc6517a59ff2d24e9fd5c8052c Mon Sep 17 00:00:00 2001
From: "zhanyong.wan" <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>
Date: Tue, 18 Jun 2013 18:49:51 +0000
Subject: New floating-point matchers: DoubleNear() and friends; AllOf() and
 AnyOf() can accept any number of arguments now in C++11 mode.

---
 test/gmock-generated-actions_test.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/gmock-generated-actions_test.cc')

diff --git a/test/gmock-generated-actions_test.cc b/test/gmock-generated-actions_test.cc
index 23f8c8b0..31812716 100644
--- a/test/gmock-generated-actions_test.cc
+++ b/test/gmock-generated-actions_test.cc
@@ -376,7 +376,7 @@ class SubstractAction : public ActionInterface<int(int, int)> {  // NOLINT
 TEST(WithArgsTest, NonInvokeAction) {
   Action<int(const string&, int, int)> a =  // NOLINT
       WithArgs<2, 1>(MakeAction(new SubstractAction));
-  EXPECT_EQ(8, a.Perform(make_tuple(CharPtr("hi"), 2, 10)));
+  EXPECT_EQ(8, a.Perform(make_tuple(string("hi"), 2, 10)));
 }
 
 // Tests using WithArgs to pass all original arguments in the original order.
-- 
cgit v1.2.3