diff options
3 files changed, 15 insertions, 13 deletions
diff --git a/storage/src/vespa/storage/storageserver/fnetlistener.cpp b/storage/src/vespa/storage/storageserver/fnetlistener.cpp index ea66c7af894..e36eb8a3e79 100644 --- a/storage/src/vespa/storage/storageserver/fnetlistener.cpp +++ b/storage/src/vespa/storage/storageserver/fnetlistener.cpp @@ -3,6 +3,7 @@ #include "communicationmanager.h" #include "rpcrequestwrapper.h" #include <vespa/storageapi/message/state.h> +#include <vespa/vespalib/util/exceptions.h> #include <vespa/log/log.h> diff --git a/storage/src/vespa/storage/storageserver/messageallocationtypes.cpp b/storage/src/vespa/storage/storageserver/messageallocationtypes.cpp index ee98740c133..911e7449a52 100644 --- a/storage/src/vespa/storage/storageserver/messageallocationtypes.cpp +++ b/storage/src/vespa/storage/storageserver/messageallocationtypes.cpp @@ -1,9 +1,9 @@ // 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/storage/storageserver/messageallocationtypes.h> - +#include "messageallocationtypes.h" #include <vespa/storageapi/messageapi/storagemessage.h> +#include <vespa/vespalib/util/exceptions.h> +#include <vespa/vespalib/stllike/asciistream.h> namespace storage { @@ -87,4 +87,14 @@ MessageAllocationTypes::MessageAllocationTypes(framework::MemoryManagerInterface _types[MessageType::BATCHDOCUMENTUPDATE_REPLY_ID] = &manager.registerAllocationType(MemoryAllocationType("MessageType::BATCHDOCUMENTUPDATE_REPLY", framework::MemoryAllocationType::EXTERNAL_LOAD)); } +const framework::MemoryAllocationType& +MessageAllocationTypes::getType(uint32_t type) const { + if (_types.size() > size_t(type) && _types[type] != 0) { + return *_types[type]; + } + vespalib::asciistream ost; + ost << "No type registered with value " << type << "."; + throw vespalib::IllegalArgumentException(ost.str(), VESPA_STRLOC); +} + } // storage diff --git a/storage/src/vespa/storage/storageserver/messageallocationtypes.h b/storage/src/vespa/storage/storageserver/messageallocationtypes.h index 3e9f15c2458..869414ed8fc 100644 --- a/storage/src/vespa/storage/storageserver/messageallocationtypes.h +++ b/storage/src/vespa/storage/storageserver/messageallocationtypes.h @@ -6,10 +6,8 @@ */ #pragma once -#include <sstream> #include <vespa/storageframework/generic/memory/memorymanagerinterface.h> #include <vector> -#include <vespa/vespalib/util/exceptions.h> namespace storage { @@ -19,14 +17,7 @@ class MessageAllocationTypes { public: MessageAllocationTypes(framework::MemoryManagerInterface& manager); - const framework::MemoryAllocationType& getType(uint32_t type) const { - if (_types.size() > size_t(type) && _types[type] != 0) { - return *_types[type]; - } - std::ostringstream ost; - ost << "No type registered with value " << type << "."; - throw vespalib::IllegalArgumentException(ost.str(), VESPA_STRLOC); - } + const framework::MemoryAllocationType& getType(uint32_t type) const; }; } |