From bd0188320de5aab1b09718e2c466387099d43cfb Mon Sep 17 00:00:00 2001 From: kosak Date: Wed, 2 Apr 2014 20:30:00 +0000 Subject: Export tuple and friends in the ::testing namespace. --- test/gmock-actions_test.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test/gmock-actions_test.cc') diff --git a/test/gmock-actions_test.cc b/test/gmock-actions_test.cc index 115a9020..275dbbf5 100644 --- a/test/gmock-actions_test.cc +++ b/test/gmock-actions_test.cc @@ -45,10 +45,10 @@ namespace { -using ::std::tr1::get; -using ::std::tr1::make_tuple; -using ::std::tr1::tuple; -using ::std::tr1::tuple_element; +using testing::get; +using testing::make_tuple; +using testing::tuple; +using testing::tuple_element; using testing::internal::BuiltInDefaultValue; using testing::internal::Int64; using testing::internal::UInt64; -- cgit v1.2.3