From 280a8aca27af8cea3a532900809b251fa353cd52 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Fri, 2 Jun 2017 02:13:59 +0200 Subject: Include stringfmt where it was needed. --- config/src/vespa/config/common/configparser.cpp | 7 +++---- config/src/vespa/config/common/configparser.h | 6 +++--- config/src/vespa/config/common/exceptions.cpp | 1 + document/src/vespa/document/base/exceptions.cpp | 1 + document/src/vespa/document/base/field.cpp | 1 + document/src/vespa/document/base/globalid.cpp | 1 + document/src/vespa/document/base/idstring.cpp | 1 + document/src/vespa/document/bucket/bucketid.cpp | 1 + document/src/vespa/document/bucket/bucketselector.cpp | 1 + document/src/vespa/document/datatype/documenttype.cpp | 1 + .../src/vespa/document/datatype/primitivedatatype.cpp | 1 + document/src/vespa/document/datatype/structdatatype.cpp | 5 +++-- .../src/vespa/document/fieldvalue/arrayfieldvalue.cpp | 1 + documentapi/src/tests/policies/policies_test.cpp | 1 + .../src/vespa/documentapi/loadtypes/loadtypeset.cpp | 1 + .../messagebus/policies/documentrouteselectorpolicy.cpp | 1 + .../documentapi/messagebus/policies/externpolicy.cpp | 4 +--- .../documentapi/messagebus/policies/storagepolicy.cpp | 1 + eval/src/vespa/eval/tensor/dense/dense_tensor_builder.cpp | 1 + .../vespa/filedistribution/distributor/filedownloader.cpp | 1 + .../src/vespa/filedistribution/distributor/hostname.cpp | 3 ++- .../filedistribution/model/filedistributionmodelimpl.cpp | 1 + .../src/vespa/filedistribution/model/zkfacade.cpp | 10 +++++----- .../src/vespa/filedistribution/model/zkfiledbmodel.cpp | 1 + memfilepersistence/src/tests/device/devicemanagertest.cpp | 1 + .../vespa/memfilepersistence/spi/joinoperationhandler.cpp | 1 + messagebus/src/vespa/messagebus/testlib/slobrok.cpp | 1 + metrics/src/vespa/metrics/metric.cpp | 1 + metrics/src/vespa/metrics/metricmanager.cpp | 2 +- metrics/src/vespa/metrics/metricset.cpp | 2 +- metrics/src/vespa/metrics/printutils.cpp | 1 + metrics/src/vespa/metrics/summetric.hpp | 1 + metrics/src/vespa/metrics/valuemetric.hpp | 1 + metrics/src/vespa/metrics/valuemetricvalues.hpp | 1 + persistence/src/vespa/persistence/proxy/providerproxy.cpp | 3 +-- searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp | 1 + .../document_scan_iterator_test.cpp | 1 + .../proton/persistenceengine/transport_latch.cpp | 1 + .../src/vespa/searchcore/proton/server/matchview.cpp | 1 + .../tests/engine/transportserver/transportserver_test.cpp | 2 +- .../element_completeness/element_completeness_test.cpp | 1 + .../element_similarity_feature_test.cpp | 1 + .../tests/features/item_raw_score/item_raw_score_test.cpp | 1 + .../native_dot_product/native_dot_product_test.cpp | 1 + .../src/tests/features/prod_features_fieldtermmatch.cpp | 5 +++-- searchlib/src/tests/features/raw_score/raw_score_test.cpp | 1 + .../src/tests/features/subqueries/subqueries_test.cpp | 1 + .../text_similarity_feature_test.cpp | 1 + searchlib/src/vespa/searchlib/docstore/chunkformat.cpp | 1 + searchlib/src/vespa/searchlib/docstore/chunkformats.cpp | 1 + .../searchlib/expression/arrayatlookupfunctionnode.cpp | 2 +- searchlib/src/vespa/searchlib/expression/resultnode.cpp | 15 ++++++++++++++- searchlib/src/vespa/searchlib/expression/resultnode.h | 9 ++------- searchlib/src/vespa/searchlib/fef/test/ftlib.cpp | 1 + .../src/vespa/searchlib/fef/test/matchdatabuilder.cpp | 1 + .../src/vespa/searchlib/test/imported_attribute_fixture.h | 1 + slobrok/src/vespa/slobrok/server/rpc_server_manager.cpp | 1 + staging_vespalib/src/vespa/vespalib/encoding/base64.cpp | 9 ++++----- staging_vespalib/src/vespa/vespalib/net/http_server.cpp | 2 +- .../src/vespa/vespalib/util/document_runnable.cpp | 1 + staging_vespalib/src/vespa/vespalib/util/jsonstream.cpp | 11 ++++++----- staging_vespalib/src/vespa/vespalib/util/librarypool.cpp | 12 +++++++----- .../src/vespa/vespalib/util/programoptions.cpp | 5 ++--- .../src/vespa/vespalib/util/xmlserializable.cpp | 4 ++-- .../src/vespa/vespalib/util/xmlserializable.hpp | 2 +- storage/src/tests/bucketdb/bucketmanagertest.cpp | 1 + .../tests/persistence/filestorage/filestormanagertest.cpp | 1 + storage/src/tests/persistence/splitbitdetectortest.cpp | 2 +- storage/src/vespa/storage/bucketdb/bucketmanager.cpp | 1 + storage/src/vespa/storage/bucketmover/bucketmover.cpp | 1 + .../vespa/storage/distributor/operations/operation.cpp | 1 + .../storage/persistence/filestorage/filestormanager.cpp | 1 + .../src/vespa/storage/storageserver/mergethrottler.cpp | 2 +- .../src/vespa/storage/tools/generatedistributionbits.cpp | 2 ++ storage/src/vespa/storage/visiting/countvisitor.cpp | 1 + storage/src/vespa/storage/visiting/visitor.cpp | 2 ++ storage/src/vespa/storage/visiting/visitormanager.cpp | 3 +-- .../src/vespa/searchvisitor/hitcollector.cpp | 1 + streamingvisitors/src/vespa/searchvisitor/rankmanager.cpp | 4 ++-- vdslib/src/tests/container/documentlisttest.cpp | 1 + vdstestlib/src/vespa/vdstestlib/cppunit/dirconfig.cpp | 1 + .../src/vespa/vespaclient/vespadoclocator/locator.cpp | 3 +-- .../src/vespa/vespaclient/vesparoute/application.cpp | 2 +- .../tests/exception_classes/exception_classes_test.cpp | 1 + vespalib/src/vespa/vespalib/io/fileutil.cpp | 10 +++------- vespalib/src/vespa/vespalib/objects/nbostream.cpp | 2 +- vespalib/src/vespa/vespalib/util/exception.h | 1 - vespalib/src/vespa/vespalib/util/exceptions.h | 1 + 88 files changed, 135 insertions(+), 74 deletions(-) diff --git a/config/src/vespa/config/common/configparser.cpp b/config/src/vespa/config/common/configparser.cpp index fde55f257dc..e0a0b0138b9 100644 --- a/config/src/vespa/config/common/configparser.cpp +++ b/config/src/vespa/config/common/configparser.cpp @@ -1,9 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include -#include -#include -#include + +#include "configparser.h" #include "misc.h" +#include namespace config { diff --git a/config/src/vespa/config/common/configparser.h b/config/src/vespa/config/common/configparser.h index 3b1185a48fa..613dfc33d94 100644 --- a/config/src/vespa/config/common/configparser.h +++ b/config/src/vespa/config/common/configparser.h @@ -2,12 +2,12 @@ #pragma once #include +#include #include #include #include -#include -#include -#include +#include +#include namespace config { diff --git a/config/src/vespa/config/common/exceptions.cpp b/config/src/vespa/config/common/exceptions.cpp index d19c27b5999..b5cbe7f0e06 100644 --- a/config/src/vespa/config/common/exceptions.cpp +++ b/config/src/vespa/config/common/exceptions.cpp @@ -1,6 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "exceptions.h" +#include namespace config { diff --git a/document/src/vespa/document/base/exceptions.cpp b/document/src/vespa/document/base/exceptions.cpp index 3e5c464b8b4..dbd3f2bd998 100644 --- a/document/src/vespa/document/base/exceptions.cpp +++ b/document/src/vespa/document/base/exceptions.cpp @@ -3,6 +3,7 @@ #include "exceptions.h" #include #include +#include namespace document { diff --git a/document/src/vespa/document/base/field.cpp b/document/src/vespa/document/base/field.cpp index d62623b64b9..d00fd42081c 100644 --- a/document/src/vespa/document/base/field.cpp +++ b/document/src/vespa/document/base/field.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include namespace document { diff --git a/document/src/vespa/document/base/globalid.cpp b/document/src/vespa/document/base/globalid.cpp index 7fa22d27971..ab8736999aa 100644 --- a/document/src/vespa/document/base/globalid.cpp +++ b/document/src/vespa/document/base/globalid.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include #include diff --git a/document/src/vespa/document/base/idstring.cpp b/document/src/vespa/document/base/idstring.cpp index f5f9f7377b5..d837f512637 100644 --- a/document/src/vespa/document/base/idstring.cpp +++ b/document/src/vespa/document/base/idstring.cpp @@ -3,6 +3,7 @@ #include "idstring.h" #include #include +#include using vespalib::string; using vespalib::stringref; diff --git a/document/src/vespa/document/bucket/bucketid.cpp b/document/src/vespa/document/bucket/bucketid.cpp index 8554450fb22..c9efe7cd152 100644 --- a/document/src/vespa/document/bucket/bucketid.cpp +++ b/document/src/vespa/document/bucket/bucketid.cpp @@ -6,6 +6,7 @@ #include #include #include +#include using vespalib::nbostream; using vespalib::asciistream; diff --git a/document/src/vespa/document/bucket/bucketselector.cpp b/document/src/vespa/document/bucket/bucketselector.cpp index 8b5e7ada91b..b41b1c284a6 100644 --- a/document/src/vespa/document/bucket/bucketselector.cpp +++ b/document/src/vespa/document/bucket/bucketselector.cpp @@ -8,6 +8,7 @@ #include #include #include +#include namespace document { diff --git a/document/src/vespa/document/datatype/documenttype.cpp b/document/src/vespa/document/datatype/documenttype.cpp index 883c4df8f9b..dcf28a9fabf 100644 --- a/document/src/vespa/document/datatype/documenttype.cpp +++ b/document/src/vespa/document/datatype/documenttype.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include #include diff --git a/document/src/vespa/document/datatype/primitivedatatype.cpp b/document/src/vespa/document/datatype/primitivedatatype.cpp index 821a22aad4a..afc32e291ea 100644 --- a/document/src/vespa/document/datatype/primitivedatatype.cpp +++ b/document/src/vespa/document/datatype/primitivedatatype.cpp @@ -3,6 +3,7 @@ #include "primitivedatatype.h" #include #include +#include #include namespace document { diff --git a/document/src/vespa/document/datatype/structdatatype.cpp b/document/src/vespa/document/datatype/structdatatype.cpp index 6cf9e18656b..f6bd1fc5fa6 100644 --- a/document/src/vespa/document/datatype/structdatatype.cpp +++ b/document/src/vespa/document/datatype/structdatatype.cpp @@ -1,12 +1,13 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "structdatatype.h" - -#include #include #include #include +#include #include +#include + #include LOG_SETUP(".document.datatype.struct"); diff --git a/document/src/vespa/document/fieldvalue/arrayfieldvalue.cpp b/document/src/vespa/document/fieldvalue/arrayfieldvalue.cpp index 866c82a63c9..8c05c25e651 100644 --- a/document/src/vespa/document/fieldvalue/arrayfieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/arrayfieldvalue.cpp @@ -4,6 +4,7 @@ #include "stringfieldvalue.h" #include "predicatefieldvalue.h" #include +#include #include LOG_SETUP(".document.fieldvalue.array"); diff --git a/documentapi/src/tests/policies/policies_test.cpp b/documentapi/src/tests/policies/policies_test.cpp index 3527e62840b..43c2b6c6e24 100644 --- a/documentapi/src/tests/policies/policies_test.cpp +++ b/documentapi/src/tests/policies/policies_test.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include LOG_SETUP("policies_test"); diff --git a/documentapi/src/vespa/documentapi/loadtypes/loadtypeset.cpp b/documentapi/src/vespa/documentapi/loadtypes/loadtypeset.cpp index 4f0f3508d20..062ed58ca87 100644 --- a/documentapi/src/vespa/documentapi/loadtypes/loadtypeset.cpp +++ b/documentapi/src/vespa/documentapi/loadtypes/loadtypeset.cpp @@ -3,6 +3,7 @@ #include "loadtypeset.h" #include #include +#include #include #include diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.cpp index 61c6648aee6..4dae20e52d5 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include LOG_SETUP(".documentrouteselectorpolicy"); diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.cpp index 3a35e995805..d1a2e7b135b 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.cpp @@ -3,9 +3,7 @@ #include #include #include -#include -#include -#include +#include #include #include diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/storagepolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/storagepolicy.cpp index 5aaf7919d71..f19e0c4c85f 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/storagepolicy.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/policies/storagepolicy.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.cpp b/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.cpp index a00537ffa50..3c6e182a143 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.cpp @@ -2,6 +2,7 @@ #include "dense_tensor_builder.h" #include +#include #include using vespalib::IllegalArgumentException; diff --git a/filedistribution/src/vespa/filedistribution/distributor/filedownloader.cpp b/filedistribution/src/vespa/filedistribution/distributor/filedownloader.cpp index cbd93eb2e57..14cb8844d8b 100644 --- a/filedistribution/src/vespa/filedistribution/distributor/filedownloader.cpp +++ b/filedistribution/src/vespa/filedistribution/distributor/filedownloader.cpp @@ -2,6 +2,7 @@ #include "filedownloader.h" #include "hostname.h" #include +#include #include #include diff --git a/filedistribution/src/vespa/filedistribution/distributor/hostname.cpp b/filedistribution/src/vespa/filedistribution/distributor/hostname.cpp index 7b33632df81..f307ae1fca3 100644 --- a/filedistribution/src/vespa/filedistribution/distributor/hostname.cpp +++ b/filedistribution/src/vespa/filedistribution/distributor/hostname.cpp @@ -1,6 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include "hostname.h" +#include "hostname.h" +#include #include #include LOG_SETUP(".hostname"); diff --git a/filedistribution/src/vespa/filedistribution/model/filedistributionmodelimpl.cpp b/filedistribution/src/vespa/filedistribution/model/filedistributionmodelimpl.cpp index 3b4d043a30b..15ff198b8d5 100644 --- a/filedistribution/src/vespa/filedistribution/model/filedistributionmodelimpl.cpp +++ b/filedistribution/src/vespa/filedistribution/model/filedistributionmodelimpl.cpp @@ -4,6 +4,7 @@ #include "zkfiledbmodel.h" #include "deployedfilestodownload.h" #include "filedistributionmodelimpl.h" +#include #include #include diff --git a/filedistribution/src/vespa/filedistribution/model/zkfacade.cpp b/filedistribution/src/vespa/filedistribution/model/zkfacade.cpp index 2400eae9eb7..28e0e82f79a 100644 --- a/filedistribution/src/vespa/filedistribution/model/zkfacade.cpp +++ b/filedistribution/src/vespa/filedistribution/model/zkfacade.cpp @@ -2,15 +2,15 @@ #include "zkfacade.h" #include -#include -#include -#include - -#include #include #include #include #include +#include +#include +#include +#include +#include typedef std::unique_lock UniqueLock; diff --git a/filedistribution/src/vespa/filedistribution/model/zkfiledbmodel.cpp b/filedistribution/src/vespa/filedistribution/model/zkfiledbmodel.cpp index 5198b6bbeb7..4030b777afa 100644 --- a/filedistribution/src/vespa/filedistribution/model/zkfiledbmodel.cpp +++ b/filedistribution/src/vespa/filedistribution/model/zkfiledbmodel.cpp @@ -5,6 +5,7 @@ #include "zkfiledbmodel.h" #include "deployedfilestodownload.h" #include +#include #include #include #include diff --git a/memfilepersistence/src/tests/device/devicemanagertest.cpp b/memfilepersistence/src/tests/device/devicemanagertest.cpp index f5e16032361..50a4e8ef56c 100644 --- a/memfilepersistence/src/tests/device/devicemanagertest.cpp +++ b/memfilepersistence/src/tests/device/devicemanagertest.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include namespace storage { diff --git a/memfilepersistence/src/vespa/memfilepersistence/spi/joinoperationhandler.cpp b/memfilepersistence/src/vespa/memfilepersistence/spi/joinoperationhandler.cpp index 1f82ffb2172..0fc2aa2ece6 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/spi/joinoperationhandler.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/spi/joinoperationhandler.cpp @@ -3,6 +3,7 @@ #include "joinoperationhandler.h" #include "cacheevictionguard.h" #include +#include #include LOG_SETUP(".persistence.memfile.handler.join"); diff --git a/messagebus/src/vespa/messagebus/testlib/slobrok.cpp b/messagebus/src/vespa/messagebus/testlib/slobrok.cpp index 10c501db854..12f53e31764 100644 --- a/messagebus/src/vespa/messagebus/testlib/slobrok.cpp +++ b/messagebus/src/vespa/messagebus/testlib/slobrok.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include LOG_SETUP(".slobrok"); diff --git a/metrics/src/vespa/metrics/metric.cpp b/metrics/src/vespa/metrics/metric.cpp index 57ce8e5ffc1..0c99409a8bb 100644 --- a/metrics/src/vespa/metrics/metric.cpp +++ b/metrics/src/vespa/metrics/metric.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include namespace metrics { diff --git a/metrics/src/vespa/metrics/metricmanager.cpp b/metrics/src/vespa/metrics/metricmanager.cpp index 572779be855..db05ea16488 100644 --- a/metrics/src/vespa/metrics/metricmanager.cpp +++ b/metrics/src/vespa/metrics/metricmanager.cpp @@ -10,7 +10,7 @@ #include "xmlwriter.h" #include #include - +#include #include #include #include diff --git a/metrics/src/vespa/metrics/metricset.cpp b/metrics/src/vespa/metrics/metricset.cpp index 15ee22ba1f2..c9acbaafce2 100644 --- a/metrics/src/vespa/metrics/metricset.cpp +++ b/metrics/src/vespa/metrics/metricset.cpp @@ -4,10 +4,10 @@ #include "memoryconsumption.h" #include #include +#include #include #include - LOG_SETUP(".metrics.metricsset"); namespace metrics { diff --git a/metrics/src/vespa/metrics/printutils.cpp b/metrics/src/vespa/metrics/printutils.cpp index 2373d2391ff..2209ebd5da7 100644 --- a/metrics/src/vespa/metrics/printutils.cpp +++ b/metrics/src/vespa/metrics/printutils.cpp @@ -1,6 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "printutils.h" +#include namespace metrics { namespace printutils { diff --git a/metrics/src/vespa/metrics/summetric.hpp b/metrics/src/vespa/metrics/summetric.hpp index 1a54067b01f..3e85aa0e215 100644 --- a/metrics/src/vespa/metrics/summetric.hpp +++ b/metrics/src/vespa/metrics/summetric.hpp @@ -5,6 +5,7 @@ #include "metricset.h" #include "memoryconsumption.h" #include +#include #include namespace metrics { diff --git a/metrics/src/vespa/metrics/valuemetric.hpp b/metrics/src/vespa/metrics/valuemetric.hpp index 65a0c2bb5b2..b09f35e3272 100644 --- a/metrics/src/vespa/metrics/valuemetric.hpp +++ b/metrics/src/vespa/metrics/valuemetric.hpp @@ -4,6 +4,7 @@ #include "valuemetric.h" #include "memoryconsumption.h" #include +#include #include namespace metrics { diff --git a/metrics/src/vespa/metrics/valuemetricvalues.hpp b/metrics/src/vespa/metrics/valuemetricvalues.hpp index d8becca3e72..e7f3e9e3239 100644 --- a/metrics/src/vespa/metrics/valuemetricvalues.hpp +++ b/metrics/src/vespa/metrics/valuemetricvalues.hpp @@ -3,6 +3,7 @@ #include "valuemetricvalues.h" #include +#include #include namespace metrics { diff --git a/persistence/src/vespa/persistence/proxy/providerproxy.cpp b/persistence/src/vespa/persistence/proxy/providerproxy.cpp index 1f6d0b19be6..29b09af9953 100644 --- a/persistence/src/vespa/persistence/proxy/providerproxy.cpp +++ b/persistence/src/vespa/persistence/proxy/providerproxy.cpp @@ -8,9 +8,8 @@ #include #include #include -#include +#include #include -#include #include #include LOG_SETUP(".providerproxy"); diff --git a/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp b/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp index bfbe27cb26c..58844dc969c 100644 --- a/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp +++ b/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include diff --git a/searchcore/src/tests/proton/documentdb/document_scan_iterator/document_scan_iterator_test.cpp b/searchcore/src/tests/proton/documentdb/document_scan_iterator/document_scan_iterator_test.cpp index 6a2c283dc8d..db95898e349 100644 --- a/searchcore/src/tests/proton/documentdb/document_scan_iterator/document_scan_iterator_test.cpp +++ b/searchcore/src/tests/proton/documentdb/document_scan_iterator/document_scan_iterator_test.cpp @@ -4,6 +4,7 @@ #include #include #include +#include using namespace document; using namespace proton; diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/transport_latch.cpp b/searchcore/src/vespa/searchcore/proton/persistenceengine/transport_latch.cpp index 78eb1cfb3f6..94bac320ef3 100644 --- a/searchcore/src/vespa/searchcore/proton/persistenceengine/transport_latch.cpp +++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/transport_latch.cpp @@ -1,6 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "transport_latch.h" +#include using storage::spi::Result; diff --git a/searchcore/src/vespa/searchcore/proton/server/matchview.cpp b/searchcore/src/vespa/searchcore/proton/server/matchview.cpp index 86ee2fe2ac0..c567930d68d 100644 --- a/searchcore/src/vespa/searchcore/proton/server/matchview.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/matchview.cpp @@ -4,6 +4,7 @@ #include "searchcontext.h" #include #include +#include #include LOG_SETUP(".proton.server.matchview"); diff --git a/searchlib/src/tests/engine/transportserver/transportserver_test.cpp b/searchlib/src/tests/engine/transportserver/transportserver_test.cpp index b7932ea2381..d8fd8a52b0e 100644 --- a/searchlib/src/tests/engine/transportserver/transportserver_test.cpp +++ b/searchlib/src/tests/engine/transportserver/transportserver_test.cpp @@ -4,7 +4,7 @@ #include #include #include - +#include #include #include #include diff --git a/searchlib/src/tests/features/element_completeness/element_completeness_test.cpp b/searchlib/src/tests/features/element_completeness/element_completeness_test.cpp index 44077d06d15..16670c0ff30 100644 --- a/searchlib/src/tests/features/element_completeness/element_completeness_test.cpp +++ b/searchlib/src/tests/features/element_completeness/element_completeness_test.cpp @@ -7,6 +7,7 @@ #include #include #include +#include using namespace search::fef; using namespace search::fef::test; diff --git a/searchlib/src/tests/features/element_similarity_feature/element_similarity_feature_test.cpp b/searchlib/src/tests/features/element_similarity_feature/element_similarity_feature_test.cpp index d693062bb00..f9e1fc902c8 100644 --- a/searchlib/src/tests/features/element_similarity_feature/element_similarity_feature_test.cpp +++ b/searchlib/src/tests/features/element_similarity_feature/element_similarity_feature_test.cpp @@ -8,6 +8,7 @@ #include #include #include +#include using namespace search::fef; using namespace search::fef::test; diff --git a/searchlib/src/tests/features/item_raw_score/item_raw_score_test.cpp b/searchlib/src/tests/features/item_raw_score/item_raw_score_test.cpp index 51405064ac6..44f4fd46765 100644 --- a/searchlib/src/tests/features/item_raw_score/item_raw_score_test.cpp +++ b/searchlib/src/tests/features/item_raw_score/item_raw_score_test.cpp @@ -9,6 +9,7 @@ #include #include #include +#include using search::feature_t; using namespace search::fef; diff --git a/searchlib/src/tests/features/native_dot_product/native_dot_product_test.cpp b/searchlib/src/tests/features/native_dot_product/native_dot_product_test.cpp index 93313c69a3f..a84e8f42847 100644 --- a/searchlib/src/tests/features/native_dot_product/native_dot_product_test.cpp +++ b/searchlib/src/tests/features/native_dot_product/native_dot_product_test.cpp @@ -8,6 +8,7 @@ #include #include #include +#include using search::feature_t; using namespace search::fef; diff --git a/searchlib/src/tests/features/prod_features_fieldtermmatch.cpp b/searchlib/src/tests/features/prod_features_fieldtermmatch.cpp index 7ae7ba8b26a..3a3dba039ff 100644 --- a/searchlib/src/tests/features/prod_features_fieldtermmatch.cpp +++ b/searchlib/src/tests/features/prod_features_fieldtermmatch.cpp @@ -1,9 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include -LOG_SETUP(".prod_features_fieldtermmatch"); #include "prod_features.h" #include +#include +#include +LOG_SETUP(".prod_features_fieldtermmatch"); using namespace search::features; using namespace search::fef; diff --git a/searchlib/src/tests/features/raw_score/raw_score_test.cpp b/searchlib/src/tests/features/raw_score/raw_score_test.cpp index 8b97a8edbcc..acf5066b2c3 100644 --- a/searchlib/src/tests/features/raw_score/raw_score_test.cpp +++ b/searchlib/src/tests/features/raw_score/raw_score_test.cpp @@ -7,6 +7,7 @@ #include #include #include +#include using search::feature_t; using namespace search::fef; diff --git a/searchlib/src/tests/features/subqueries/subqueries_test.cpp b/searchlib/src/tests/features/subqueries/subqueries_test.cpp index 233b3a65b9f..0dfe2858735 100644 --- a/searchlib/src/tests/features/subqueries/subqueries_test.cpp +++ b/searchlib/src/tests/features/subqueries/subqueries_test.cpp @@ -7,6 +7,7 @@ #include #include #include +#include using search::feature_t; using namespace search::fef; diff --git a/searchlib/src/tests/features/text_similarity_feature/text_similarity_feature_test.cpp b/searchlib/src/tests/features/text_similarity_feature/text_similarity_feature_test.cpp index 88b043cb2e8..bf5416291d7 100644 --- a/searchlib/src/tests/features/text_similarity_feature/text_similarity_feature_test.cpp +++ b/searchlib/src/tests/features/text_similarity_feature/text_similarity_feature_test.cpp @@ -8,6 +8,7 @@ #include #include #include +#include using namespace search::fef; using namespace search::fef::test; diff --git a/searchlib/src/vespa/searchlib/docstore/chunkformat.cpp b/searchlib/src/vespa/searchlib/docstore/chunkformat.cpp index cd44d34ea22..cddf8c96b2e 100644 --- a/searchlib/src/vespa/searchlib/docstore/chunkformat.cpp +++ b/searchlib/src/vespa/searchlib/docstore/chunkformat.cpp @@ -2,6 +2,7 @@ #include "chunkformats.h" #include +#include namespace search { diff --git a/searchlib/src/vespa/searchlib/docstore/chunkformats.cpp b/searchlib/src/vespa/searchlib/docstore/chunkformats.cpp index c715f8a2129..0843d473121 100644 --- a/searchlib/src/vespa/searchlib/docstore/chunkformats.cpp +++ b/searchlib/src/vespa/searchlib/docstore/chunkformats.cpp @@ -3,6 +3,7 @@ #include "chunkformats.h" #include #include +#include namespace search { diff --git a/searchlib/src/vespa/searchlib/expression/arrayatlookupfunctionnode.cpp b/searchlib/src/vespa/searchlib/expression/arrayatlookupfunctionnode.cpp index 7d443219f29..eaa96587d6d 100644 --- a/searchlib/src/vespa/searchlib/expression/arrayatlookupfunctionnode.cpp +++ b/searchlib/src/vespa/searchlib/expression/arrayatlookupfunctionnode.cpp @@ -4,7 +4,7 @@ #include "integerresultnode.h" #include "stringresultnode.h" #include - +#include namespace search { namespace expression { diff --git a/searchlib/src/vespa/searchlib/expression/resultnode.cpp b/searchlib/src/vespa/searchlib/expression/resultnode.cpp index 3306068efdf..bd8a5ff03d5 100644 --- a/searchlib/src/vespa/searchlib/expression/resultnode.cpp +++ b/searchlib/src/vespa/searchlib/expression/resultnode.cpp @@ -1,10 +1,18 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + #include "resultnode.h" -#include +#include +#include namespace search { namespace expression { +int64_t +ResultNode::onGetEnum(size_t index) const { + (void) index; + throw vespalib::Exception("search::expression::ResultNode onGetEnum is not implemented"); +} + uint64_t ResultNode::radixAsc(const void * buf) const { (void) buf; @@ -65,6 +73,11 @@ size_t ResultNode::getRawByteSize() const throw std::runtime_error("ResultNode::getRawByteSize() const must be overloaded by '" + vespalib::string(getClass().name()) + "'."); } +const BucketResultNode& +ResultNode::getNullBucket() const { + throw std::runtime_error(vespalib::make_string("No null bucket defined for this type")); +} + } } diff --git a/searchlib/src/vespa/searchlib/expression/resultnode.h b/searchlib/src/vespa/searchlib/expression/resultnode.h index 6343e90dc6b..26849d27ed3 100644 --- a/searchlib/src/vespa/searchlib/expression/resultnode.h +++ b/searchlib/src/vespa/searchlib/expression/resultnode.h @@ -3,7 +3,6 @@ #include "expressionnode.h" #include "serializer.h" -#include #include namespace search { @@ -49,10 +48,7 @@ public: private: virtual int64_t onGetInteger(size_t index) const = 0; - virtual int64_t onGetEnum(size_t index) const { - (void) index; - throw vespalib::Exception("search::expression::ResultNode onGetEnum is not implemented"); - } + virtual int64_t onGetEnum(size_t index) const; virtual double onGetFloat(size_t index) const = 0; virtual ConstBufferRef onGetString(size_t index, BufferRef buf) const = 0; @@ -124,9 +120,8 @@ public: virtual ResultDeserializer & onDeserializeResult(ResultDeserializer & is); virtual size_t getRawByteSize() const; virtual bool isMultiValue() const { return false; } - virtual const BucketResultNode& getNullBucket() const { throw std::runtime_error(vespalib::make_string("No null bucket defined for this type")); } + virtual const BucketResultNode& getNullBucket() const; }; } } - diff --git a/searchlib/src/vespa/searchlib/fef/test/ftlib.cpp b/searchlib/src/vespa/searchlib/fef/test/ftlib.cpp index 1a359b4056e..08a0017c3e2 100644 --- a/searchlib/src/vespa/searchlib/fef/test/ftlib.cpp +++ b/searchlib/src/vespa/searchlib/fef/test/ftlib.cpp @@ -3,6 +3,7 @@ #include "ftlib.h" #include "dummy_dependency_handler.h" #include +#include #include #include diff --git a/searchlib/src/vespa/searchlib/fef/test/matchdatabuilder.cpp b/searchlib/src/vespa/searchlib/fef/test/matchdatabuilder.cpp index 1f59cfb52b8..02782565f80 100644 --- a/searchlib/src/vespa/searchlib/fef/test/matchdatabuilder.cpp +++ b/searchlib/src/vespa/searchlib/fef/test/matchdatabuilder.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include LOG_SETUP(".fef.matchdatabuilder"); diff --git a/searchlib/src/vespa/searchlib/test/imported_attribute_fixture.h b/searchlib/src/vespa/searchlib/test/imported_attribute_fixture.h index 4b376df2bdd..eb278280156 100644 --- a/searchlib/src/vespa/searchlib/test/imported_attribute_fixture.h +++ b/searchlib/src/vespa/searchlib/test/imported_attribute_fixture.h @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include diff --git a/slobrok/src/vespa/slobrok/server/rpc_server_manager.cpp b/slobrok/src/vespa/slobrok/server/rpc_server_manager.cpp index 84ef6432f74..9d34d29fc0b 100644 --- a/slobrok/src/vespa/slobrok/server/rpc_server_manager.cpp +++ b/slobrok/src/vespa/slobrok/server/rpc_server_manager.cpp @@ -5,6 +5,7 @@ #include "rpc_server_map.h" #include "remote_slobrok.h" #include "sbenv.h" +#include #include #include diff --git a/staging_vespalib/src/vespa/vespalib/encoding/base64.cpp b/staging_vespalib/src/vespa/vespalib/encoding/base64.cpp index 10bc2af51ce..54ac8363bf6 100644 --- a/staging_vespalib/src/vespa/vespalib/encoding/base64.cpp +++ b/staging_vespalib/src/vespa/vespalib/encoding/base64.cpp @@ -8,7 +8,8 @@ #include #include -#include +#include +#include namespace vespalib { @@ -129,9 +130,8 @@ Base64::decode(const char* inBuffer, int inLen, char* outBuffer, int outLen) continue; // Some illegal chars will be skipped. } else if (curchar == -1) { // Other illegal characters will generate failure - throw vespalib::IllegalArgumentException(vespalib::make_string( - "Illegal base64 character %u found.", - (unsigned int) *thischar), VESPA_STRLOC); + throw IllegalArgumentException(make_string("Illegal base64 character %u found.", + (unsigned int) *thischar), VESPA_STRLOC); } else { // Four bytes from input (eqals three bytes in output) @@ -162,4 +162,3 @@ Base64::decode(const char* inBuffer, int inLen, char* outBuffer, int outLen) } } // namespace vespalib - diff --git a/staging_vespalib/src/vespa/vespalib/net/http_server.cpp b/staging_vespalib/src/vespa/vespalib/net/http_server.cpp index 32b9caab687..2c67a3c48c9 100644 --- a/staging_vespalib/src/vespa/vespalib/net/http_server.cpp +++ b/staging_vespalib/src/vespa/vespalib/net/http_server.cpp @@ -3,7 +3,7 @@ #include "http_server.h" #include #include -#include +#include namespace vespalib { diff --git a/staging_vespalib/src/vespa/vespalib/util/document_runnable.cpp b/staging_vespalib/src/vespa/vespalib/util/document_runnable.cpp index 7c581c89af0..576343245e4 100644 --- a/staging_vespalib/src/vespa/vespalib/util/document_runnable.cpp +++ b/staging_vespalib/src/vespa/vespalib/util/document_runnable.cpp @@ -2,6 +2,7 @@ #include "document_runnable.h" #include +#include namespace document { diff --git a/staging_vespalib/src/vespa/vespalib/util/jsonstream.cpp b/staging_vespalib/src/vespa/vespalib/util/jsonstream.cpp index e8f242879d8..c7a7ac34ef3 100644 --- a/staging_vespalib/src/vespa/vespalib/util/jsonstream.cpp +++ b/staging_vespalib/src/vespa/vespalib/util/jsonstream.cpp @@ -4,6 +4,7 @@ #include "jsonexception.h" #include #include +#include namespace vespalib { @@ -18,7 +19,7 @@ JsonStream::getStateName(const State& s) { throw IllegalStateException("Control should not reach this point", VESPA_STRLOC); } -JsonStream::JsonStream(vespalib::asciistream& as, bool createIndents) +JsonStream::JsonStream(asciistream& as, bool createIndents) : _writer(as) { if (createIndents) _writer.setPretty(); @@ -28,7 +29,7 @@ JsonStream::JsonStream(vespalib::asciistream& as, bool createIndents) JsonStream::~JsonStream() {} JsonStream& -JsonStream::operator<<(vespalib::stringref value) +JsonStream::operator<<(stringref value) { if (_state.empty()) { fail("Stream already finalized. Can't add a string value."); @@ -314,7 +315,7 @@ JsonStream::finalize() string JsonStream::getStateString() const { - vespalib::asciistream as; + asciistream as; for (auto it(_state.begin()), mt(_state.end()); it != mt; it++) { switch (it->state) { case State::OBJECT_EXPECTING_KEY: @@ -343,7 +344,7 @@ JsonStream::getStateString() const return as.str(); } -vespalib::string +string JsonStream::getJsonStreamState() const { asciistream report; @@ -360,4 +361,4 @@ JsonStream::fail(stringref error) const throw JsonStreamException(report.str(), "", VESPA_STRLOC); } -} // vespalib +} diff --git a/staging_vespalib/src/vespa/vespalib/util/librarypool.cpp b/staging_vespalib/src/vespa/vespalib/util/librarypool.cpp index 8dd6995a6c1..d992b1b6db8 100644 --- a/staging_vespalib/src/vespa/vespalib/util/librarypool.cpp +++ b/staging_vespalib/src/vespa/vespalib/util/librarypool.cpp @@ -1,6 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + #include #include +#include namespace vespalib { @@ -17,14 +19,14 @@ LibraryPool::~LibraryPool() } void -LibraryPool::loadLibrary(const vespalib::stringref & libName) +LibraryPool::loadLibrary(const stringref & libName) { LockGuard guard(_lock); if (_libraries.find(libName) == _libraries.end()) { DynamicLibrarySP lib(new FastOS_DynamicLibrary); - vespalib::string file(libName); + string file(libName); if (!lib->Open(file.c_str())) { - vespalib::string error = lib->GetLastErrorString(); + string error = lib->GetLastErrorString(); throw IllegalArgumentException(make_string("Failed loading dynamic library '%s' due to '%s'.", file.c_str(), error.c_str())); } else { @@ -34,7 +36,7 @@ LibraryPool::loadLibrary(const vespalib::stringref & libName) } FastOS_DynamicLibrary * -LibraryPool::get(const vespalib::stringref & name) +LibraryPool::get(const stringref & name) { LockGuard guard(_lock); LibraryMap::const_iterator found(_libraries.find(name)); @@ -44,7 +46,7 @@ LibraryPool::get(const vespalib::stringref & name) } const FastOS_DynamicLibrary * -LibraryPool::get(const vespalib::stringref & name) const +LibraryPool::get(const stringref & name) const { LockGuard guard(_lock); LibraryMap::const_iterator found(_libraries.find(name)); diff --git a/staging_vespalib/src/vespa/vespalib/util/programoptions.cpp b/staging_vespalib/src/vespa/vespalib/util/programoptions.cpp index 41ff561011b..6573390c712 100644 --- a/staging_vespalib/src/vespa/vespalib/util/programoptions.cpp +++ b/staging_vespalib/src/vespa/vespalib/util/programoptions.cpp @@ -1,7 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include - -#include +#include "programoptions.h" +#include #include #include diff --git a/staging_vespalib/src/vespa/vespalib/util/xmlserializable.cpp b/staging_vespalib/src/vespa/vespalib/util/xmlserializable.cpp index 58a5489647d..043cddc3259 100644 --- a/staging_vespalib/src/vespa/vespalib/util/xmlserializable.cpp +++ b/staging_vespalib/src/vespa/vespalib/util/xmlserializable.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 +#include "xmlserializable.hpp" #include #include -#include +#include #include namespace vespalib { diff --git a/staging_vespalib/src/vespa/vespalib/util/xmlserializable.hpp b/staging_vespalib/src/vespa/vespalib/util/xmlserializable.hpp index 7fcc964d8f1..0da684d6b28 100644 --- a/staging_vespalib/src/vespa/vespalib/util/xmlserializable.hpp +++ b/staging_vespalib/src/vespa/vespalib/util/xmlserializable.hpp @@ -3,8 +3,8 @@ #pragma once #include "xmlserializable.h" -#include #include +#include namespace vespalib { namespace xml { diff --git a/storage/src/tests/bucketdb/bucketmanagertest.cpp b/storage/src/tests/bucketdb/bucketmanagertest.cpp index f9ae4f57fa5..227dd40b34d 100644 --- a/storage/src/tests/bucketdb/bucketmanagertest.cpp +++ b/storage/src/tests/bucketdb/bucketmanagertest.cpp @@ -16,6 +16,7 @@ #include #include #include +#include #include #include diff --git a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp index e2f41aa5b3e..52b976586e8 100644 --- a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp +++ b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/storage/src/tests/persistence/splitbitdetectortest.cpp b/storage/src/tests/persistence/splitbitdetectortest.cpp index 3251dd9a9a8..47efaaa371e 100644 --- a/storage/src/tests/persistence/splitbitdetectortest.cpp +++ b/storage/src/tests/persistence/splitbitdetectortest.cpp @@ -1,7 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include -#include +#include #include #include #include diff --git a/storage/src/vespa/storage/bucketdb/bucketmanager.cpp b/storage/src/vespa/storage/bucketdb/bucketmanager.cpp index 0570d0a3e27..18fc5efb4b5 100644 --- a/storage/src/vespa/storage/bucketdb/bucketmanager.cpp +++ b/storage/src/vespa/storage/bucketdb/bucketmanager.cpp @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include diff --git a/storage/src/vespa/storage/bucketmover/bucketmover.cpp b/storage/src/vespa/storage/bucketmover/bucketmover.cpp index e4ddc3cb5a7..bda0a394802 100644 --- a/storage/src/vespa/storage/bucketmover/bucketmover.cpp +++ b/storage/src/vespa/storage/bucketmover/bucketmover.cpp @@ -6,6 +6,7 @@ #include #include #include +#include LOG_SETUP(".bucketmover"); diff --git a/storage/src/vespa/storage/distributor/operations/operation.cpp b/storage/src/vespa/storage/distributor/operations/operation.cpp index 37e997d6080..8f6acc3258d 100644 --- a/storage/src/vespa/storage/distributor/operations/operation.cpp +++ b/storage/src/vespa/storage/distributor/operations/operation.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include LOG_SETUP(".distributor.callback"); diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp index a3c8fc3d671..43d5de4a5a0 100644 --- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp +++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp @@ -17,6 +17,7 @@ #include #include #include +#include LOG_SETUP(".persistence.filestor.manager"); diff --git a/storage/src/vespa/storage/storageserver/mergethrottler.cpp b/storage/src/vespa/storage/storageserver/mergethrottler.cpp index 577fedb58e1..ede7be3b9ad 100644 --- a/storage/src/vespa/storage/storageserver/mergethrottler.cpp +++ b/storage/src/vespa/storage/storageserver/mergethrottler.cpp @@ -2,9 +2,9 @@ #include "mergethrottler.h" #include "storagemetricsset.h" -#include #include #include +#include #include #include #include diff --git a/storage/src/vespa/storage/tools/generatedistributionbits.cpp b/storage/src/vespa/storage/tools/generatedistributionbits.cpp index 53c7c7cf1a1..3f5b3f4ae3d 100644 --- a/storage/src/vespa/storage/tools/generatedistributionbits.cpp +++ b/storage/src/vespa/storage/tools/generatedistributionbits.cpp @@ -1,9 +1,11 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + #include #include #include #include #include +#include #include #include #include diff --git a/storage/src/vespa/storage/visiting/countvisitor.cpp b/storage/src/vespa/storage/visiting/countvisitor.cpp index 282e2f32873..ca6678c1b3d 100644 --- a/storage/src/vespa/storage/visiting/countvisitor.cpp +++ b/storage/src/vespa/storage/visiting/countvisitor.cpp @@ -3,6 +3,7 @@ #include "countvisitor.h" #include #include +#include #include LOG_SETUP(".visitor.instance.countvisitor"); diff --git a/storage/src/vespa/storage/visiting/visitor.cpp b/storage/src/vespa/storage/visiting/visitor.cpp index 704b523a3b6..6940706e211 100644 --- a/storage/src/vespa/storage/visiting/visitor.cpp +++ b/storage/src/vespa/storage/visiting/visitor.cpp @@ -10,7 +10,9 @@ #include #include #include +#include #include + #include LOG_SETUP(".visitor.instance"); diff --git a/storage/src/vespa/storage/visiting/visitormanager.cpp b/storage/src/vespa/storage/visiting/visitormanager.cpp index 7b8ce974ca9..0df82dad80f 100644 --- a/storage/src/vespa/storage/visiting/visitormanager.cpp +++ b/storage/src/vespa/storage/visiting/visitormanager.cpp @@ -8,10 +8,9 @@ #include "testvisitor.h" #include "recoveryvisitor.h" #include -#include #include -#include #include +#include #include LOG_SETUP(".visitor.manager"); diff --git a/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp b/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp index 5ca14fd617d..074070d2ccd 100644 --- a/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp @@ -2,6 +2,7 @@ #include "hitcollector.h" #include +#include #include LOG_SETUP(".searchvisitor.hitcollector"); diff --git a/streamingvisitors/src/vespa/searchvisitor/rankmanager.cpp b/streamingvisitors/src/vespa/searchvisitor/rankmanager.cpp index d25154aba7f..4befe163377 100644 --- a/streamingvisitors/src/vespa/searchvisitor/rankmanager.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/rankmanager.cpp @@ -3,7 +3,7 @@ #include "rankmanager.h" #include #include -#include +#include #include LOG_SETUP(".searchvisitor.rankmanager"); @@ -106,7 +106,7 @@ RankManager::Snapshot::initRankSetup(const BlueprintFactory & factory) LOG(debug, "Number of index environments and rank setups: %u", (uint32_t)_indexEnv.size()); LOG_ASSERT(_properties.size() == _rankSetup.size()); for (uint32_t i = 0; i < _properties.size(); ++i) { - vespalib::string number = vespalib::make_vespa_string("%u", i); + vespalib::string number = vespalib::make_string("%u", i); _rpmap[number] = i; } for (uint32_t i = 0; i < _properties.size(); ++i) { diff --git a/vdslib/src/tests/container/documentlisttest.cpp b/vdslib/src/tests/container/documentlisttest.cpp index 5120c4efa05..02e2d0fd935 100644 --- a/vdslib/src/tests/container/documentlisttest.cpp +++ b/vdslib/src/tests/container/documentlisttest.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include diff --git a/vdstestlib/src/vespa/vdstestlib/cppunit/dirconfig.cpp b/vdstestlib/src/vespa/vdstestlib/cppunit/dirconfig.cpp index 64ff1377128..5e1c7c6b1b4 100644 --- a/vdstestlib/src/vespa/vdstestlib/cppunit/dirconfig.cpp +++ b/vdstestlib/src/vespa/vdstestlib/cppunit/dirconfig.cpp @@ -4,6 +4,7 @@ #include #include +#include #include #include diff --git a/vespaclient/src/vespa/vespaclient/vespadoclocator/locator.cpp b/vespaclient/src/vespa/vespaclient/vespadoclocator/locator.cpp index 030f284c182..af805d461fc 100644 --- a/vespaclient/src/vespa/vespaclient/vespadoclocator/locator.cpp +++ b/vespaclient/src/vespa/vespaclient/vespadoclocator/locator.cpp @@ -6,8 +6,7 @@ #include #include #include -#include -#include +#include #include diff --git a/vespaclient/src/vespa/vespaclient/vesparoute/application.cpp b/vespaclient/src/vespa/vespaclient/vesparoute/application.cpp index e9482c1eddc..baf7c01d631 100644 --- a/vespaclient/src/vespa/vespaclient/vesparoute/application.cpp +++ b/vespaclient/src/vespa/vespaclient/vesparoute/application.cpp @@ -12,7 +12,7 @@ #include #include #include - +#include using config::ConfigGetter; using document::DocumenttypesConfig; diff --git a/vespalib/src/tests/exception_classes/exception_classes_test.cpp b/vespalib/src/tests/exception_classes/exception_classes_test.cpp index 946c3fa32e4..a418cb421ed 100644 --- a/vespalib/src/tests/exception_classes/exception_classes_test.cpp +++ b/vespalib/src/tests/exception_classes/exception_classes_test.cpp @@ -1,6 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include #include +#include using namespace vespalib; diff --git a/vespalib/src/vespa/vespalib/io/fileutil.cpp b/vespalib/src/vespa/vespalib/io/fileutil.cpp index c9778971efd..2e3994d329f 100644 --- a/vespalib/src/vespa/vespalib/io/fileutil.cpp +++ b/vespalib/src/vespa/vespalib/io/fileutil.cpp @@ -1,16 +1,12 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "fileutil.h" - -#include -#include -#include -#include -#include #include -#include #include +#include #include +#include +#include #include LOG_SETUP(".vespalib.io.fileutil"); diff --git a/vespalib/src/vespa/vespalib/objects/nbostream.cpp b/vespalib/src/vespa/vespalib/objects/nbostream.cpp index ec04ffb8b3b..e37399bdfcc 100644 --- a/vespalib/src/vespa/vespalib/objects/nbostream.cpp +++ b/vespalib/src/vespa/vespalib/objects/nbostream.cpp @@ -2,7 +2,7 @@ #include "nbostream.hpp" #include "hexdump.h" #include - +#include namespace vespalib { diff --git a/vespalib/src/vespa/vespalib/util/exception.h b/vespalib/src/vespa/vespalib/util/exception.h index 44911ea5555..05f48295bfa 100644 --- a/vespalib/src/vespa/vespalib/util/exception.h +++ b/vespalib/src/vespa/vespalib/util/exception.h @@ -5,7 +5,6 @@ #include #include -#include #include #define VESPALIB_EXCEPTION_USEBACKTRACES diff --git a/vespalib/src/vespa/vespalib/util/exceptions.h b/vespalib/src/vespa/vespalib/util/exceptions.h index 65d17baf654..ca05dac107f 100644 --- a/vespalib/src/vespa/vespalib/util/exceptions.h +++ b/vespalib/src/vespa/vespalib/util/exceptions.h @@ -13,6 +13,7 @@ #pragma once #include +#include namespace vespalib { -- cgit v1.2.3