From 5df87d70b64dd8080ab9e3f1b0250e74715e2a60 Mon Sep 17 00:00:00 2001 From: kosak Date: Wed, 2 Apr 2014 20:26:07 +0000 Subject: Export tuple and friends in the ::testing namespace. --- test/gtest-param-test_test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/gtest-param-test_test.cc b/test/gtest-param-test_test.cc index f60cb8a5..cc1dc65f 100644 --- a/test/gtest-param-test_test.cc +++ b/test/gtest-param-test_test.cc @@ -64,9 +64,9 @@ using ::testing::ValuesIn; # if GTEST_HAS_COMBINE using ::testing::Combine; -using ::std::tr1::get; -using ::std::tr1::make_tuple; -using ::std::tr1::tuple; +using ::testing::get; +using ::testing::make_tuple; +using ::testing::tuple; # endif // GTEST_HAS_COMBINE using ::testing::internal::ParamGenerator; -- cgit v1.2.3