Factor out ReferenceMappings from ReferenceAttribute.

2 files changed, 3 insertions, 2 deletions

diff --git a/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp b/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp
index b0169cc9fe4..de29c2fcf12 100644
--- a/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp
+++ b/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp
@@ -27,6 +27,7 @@ using namespace document;
 using search::attribute::BasicType;
 using search::attribute::Config;
 using search::attribute::CollectionType;
+using search::attribute::Reference;
 using search::attribute::ReferenceAttribute;
 
 namespace search {
@@ -162,7 +163,6 @@ void assertNoRef(AttributeVector &vec, uint32_t doc)
 }
 
 void assertRef(AttributeVector &vec, vespalib::stringref str, uint32_t doc) {
-    using Reference = ReferenceAttribute::Reference;
     const Reference *ref = asReferenceAttribute(vec).getReference(doc);
     EXPECT_TRUE(ref != nullptr);
     const GlobalId &gid = ref->gid();
diff --git a/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/gid_to_lid_change_listener_test.cpp b/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/gid_to_lid_change_listener_test.cpp
index 366060c915c..780a6d79ad6 100644
--- a/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/gid_to_lid_change_listener_test.cpp
+++ b/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/gid_to_lid_change_listener_test.cpp
@@ -17,6 +17,7 @@ using document::DocumentId;
 using vespalib::GenerationHandler;
 using search::attribute::Config;
 using search::attribute::BasicType;
+using search::attribute::Reference;
 using search::attribute::ReferenceAttribute;
 
 namespace proton {
@@ -97,7 +98,7 @@ struct Fixture
 
     void commit() { _attr->commit(); }
 
-    const ReferenceAttribute::Reference *getRef(uint32_t doc) {
+    const Reference *getRef(uint32_t doc) {
         return _attr->getReference(doc);
     }