[PATCH 2/2] Fix build when using GTest-1.11

Some change in GTest 1.11 headers caused a conflict on the name
`Pointer`. Removing the unconditional import of namespace `testing`
in favor of individual imports of the used items fixes it.

cc #205

Gbp-Pq: Name 0002-Fix-build-when-using-GTest-1.11.patch

diff --git a/tests/pointer_constraints.cpp b/tests/pointer_constraints.cpp
index d306710dad457b0813d5c2834f48b38f3d693f06..6ee856ff578f3469b89f378a5f77e28a62990b73 100644 (file)
--- a/tests/pointer_constraints.cpp
+++ b/tests/pointer_constraints.cpp
@@ -24,7 +24,11 @@
 
 #include <memory>
 
-using namespace testing;
+using testing::AnyNumber;
+using testing::Eq;
+using testing::Ne;
+using testing::NotNull;
+
 using namespace wlcs;
 
 namespace

diff --git a/tests/relative_pointer.cpp b/tests/relative_pointer.cpp
index c33316c3018f7cf30ef3ef949c3ac37613c120bf..c5c53587bd79649871e9881653407ef6c02efb1f 100644 (file)
--- a/tests/relative_pointer.cpp
+++ b/tests/relative_pointer.cpp
@@ -22,7 +22,11 @@
 
 #include <gmock/gmock.h>
 
-using namespace testing;
+using testing::AnyNumber;
+using testing::IsTrue;
+using testing::NotNull;
+using testing::_;
+
 using namespace wlcs;
 
 namespace