diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-03 19:09:25 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-12 02:55:45 +0100 |
| commit | 13956aed7c7a3413407a5910e447609e286a245e (patch) | |
| tree | c76e46b2222b28933ce0e753de0d63eeb1085773 /storage | |
| parent | 86b600a7e6d0153f8e22a1ea468a72215d0c36a1 (diff) | |
Do not bring in nbostream everywhere.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/src/tests/persistence/mergehandlertest.cpp | 2 | ||||
| -rw-r--r-- | storage/src/tests/persistence/persistencetestutils.cpp | 1 | ||||
| -rw-r--r-- | storage/src/vespa/storage/persistence/mergehandler.cpp | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/storage/src/tests/persistence/mergehandlertest.cpp b/storage/src/tests/persistence/mergehandlertest.cpp index 48d2ef2dc61..19fee57ad7e 100644 --- a/storage/src/tests/persistence/mergehandlertest.cpp +++ b/storage/src/tests/persistence/mergehandlertest.cpp @@ -1,6 +1,5 @@ // 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/document/base/testdocman.h> #include <vespa/storage/persistence/mergehandler.h> #include <vespa/vdstestlib/cppunit/macros.h> @@ -10,6 +9,7 @@ #include <tests/persistence/common/persistenceproviderwrapper.h> #include <tests/distributor/messagesenderstub.h> #include <vespa/storageframework/defaultimplementation/clock/fakeclock.h> +#include <vespa/vespalib/objects/nbostream.h> #include <cmath> LOG_SETUP(".test.persistence.handler.merge"); diff --git a/storage/src/tests/persistence/persistencetestutils.cpp b/storage/src/tests/persistence/persistencetestutils.cpp index 1d5824ed62c..03d73193086 100644 --- a/storage/src/tests/persistence/persistencetestutils.cpp +++ b/storage/src/tests/persistence/persistencetestutils.cpp @@ -5,6 +5,7 @@ #include <tests/persistence/persistencetestutils.h> #include <vespa/persistence/dummyimpl/dummypersistence.h> #include <vespa/document/update/assignvalueupdate.h> +#include <vespa/vespalib/objects/nbostream.h> using document::DocumentType; using storage::framework::defaultimplementation::AllocationLogic; diff --git a/storage/src/vespa/storage/persistence/mergehandler.cpp b/storage/src/vespa/storage/persistence/mergehandler.cpp index c657640158d..a3cec6a8b77 100644 --- a/storage/src/vespa/storage/persistence/mergehandler.cpp +++ b/storage/src/vespa/storage/persistence/mergehandler.cpp @@ -6,6 +6,7 @@ #include <vespa/vdslib/distribution/distribution.h> #include <vespa/document/fieldset/fieldsets.h> #include <vespa/storage/common/bucketoperationlogger.h> +#include <vespa/vespalib/objects/nbostream.h> #include <vespa/log/log.h> LOG_SETUP(".persistence.mergehandler"); |