diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-01 00:27:14 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-12 02:55:41 +0100 |
commit | 729091a742626fdc702a66d765beff73316c1a2c (patch) | |
tree | 144f52bc8d64277567c02ab4833bde8c67634a7e /storage | |
parent | 488290a83e01cb50029e2c14e02fc7c4bd996aab (diff) |
Targeted include and cast to avoid template generation.
Diffstat (limited to 'storage')
5 files changed, 6 insertions, 6 deletions
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 { |