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/documentdb/document_subdbs/document_subdbs_test.cpp | |
| parent | 8e97d41a730d82e89a39d46f939e5ad976349deb (diff) | |
Move HwInfo from vespalib to searchcore and simplify code.
Diffstat (limited to 'searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp')
| -rw-r--r-- | searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp index d72ddc5a2a8..152b1f5cf29 100644 --- a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp +++ b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp @@ -21,7 +21,7 @@ LOG_SETUP("document_subdbs_test"); #include <vespa/vespalib/io/fileutil.h> #include <vespa/vespalib/test/insertion_operators.h> #include <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/util/mock_hw_info.h> +#include <vespa/searchcore/proton/common/hw_info.h> #include <iostream> @@ -128,7 +128,7 @@ struct MyStoreOnlyContext MyFileHeaderContext _fileHeader; LegacyDocumentDBMetrics _metrics; vespalib::Lock _configLock; - std::shared_ptr<vespalib::IHwInfo> _hwInfo; + HwInfo _hwInfo; StoreOnlyContext _ctx; MyStoreOnlyContext(IThreadingService &writeService, ThreadStackExecutorBase &summaryExecutor, @@ -141,7 +141,7 @@ struct MyStoreOnlyContext _fileHeader(), _metrics(DOCTYPE_NAME, 1), _configLock(), - _hwInfo(std::make_shared<vespalib::MockHwInfo>()), + _hwInfo(), _ctx(_owner, _syncProxy, _getSerialNum, |