aboutsummaryrefslogtreecommitdiffstats
path: root/test/gmock-generated-internal-utils_test.cc
diff options
context:
space:
mode:
authorkosak <kosak@google.com>2014-04-02 20:30:00 +0000
committerkosak <kosak@google.com>2014-04-02 20:30:00 +0000
commitbd0188320de5aab1b09718e2c466387099d43cfb (patch)
treeb89ba1d8bbac289a5e83c5a4fd71e5b8b1b53bd4 /test/gmock-generated-internal-utils_test.cc
parent15d61e42bdd4182e7c4b50bcb3314b006ce578c7 (diff)
downloadgoogletest-bd0188320de5aab1b09718e2c466387099d43cfb.tar.gz
googletest-bd0188320de5aab1b09718e2c466387099d43cfb.tar.bz2
googletest-bd0188320de5aab1b09718e2c466387099d43cfb.zip
Export tuple and friends in the ::testing namespace.
Diffstat (limited to 'test/gmock-generated-internal-utils_test.cc')
-rw-r--r--test/gmock-generated-internal-utils_test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/gmock-generated-internal-utils_test.cc b/test/gmock-generated-internal-utils_test.cc
index 1156c7db..e0a535a3 100644
--- a/test/gmock-generated-internal-utils_test.cc
+++ b/test/gmock-generated-internal-utils_test.cc
@@ -39,7 +39,7 @@
namespace {
-using ::std::tr1::tuple;
+using ::testing::tuple;
using ::testing::Matcher;
using ::testing::internal::CompileAssertTypesEqual;
using ::testing::internal::MatcherTuple;