Merge pull request #24483 from vespa-engine/toregge/avoid-multiple-definitions-of-struct-node-in-same-namespace

Avoid multiple definitions of struct Node in same namespace

1 files changed, 5 insertions, 1 deletions

diff --git a/eval/src/tests/ann/xp-annoy-nns.cpp b/eval/src/tests/ann/xp-annoy-nns.cpp
index 07b2d82d8d4..cec48ce9517 100644
--- a/eval/src/tests/ann/xp-annoy-nns.cpp
+++ b/eval/src/tests/ann/xp-annoy-nns.cpp
@@ -10,7 +10,7 @@
 
 using V = vespalib::ConstArrayRef<float>;
 class AnnoyLikeNns;
-struct Node;
+inline namespace xpannoynns { struct Node; }
 
 static size_t plane_dist_cnt = 0;
 static size_t w_cen_dist_cnt = 0;
@@ -21,6 +21,8 @@ static size_t find_cand_cnt = 0;
 using QueueNode = std::pair<double, Node *>;
 using NodeQueue = std::priority_queue<QueueNode>;
 
+namespace xpannoynns {
+
 struct Node {
     Node() {}
     virtual ~Node() {}
@@ -31,6 +33,8 @@ struct Node {
     virtual void stats(std::vector<uint32_t> &depths) = 0;
 };
 
+}
+
 struct LeafNode : public Node {
     std::vector<uint32_t> docids;