diff options
9 files changed, 12 insertions, 11 deletions
diff --git a/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp b/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp index 729edd90179..f0845667a61 100644 --- a/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp +++ b/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp @@ -64,7 +64,7 @@ makeDoc(const DocumentTypeRepo &repo, uint32_t i, bool before) mainstr << " and end field"; doc->set("main", mainstr.c_str()); if (!before) { - doc->set("extra", "foo"); + doc->set("extra", (const char *)"foo"); } return doc; @@ -169,7 +169,7 @@ MyRewriteVisitor::visit(uint32_t lid, Document &doc) Document::UP expDoc(makeDoc(_repo, lid, _before)); EXPECT_TRUE(*expDoc == doc); _valid->slowSetBit(lid); - doc.set("extra", "foo"); + doc.set("extra", (const char *)"foo"); } diff --git a/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp b/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp index b5591bc2eb0..8a574dfde96 100644 --- a/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp +++ b/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp @@ -431,7 +431,7 @@ makeDoc(const DocumentTypeRepo &repo, uint32_t i, bool extra_field) mainstr << " and end field"; doc->set("main", mainstr.c_str()); if (extra_field) { - doc->set("extra", "foo"); + doc->set("extra", (const char *)"foo"); } return doc; diff --git a/searchlib/src/vespa/searchlib/test/memoryindex/ordereddocumentinserter.h b/searchlib/src/vespa/searchlib/test/memoryindex/ordereddocumentinserter.h index 5f2ec0c033a..5384df843f4 100644 --- a/searchlib/src/vespa/searchlib/test/memoryindex/ordereddocumentinserter.h +++ b/searchlib/src/vespa/searchlib/test/memoryindex/ordereddocumentinserter.h @@ -3,6 +3,7 @@ #pragma once #include <vespa/searchlib/memoryindex/iordereddocumentinserter.h> +#include <sstream> namespace search { diff --git a/storage/src/tests/common/dummystoragelink.cpp b/storage/src/tests/common/dummystoragelink.cpp index d05241cb5b5..804071a5ad1 100644 --- a/storage/src/tests/common/dummystoragelink.cpp +++ b/storage/src/tests/common/dummystoragelink.cpp @@ -1,8 +1,8 @@ +#include "dummystoragelink.h" // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include <vespa/storageframework/defaultimplementation/clock/realclock.h> #include <sys/time.h> -#include "dummystoragelink.h" +#include <vespa/vespalib/util/exceptions.h> namespace storage { diff --git a/storage/src/tests/frameworkimpl/memory/memorystatusviewertest.cpp b/storage/src/tests/frameworkimpl/memory/memorystatusviewertest.cpp index 383098cefe1..dc0fcc5592a 100644 --- a/storage/src/tests/frameworkimpl/memory/memorystatusviewertest.cpp +++ b/storage/src/tests/frameworkimpl/memory/memorystatusviewertest.cpp @@ -1,12 +1,12 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include <vespa/metrics/metrics.h> #include <vespa/metrics/metricmanager.h> #include <vespa/storage/frameworkimpl/memory/memorystatusviewer.h> #include <vespa/storageframework/defaultimplementation/memory/prioritymemorylogic.h> #include <tests/common/teststorageapp.h> #include <vespa/vdstestlib/cppunit/macros.h> +#include <boost/lexical_cast.hpp> namespace storage { diff --git a/storage/src/tests/frameworkimpl/status/statustest.cpp b/storage/src/tests/frameworkimpl/status/statustest.cpp index 0fc10e411cb..84fbd875cf2 100644 --- a/storage/src/tests/frameworkimpl/status/statustest.cpp +++ b/storage/src/tests/frameworkimpl/status/statustest.cpp @@ -71,7 +71,7 @@ namespace { const framework::HttpUrlPath&) const { xos << vespalib::xml::XmlTag("mytag") - << vespalib::xml::XmlAttribute("foo", "bar") + << vespalib::xml::XmlAttribute("foo", (const char *)"bar") << vespalib::xml::XmlContent("content") << vespalib::xml::XmlEndTag(); return ""; diff --git a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp index b58bdceb1e2..d20bafc7d68 100644 --- a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp +++ b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp @@ -2621,7 +2621,7 @@ FileStorManagerTest::testMultiOp() Document::SP doc(createDocument( "some content", did.str()).release()); doc->set("headerval", (int) i); - doc->set("content", "some content"); + doc->set("content", (const char *)"some content"); std::shared_ptr<api::PutCommand> cmd( new api::PutCommand(document::BucketId(16, 0), doc, 100 + i)); cmd->setAddress(address); diff --git a/storage/src/tests/storageserver/testvisitormessagesession.cpp b/storage/src/tests/storageserver/testvisitormessagesession.cpp index e814f6cf229..6c8f491162b 100644 --- a/storage/src/tests/storageserver/testvisitormessagesession.cpp +++ b/storage/src/tests/storageserver/testvisitormessagesession.cpp @@ -1,8 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include <tests/storageserver/testvisitormessagesession.h> #include <vespa/storageframework/defaultimplementation/clock/realclock.h> +#include <vespa/vespalib/util/exceptions.h> namespace storage { diff --git a/storageserver/src/tests/dummystoragelink.cpp b/storageserver/src/tests/dummystoragelink.cpp index 30953a1fe7c..80df995ae99 100644 --- a/storageserver/src/tests/dummystoragelink.cpp +++ b/storageserver/src/tests/dummystoragelink.cpp @@ -1,8 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/storageframework/defaultimplementation/clock/realclock.h> #include <tests/dummystoragelink.h> +#include <vespa/storageframework/defaultimplementation/clock/realclock.h> #include <sys/time.h> +#include <vespa/vespalib/util/exceptions.h> namespace storage { |