Missing include for vector

10 files changed, 15 insertions, 11 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 "
 
diff --git a/searchlib/src/vespa/searchlib/attribute/attributememoryfilewriter.h b/searchlib/src/vespa/searchlib/attribute/attributememoryfilewriter.h
index 7afd6c92606..fb83ee7f8dd 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributememoryfilewriter.h
+++ b/searchlib/src/vespa/searchlib/attribute/attributememoryfilewriter.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include "iattributefilewriter.h"
+#include <vector>
 
 namespace search
 {
diff --git a/storage/src/vespa/storage/persistence/processallhandler.cpp b/storage/src/vespa/storage/persistence/processallhandler.cpp
index 5af2cef7b6e..c4ed6031d64 100644
--- a/storage/src/vespa/storage/persistence/processallhandler.cpp
+++ b/storage/src/vespa/storage/persistence/processallhandler.cpp
@@ -59,11 +59,11 @@ public:
         ost << "  Timestamp: " << e.getTimestamp() << ", ";
         if (e.getDocument() != 0) {
             ost << "Doc(" << e.getDocument()->getId() << ")"
-                << ", " << e.getDocument()->getId().getGlobalId()
+                << ", " << e.getDocument()->getId().getGlobalId().toString()
                 << ", size: " << e.getPersistedDocumentSize();
         } else if (e.getDocumentId() != 0) {
             ost << *e.getDocumentId()
-                << ", " << e.getDocumentId()->getGlobalId();
+                << ", " << e.getDocumentId()->getGlobalId().toString();
         } else {
             ost << "metadata only";
         }
diff --git a/storageapi/src/vespa/storageapi/message/bucket.cpp b/storageapi/src/vespa/storageapi/message/bucket.cpp
index e2450ca17ca..08057039cb1 100644
--- a/storageapi/src/vespa/storageapi/message/bucket.cpp
+++ b/storageapi/src/vespa/storageapi/message/bucket.cpp
@@ -180,7 +180,7 @@ void GetBucketDiffCommand::Entry::print(std::ostream& out, bool verbose,
                                         const std::string& indent) const
 {
     out << "Entry(timestamp: " << _timestamp
-        << ", " << _gid << ", hasMask: 0x" << _hasMask;
+        << ", " << _gid.toString() << ", hasMask: 0x" << _hasMask;
     if (verbose) {
         out << ",\n" << indent << "      " << "header size: "
             << std::dec << _headerSize << ", body size: " << _bodySize
@@ -312,7 +312,7 @@ void ApplyBucketDiffCommand::Entry::print(
                                  _headerBlob.size());
         if (_repo) {
             document::Document doc(*_repo, buf);
-            out << ",\n" << indent << "  " << doc.getId().getGlobalId();
+            out << ",\n" << indent << "  " << doc.getId().getGlobalId().toString();
         } else {
             out << ",\n" << indent << "  unknown global id. (repo missing)";
         }
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
index 14f392a8aca..9c186412de6 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
@@ -21,6 +21,7 @@
 #include <vespa/fastlib/text/wordfolder.h>
 #include <vespa/vdslib/container/documentlist.h>
 #include <vespa/vsm/config/vsm-cfif.h>
+#include <vespa/vespalib/geo/zcurve.h>
 #include <vespa/vsm/vsm/docsumfilter.h>
 #include <vespa/vsm/vsm/vsm-adapter.h>
 #include "querytermdata.h"
diff --git a/vespalib/src/vespa/vespalib/net/socket_address.h b/vespalib/src/vespa/vespalib/net/socket_address.h
index 226e4a9b022..369054e6885 100644
--- a/vespalib/src/vespa/vespalib/net/socket_address.h
+++ b/vespalib/src/vespa/vespalib/net/socket_address.h
@@ -5,6 +5,7 @@
 
 #include <vespa/vespalib/stllike/string.h>
 #include "socket_handle.h"
+#include <vector>
 
 namespace vespalib {
 
diff --git a/vsm/src/vespa/vsm/vsm/vsm-adapter.h b/vsm/src/vespa/vsm/vsm/vsm-adapter.h
index 44e4fbef9be..2ff8ada167e 100644
--- a/vsm/src/vespa/vsm/vsm/vsm-adapter.h
+++ b/vsm/src/vespa/vsm/vsm/vsm-adapter.h
@@ -15,6 +15,8 @@
 #include <vespa/searchlib/common/featureset.h>
 #include <vespa/searchsummary/docsummary/docsumwriter.h>
 #include <vespa/searchsummary/docsummary/docsumstate.h>
+#include <vespa/searchsummary/docsummary/idocsumenvironment.h>
+#include <vespa/juniper/rpinterface.h>
 
 using search::docsummary::ResultConfig;
 using search::docsummary::ResultClass;