diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-11-30 13:03:07 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-12 02:55:41 +0100 |
| commit | c650f2f379179780d428fb5505a0ed3d52f48ba4 (patch) | |
| tree | 5780a899b56d66aa8172c3ab296afc4f778915d1 /vdslib | |
| parent | f1d0f2af6b0bae3042b77f37b2461aa1229eca45 (diff) | |
Targeted include.
Diffstat (limited to 'vdslib')
| -rw-r--r-- | vdslib/src/vespa/vdslib/container/documentlist.cpp | 11 | ||||
| -rw-r--r-- | vdslib/src/vespa/vdslib/distribution/distribution.cpp | 1 | ||||
| -rw-r--r-- | vdslib/src/vespa/vdslib/state/clusterstate.cpp | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/vdslib/src/vespa/vdslib/container/documentlist.cpp b/vdslib/src/vespa/vdslib/container/documentlist.cpp index 10c942f3002..5fcedc588bc 100644 --- a/vdslib/src/vespa/vdslib/container/documentlist.cpp +++ b/vdslib/src/vespa/vdslib/container/documentlist.cpp @@ -1,8 +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/vdslib/container/documentlist.h> +#include "documentlist.h" #include <vespa/vespalib/util/exceptions.h> -#include <iostream> +#include <sstream> +#include <vespa/document/util/stringutil.h> +#include <vespa/document/util/serializableexceptions.h> #include <vespa/log/log.h> LOG_SETUP(".vdslib.container.documentlist"); @@ -422,7 +423,7 @@ DocumentList::checkConsistency(bool do_memset) i, curEnd, prevStart); std::ostringstream oss; print(oss, true, ""); - std::cerr << "Dumping DocumentList: " << oss.str() << "\n"; + fprintf(stderr, "%s\n", oss.str().c_str()); assert(!"DocumentList has overlapping blocks!"); } if (curEnd < prevStart) { @@ -469,7 +470,7 @@ DocumentList::print(std::ostream& out, bool verbose, entry.print(out, indent + " "); if (entry.headerPos + entry.headerLen > _bufferSize || entry.bodyPos + entry.bodyLen > _bufferSize) { - std::cerr << " Invalid entry. Aborting print.)"; + fprintf(stderr, " Invalid entry. Aborting print.\n"); return; } } diff --git a/vdslib/src/vespa/vdslib/distribution/distribution.cpp b/vdslib/src/vespa/vdslib/distribution/distribution.cpp index f732dea1030..da3fa2f3302 100644 --- a/vdslib/src/vespa/vdslib/distribution/distribution.cpp +++ b/vdslib/src/vespa/vdslib/distribution/distribution.cpp @@ -15,6 +15,7 @@ #include <vespa/config/common/misc.h> #include <vespa/config/print/asciiconfigwriter.h> #include <vespa/config/print/asciiconfigreader.h> +#include <vespa/vespalib/util/exceptions.h> #include <vespa/log/log.h> LOG_SETUP(".vdslib.distribution"); diff --git a/vdslib/src/vespa/vdslib/state/clusterstate.cpp b/vdslib/src/vespa/vdslib/state/clusterstate.cpp index ce3dffbfb82..97ce96fc5e3 100644 --- a/vdslib/src/vespa/vdslib/state/clusterstate.cpp +++ b/vdslib/src/vespa/vdslib/state/clusterstate.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/vdslib/state/clusterstate.h> #include <vespa/vespalib/text/stringtokenizer.h> #include <vespa/document/util/stringutil.h> -#include <vespa/log/log.h> #include <sstream> #include <vespa/vdslib/distribution/distribution.h> +#include <vespa/vespalib/util/exceptions.h> +#include <vespa/log/log.h> LOG_SETUP(".vdslib.state.cluster"); |