From b93d0f10d5a1bab088223a57420ef599b26a5e0f Mon Sep 17 00:00:00 2001 From: kosak Date: Mon, 13 Jan 2014 22:28:01 +0000 Subject: Make Google Mock build cleanly on Visual Studio 2010, 2012, 2013. --- test/gmock-more-actions_test.cc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'test/gmock-more-actions_test.cc') diff --git a/test/gmock-more-actions_test.cc b/test/gmock-more-actions_test.cc index 9dde5ebb..eb516d22 100644 --- a/test/gmock-more-actions_test.cc +++ b/test/gmock-more-actions_test.cc @@ -668,17 +668,17 @@ TEST(SetArrayArgumentTest, SetsTheNthArrayWithEmptyRange) { // Tests SetArrayArgument(first, last) where *first is convertible // (but not equal) to the argument type. TEST(SetArrayArgumentTest, SetsTheNthArrayWithConvertibleType) { - typedef void MyFunction(bool, char*); - int codes[] = { 97, 98, 99 }; - Action a = SetArrayArgument<1>(codes, codes + 3); - - char ch[4] = {}; - char* pch = ch; - a.Perform(make_tuple(true, pch)); - EXPECT_EQ('a', ch[0]); - EXPECT_EQ('b', ch[1]); - EXPECT_EQ('c', ch[2]); - EXPECT_EQ('\0', ch[3]); + typedef void MyFunction(bool, int*); + char chars[] = { 97, 98, 99 }; + Action a = SetArrayArgument<1>(chars, chars + 3); + + int codes[4] = { 111, 222, 333, 444 }; + int* pcodes = codes; + a.Perform(make_tuple(true, pcodes)); + EXPECT_EQ(97, codes[0]); + EXPECT_EQ(98, codes[1]); + EXPECT_EQ(99, codes[2]); + EXPECT_EQ(444, codes[3]); } // Test SetArrayArgument(first, last) with iterator as argument. -- cgit v1.2.3