Cleanup: Use ::testing::{tuple,get,make_tuple} when dealing with tuples in the context of GTest and GMock.
git-svn-id: http://google-cache-invalidation-api.googlecode.com/svn/trunk/src@333 1cc9d426-c294-39be-ba72-c0199ca0f247
diff --git a/google/cacheinvalidation/impl/invalidation-client-impl_test.cc b/google/cacheinvalidation/impl/invalidation-client-impl_test.cc
index ab72ef2..b027b8d 100644
--- a/google/cacheinvalidation/impl/invalidation-client-impl_test.cc
+++ b/google/cacheinvalidation/impl/invalidation-client-impl_test.cc
@@ -64,7 +64,7 @@
SaveArgToVector,
HAS_1_TEMPLATE_PARAMS(int, k),
AND_1_VALUE_PARAMS(vec)) {
- vec->push_back(std::tr1::get<k>(args));
+ vec->push_back(::testing::get<k>(args));
}
// Given the ReadCallback of Storage::ReadKey as argument 1, invokes it with a
diff --git a/google/cacheinvalidation/test/test-utils.cc b/google/cacheinvalidation/test/test-utils.cc
index 9394ffc..a042a97 100644
--- a/google/cacheinvalidation/test/test-utils.cc
+++ b/google/cacheinvalidation/test/test-utils.cc
@@ -35,7 +35,7 @@
InvokeNetworkStatusCallback,
HAS_1_TEMPLATE_PARAMS(int, k),
AND_0_VALUE_PARAMS()) {
- std::tr1::get<k>(args)->Run(true);
+ ::testing::get<k>(args)->Run(true);
}
const char* UnitTestBase::kClientToken = "Dummy";
diff --git a/google/cacheinvalidation/test/test-utils.h b/google/cacheinvalidation/test/test-utils.h
index 4c55803..230be37 100644
--- a/google/cacheinvalidation/test/test-utils.h
+++ b/google/cacheinvalidation/test/test-utils.h
@@ -311,8 +311,8 @@
InvokeAndDeleteClosure,
HAS_1_TEMPLATE_PARAMS(int, k),
AND_0_VALUE_PARAMS()) {
- std::tr1::get<k>(args)->Run();
- delete std::tr1::get<k>(args);
+ ::testing::get<k>(args)->Run();
+ delete ::testing::get<k>(args);
}
} // namespace invalidation
