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 /searchlib/src/tests/sort | |
| parent | 86b600a7e6d0153f8e22a1ea468a72215d0c36a1 (diff) | |
Do not bring in nbostream everywhere.
Diffstat (limited to 'searchlib/src/tests/sort')
| -rw-r--r-- | searchlib/src/tests/sort/sort_test.cpp | 5 | ||||
| -rw-r--r-- | searchlib/src/tests/sort/sortbenchmark.cpp | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/searchlib/src/tests/sort/sort_test.cpp b/searchlib/src/tests/sort/sort_test.cpp index 1af12c7aecb..1fb938a53cd 100644 --- a/searchlib/src/tests/sort/sort_test.cpp +++ b/searchlib/src/tests/sort/sort_test.cpp @@ -1,12 +1,11 @@ // 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/log/log.h> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/searchlib/common/sort.h> #include <vespa/searchlib/common/sortspec.h> #include <vespa/searchlib/common/converters.h> #include <vespa/searchlib/uca/ucaconverter.h> #include <vespa/vespalib/util/array.h> +#include <vespa/vespalib/objects/hexdump.h> #include <vector> #include <fstream> #include <iostream> @@ -14,8 +13,6 @@ #include <stdexcept> #include <unicode/ustring.h> -LOG_SETUP("sort_test"); - using vespalib::Array; using namespace search::common; using namespace search::uca; diff --git a/searchlib/src/tests/sort/sortbenchmark.cpp b/searchlib/src/tests/sort/sortbenchmark.cpp index 1309cf57d5d..f028c81ff7a 100644 --- a/searchlib/src/tests/sort/sortbenchmark.cpp +++ b/searchlib/src/tests/sort/sortbenchmark.cpp @@ -1,12 +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/log/log.h> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/searchlib/common/sort.h> #include <vespa/vespalib/util/array.h> -#include <vector> - -LOG_SETUP("sort_test"); +#include <vespa/vespalib/util/buffer.h> +#include <vespa/vespalib/stllike/string.h> using vespalib::Array; using vespalib::ConstBufferRef; |