diff options
| author | kosak <kosak@google.com> | 2014-04-02 20:30:00 +0000 |
|---|---|---|
| committer | kosak <kosak@google.com> | 2014-04-02 20:30:00 +0000 |
| commit | bd0188320de5aab1b09718e2c466387099d43cfb (patch) | |
| tree | b89ba1d8bbac289a5e83c5a4fd71e5b8b1b53bd4 /test/gmock-matchers_test.cc | |
| parent | 15d61e42bdd4182e7c4b50bcb3314b006ce578c7 (diff) | |
| download | googletest-bd0188320de5aab1b09718e2c466387099d43cfb.tar.gz googletest-bd0188320de5aab1b09718e2c466387099d43cfb.tar.bz2 googletest-bd0188320de5aab1b09718e2c466387099d43cfb.zip | |
Export tuple and friends in the ::testing namespace.
Diffstat (limited to 'test/gmock-matchers_test.cc')
| -rw-r--r-- | test/gmock-matchers_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/gmock-matchers_test.cc b/test/gmock-matchers_test.cc index 68a027bf..0f6bcb29 100644 --- a/test/gmock-matchers_test.cc +++ b/test/gmock-matchers_test.cc @@ -81,9 +81,9 @@ using std::ostream; using std::pair; using std::set; using std::stringstream; -using std::tr1::get; -using std::tr1::make_tuple; -using std::tr1::tuple; +using testing::get; +using testing::make_tuple; +using testing::tuple; using std::vector; using testing::A; using testing::AllArgs; @@ -1896,7 +1896,7 @@ TEST(GlobalWideEndsWithTest, CanDescribeSelf) { #endif // GTEST_HAS_GLOBAL_WSTRING -typedef ::std::tr1::tuple<long, int> Tuple2; // NOLINT +typedef ::testing::tuple<long, int> Tuple2; // NOLINT // Tests that Eq() matches a 2-tuple where the first field == the // second field. |