diff options
| author | Tor Egge <Tor.Egge@yahoo-inc.com> | 2016-11-04 13:05:08 +0000 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@yahoo-inc.com> | 2016-11-04 13:05:08 +0000 |
| commit | 28d80634f49ca5fc9d4f7df15c357ee2a9b34b87 (patch) | |
| tree | 34f035879d7b649655ff0ee209f19aa359bb413e /searchcore/src/tests/proton/docsummary | |
| parent | 8e97d41a730d82e89a39d46f939e5ad976349deb (diff) | |
Move HwInfo from vespalib to searchcore and simplify code.
Diffstat (limited to 'searchcore/src/tests/proton/docsummary')
| -rw-r--r-- | searchcore/src/tests/proton/docsummary/docsummary.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp index 8d71bba6841..ef3806d04c0 100644 --- a/searchcore/src/tests/proton/docsummary/docsummary.cpp +++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp @@ -24,7 +24,7 @@ LOG_SETUP("docsummary_test"); #include <vespa/vespalib/tensor/tensor_factory.h> #include <vespa/vespalib/tensor/default_tensor.h> #include <vespa/searchlib/tensor/tensor_attribute.h> -#include <vespa/vespalib/util/mock_hw_info.h> +#include <vespa/searchcore/proton/common/hw_info.h> using namespace document; using namespace search; @@ -144,7 +144,7 @@ public: DocumentDBConfig::DocumenttypesConfigSP _documenttypesConfig; const DocumentTypeRepo::SP _repo; TuneFileDocumentDB::SP _tuneFileDocumentDB; - std::shared_ptr<vespalib::IHwInfo> _hwInfo; + HwInfo _hwInfo; std::unique_ptr<DocumentDB> _ddb; AttributeWriter::UP _aw; ISummaryAdapter::SP _sa; @@ -163,7 +163,7 @@ public: _documenttypesConfig(new DocumenttypesConfig()), _repo(repo), _tuneFileDocumentDB(new TuneFileDocumentDB()), - _hwInfo(std::make_shared<vespalib::MockHwInfo>()), + _hwInfo(), _ddb(), _aw(), _sa() |