Missing include for vector

4 files changed, 6 insertions, 7 deletions

diff --git a/memfilepersistence/src/tests/spi/memfileautorepairtest.cpp b/memfilepersistence/src/tests/spi/memfileautorepairtest.cpp
index 04d82741e67..32fc9096963 100644
--- a/memfilepersistence/src/tests/spi/memfileautorepairtest.cpp
+++ b/memfilepersistence/src/tests/spi/memfileautorepairtest.cpp
@@ -125,8 +125,7 @@ MemFileAutoRepairTest::testFileMetadataCorruptionIsAutoRepaired()
     prepareBucket(*this, *_file);
     document::DocumentId id(_slotIds[1]);
     MetaSlot slot(getSlot(1));
-    CPPUNIT_ASSERT_EQUAL(slot._gid,
-                         id.getGlobalId()); // Sanity checking...
+    CPPUNIT_ASSERT(slot._gid == id.getGlobalId()); // Sanity checking...
     {
         MetaSlot s(slot);
         s.setTimestamp(Timestamp(40));
diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_verifier.cpp b/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_verifier.cpp
index 223292ada2c..a3f22d5fafb 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_verifier.cpp
+++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_verifier.cpp
@@ -349,9 +349,9 @@ MemFileV1Verifier::verifyDataBlock(
             foundBucket = foundBucket.stripUnused();
             if (id.getGlobalId() != slots[i]->_gid) {
                 REPORT(report) << *slots[i]
-                               << " has gid " << slots[i]->_gid
+                               << " has gid " << slots[i]->_gid.toString()
                                << " but its header block contains document id "
-                               << id << " with " << id.getGlobalId();
+                               << id << " with " << id.getGlobalId().toString();
             }
             else if (bucket == foundBucket) {
                 okSlots.push_back(slots[i]);
diff --git a/memfilepersistence/src/vespa/memfilepersistence/memfile/memfile.cpp b/memfilepersistence/src/vespa/memfilepersistence/memfile/memfile.cpp
index 281ada62a89..b292d5751b7 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/memfile/memfile.cpp
+++ b/memfilepersistence/src/vespa/memfilepersistence/memfile/memfile.cpp
@@ -965,7 +965,7 @@ MemFile::printUserFriendly(const MemSlot& slot,
                            std::ostream& out,
                            const std::string& indent) const
 {
-    out << "MemSlot(" << slot.getGlobalId()
+    out << "MemSlot(" << slot.getGlobalId().toString()
         << std::setfill(' ')
         << std::dec << "\n"
         << indent << "  Header pos: "
@@ -1012,7 +1012,7 @@ MemFile::print(const MemSlot& slot,
     if (verbose) {
         out << "MemSlot(";
     }
-    out << std::dec << slot.getTimestamp() << ", " << slot.getGlobalId() << ", h "
+    out << std::dec << slot.getTimestamp() << ", " << slot.getGlobalId().toString() << ", h "
         << slot.getLocation(HEADER)._pos << " - " << slot.getLocation(HEADER)._size << ", b "
         << slot.getLocation(BODY)._pos << " - " << slot.getLocation(BODY)._size << ", f "
 
diff --git a/memfilepersistence/src/vespa/memfilepersistence/memfile/memslot.cpp b/memfilepersistence/src/vespa/memfilepersistence/memfile/memslot.cpp
index b7b88682fce..56208e8ad3f 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/memfile/memslot.cpp
+++ b/memfilepersistence/src/vespa/memfilepersistence/memfile/memslot.cpp
@@ -108,7 +108,7 @@ MemSlot::print(std::ostream& out, bool verbose,
     if (verbose) {
         out << "MemSlot(";
     }
-    out << std::dec << _timestamp << ", " << _gid << ", h "
+    out << std::dec << _timestamp << ", " << _gid.toString() << ", h "
         << _header._pos << " - " << _header._size << ", b "
         << _body._pos << " - " << _body._size << ", f "