From: Victor Berger <victor.berger@m4x.org>
Date: Thu, 8 Jul 2021 17:39:30 +0000 (+0200)
Subject: [PATCH 2/2] Fix build when using GTest-1.11
X-Git-Tag: archive/raspbian/1.4.0-1+rpi1~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=aa9857f2f0010518e0b0d50a96427f643159c886;p=wlcs.git

[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 d306710..6ee856f 100644
--- 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 c33316c..c5c5358 100644
--- 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