Delay instantiation of enum store dictionary to after unique store is instantiated.

This should ensure that it compiles using clang.

2 files changed, 8 insertions, 0 deletions

diff --git a/vespalib/src/vespa/vespalib/datastore/unique_store.h b/vespalib/src/vespa/vespalib/datastore/unique_store.h
index cbaa6aa7db0..5758c7e3481 100644
--- a/vespalib/src/vespa/vespalib/datastore/unique_store.h
+++ b/vespalib/src/vespa/vespalib/datastore/unique_store.h
@@ -49,6 +49,7 @@ public:
     UniqueStore();
     UniqueStore(std::unique_ptr<IUniqueStoreDictionary> dict);
     ~UniqueStore();
+    void set_dictionary(std::unique_ptr<IUniqueStoreDictionary> dict);
     UniqueStoreAddResult add(EntryConstRefType value);
     EntryRef find(EntryConstRefType value);
     EntryConstRefType get(EntryRef ref) const { return _allocator.get(ref); }
diff --git a/vespalib/src/vespa/vespalib/datastore/unique_store.hpp b/vespalib/src/vespa/vespalib/datastore/unique_store.hpp
index abac2888a34..33830bbe4ab 100644
--- a/vespalib/src/vespa/vespalib/datastore/unique_store.hpp
+++ b/vespalib/src/vespa/vespalib/datastore/unique_store.hpp
@@ -45,6 +45,13 @@ template <typename EntryT, typename RefT, typename Compare, typename Allocator>
 UniqueStore<EntryT, RefT, Compare, Allocator>::~UniqueStore() = default;
 
 template <typename EntryT, typename RefT, typename Compare, typename Allocator>
+void
+UniqueStore<EntryT, RefT, Compare, Allocator>::set_dictionary(std::unique_ptr<IUniqueStoreDictionary> dict)
+{
+    _dict = std::move(dict);
+}
+
+template <typename EntryT, typename RefT, typename Compare, typename Allocator>
 UniqueStoreAddResult
 UniqueStore<EntryT, RefT, Compare, Allocator>::add(EntryConstRefType value)
 {