diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-01-01 22:23:32 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-01-02 10:03:07 +0000 |
commit | 7629021f657614aa4428584a71084e85b52f378b (patch) | |
tree | 862c9a8f1aef6f52ba7b446bd8d2f1d79c8409a6 | |
parent | bbfffa7f5bb5a2f6d8ac388b16aac7ab2796de8e (diff) |
Add definition to avoid missing symbols at -O0
3 files changed, 5 insertions, 8 deletions
diff --git a/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp b/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp index 4a7491130f4..d679319924d 100644 --- a/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp +++ b/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp @@ -1,15 +1,13 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP("enum_comparator_test"); #include <vespa/searchlib/attribute/enumcomparator.h> #include <vespa/vespalib/btree/btreeroot.h> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/searchlib/attribute/enumstore.hpp> -#include <vespa/vespalib/btree/btreenode.hpp> -#include <vespa/vespalib/btree/btreenodeallocator.hpp> -#include <vespa/vespalib/btree/btreeroot.hpp> + +#include <vespa/log/log.h> +LOG_SETUP("enum_comparator_test"); namespace search { diff --git a/vespalib/src/vespa/vespalib/btree/btreeiterator.cpp b/vespalib/src/vespa/vespalib/btree/btreeiterator.cpp index 9444cee975d..4dfc52304ac 100644 --- a/vespalib/src/vespa/vespalib/btree/btreeiterator.cpp +++ b/vespalib/src/vespa/vespalib/btree/btreeiterator.cpp @@ -1,8 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include "btreeiterator.h" -#include "btreeroot.h" -#include "btreenodeallocator.h" #include "btreeiterator.hpp" #include "btreenode.hpp" @@ -10,6 +7,7 @@ namespace search::btree { template class BTreeIteratorBase<uint32_t, uint32_t, NoAggregated>; template class BTreeIteratorBase<uint32_t, BTreeNoLeafData, NoAggregated>; +template class BTreeIteratorBase<datastore::EntryRef, BTreeNoLeafData, NoAggregated>; template class BTreeIteratorBase<uint32_t, int32_t, MinMaxAggregated>; template class BTreeConstIterator<uint32_t, uint32_t, NoAggregated>; template class BTreeConstIterator<uint32_t, BTreeNoLeafData, NoAggregated>; diff --git a/vespalib/src/vespa/vespalib/btree/btreeiterator.h b/vespalib/src/vespa/vespalib/btree/btreeiterator.h index 7c247cd01da..e3ad2147346 100644 --- a/vespalib/src/vespa/vespalib/btree/btreeiterator.h +++ b/vespalib/src/vespa/vespalib/btree/btreeiterator.h @@ -870,6 +870,7 @@ private: extern template class BTreeIteratorBase<uint32_t, uint32_t, NoAggregated>; extern template class BTreeIteratorBase<uint32_t, BTreeNoLeafData, NoAggregated>; +extern template class BTreeIteratorBase<datastore::EntryRef, BTreeNoLeafData, NoAggregated>; extern template class BTreeIteratorBase<uint32_t, int32_t, MinMaxAggregated>; extern template class BTreeConstIterator<uint32_t, uint32_t, NoAggregated>; extern template class BTreeConstIterator<uint32_t, BTreeNoLeafData, NoAggregated>; |