@@ -197,6 +197,7 @@ using ::std::pair;
197
197
using ::std::set;
198
198
using ::std::vector;
199
199
using ::testing::PrintToString;
200
+ using ::testing::internal::ImplicitCast_;
200
201
using ::testing::internal::NativeArray;
201
202
using ::testing::internal::RE;
202
203
using ::testing::internal::Strings;
@@ -1002,9 +1003,12 @@ TEST(PrintTupleTest, VariousSizes) {
1002
1003
EXPECT_EQ (" (false, 2, 3, 4, true, 6, 7, true, 9)" , Print (t9));
1003
1004
1004
1005
const char * const str = " 8" ;
1006
+ // VC++ 2010's implementation of tuple of C++0x is deficient, requiring
1007
+ // an explicit type cast of NULL to be used.
1005
1008
tuple<bool , char , short , testing::internal::Int32, // NOLINT
1006
1009
testing::internal::Int64, float , double , const char *, void *, string>
1007
- t10 (false , ' a' , 3 , 4 , 5 , 1 .5F , -2.5 , str, NULL , " 10" );
1010
+ t10 (false , ' a' , 3 , 4 , 5 , 1 .5F , -2.5 , str,
1011
+ ImplicitCast_<void *>(NULL ), " 10" );
1008
1012
EXPECT_EQ (" (false, 'a' (97, 0x61), 3, 4, 5, 1.5, -2.5, " + PrintPointer (str) +
1009
1013
" pointing to \" 8\" , NULL, \" 10\" )" ,
1010
1014
Print (t10));
0 commit comments