Get VESPA_DLL_LOCAL from vespa/fastos/types.h

26 files changed, 35 insertions, 70 deletions

diff --git a/document/src/vespa/document/fieldvalue/stringfieldvalue.h b/document/src/vespa/document/fieldvalue/stringfieldvalue.h
index 17a0302f6f9..07e9e578692 100644
--- a/document/src/vespa/document/fieldvalue/stringfieldvalue.h
+++ b/document/src/vespa/document/fieldvalue/stringfieldvalue.h
@@ -11,7 +11,6 @@
 #include <vespa/document/annotation/spantree.h>
 #include <vespa/vespalib/stllike/hash_map.h>
 #include <vespa/vespalib/util/buffer.h>
-#include <vespa/fastos/dynamiclibrary.h>
 
 namespace document {
 
diff --git a/fastos/src/vespa/fastos/types.h b/fastos/src/vespa/fastos/types.h
index a0806204e66..69dd3e5231c 100644
--- a/fastos/src/vespa/fastos/types.h
+++ b/fastos/src/vespa/fastos/types.h
@@ -4,3 +4,6 @@
 
 #define FASTOS_PREFIX(a) FastOS_##a
 
+// New macros to support the new gcc visibility features.
+#define VESPA_DLL_EXPORT __attribute__ ((visibility("default")))
+#define VESPA_DLL_LOCAL  __attribute__ ((visibility("hidden")))
diff --git a/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.h b/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.h
index 4aa8a3f6392..b133d5a5058 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <vespa/searchlib/queryeval/begin_and_end_id.h>
-#include <vespa/fastos/dynamiclibrary.h>
+#include <vespa/fastos/types.h>
 #include <mutex>
 #include <condition_variable>
 #include <atomic>
diff --git a/searchlib/src/vespa/searchlib/aggregation/group.h b/searchlib/src/vespa/searchlib/aggregation/group.h
index 202c5085133..53061b1447b 100644
--- a/searchlib/src/vespa/searchlib/aggregation/group.h
+++ b/searchlib/src/vespa/searchlib/aggregation/group.h
@@ -5,7 +5,6 @@
 #include "aggregationresult.h"
 #include <vespa/searchlib/common/hitrank.h>
 #include <vespa/vespalib/stllike/hash_set.h>
-#include <vespa/fastos/dynamiclibrary.h>
 #include <vector>
 
 namespace search::aggregation {
diff --git a/searchlib/src/vespa/searchlib/common/bitvector.h b/searchlib/src/vespa/searchlib/common/bitvector.h
index c1d447047d1..02f51fe8758 100644
--- a/searchlib/src/vespa/searchlib/common/bitvector.h
+++ b/searchlib/src/vespa/searchlib/common/bitvector.h
@@ -6,7 +6,7 @@
 #include <memory>
 #include <vespa/vespalib/util/alloc.h>
 #include <vespa/vespalib/util/generationholder.h>
-#include <vespa/fastos/dynamiclibrary.h>
+#include <vespa/fastos/types.h>
 
 namespace vespalib {
     class nbostream;
diff --git a/searchlib/src/vespa/searchlib/common/bitvectorcache.h b/searchlib/src/vespa/searchlib/common/bitvectorcache.h
index 33610afc108..5f8edf29854 100644
--- a/searchlib/src/vespa/searchlib/common/bitvectorcache.h
+++ b/searchlib/src/vespa/searchlib/common/bitvectorcache.h
@@ -4,7 +4,6 @@
 #include "condensedbitvectors.h"
 #include <vespa/vespalib/stllike/hash_set.h>
 #include <vespa/vespalib/stllike/hash_map.h>
-#include <vespa/fastos/dynamiclibrary.h>
 #include <mutex>
 
 namespace search {
diff --git a/searchlib/src/vespa/searchlib/diskindex/zcpostingiterators.h b/searchlib/src/vespa/searchlib/diskindex/zcpostingiterators.h
index e91e06bdf7a..07467e28229 100644
--- a/searchlib/src/vespa/searchlib/diskindex/zcpostingiterators.h
+++ b/searchlib/src/vespa/searchlib/diskindex/zcpostingiterators.h
@@ -5,7 +5,6 @@
 #include <vespa/searchlib/index/postinglistfile.h>
 #include <vespa/searchlib/bitcompression/compression.h>
 #include <vespa/searchlib/queryeval/iterators.h>
-#include <vespa/fastos/dynamiclibrary.h>
 
 namespace search::diskindex {
 
diff --git a/searchlib/src/vespa/searchlib/features/nativefieldmatchfeature.h b/searchlib/src/vespa/searchlib/features/nativefieldmatchfeature.h
index d9375f12d54..1d5ac98a74d 100644
--- a/searchlib/src/vespa/searchlib/features/nativefieldmatchfeature.h
+++ b/searchlib/src/vespa/searchlib/features/nativefieldmatchfeature.h
@@ -4,7 +4,6 @@
 
 #include "nativerankfeature.h"
 #include "queryterm.h"
-#include <vespa/fastos/dynamiclibrary.h>
 
 namespace search::features {
 
diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_posting_list.h b/searchlib/src/vespa/searchlib/predicate/predicate_posting_list.h
index 6ac41c62305..0bf33f1d0e5 100644
--- a/searchlib/src/vespa/searchlib/predicate/predicate_posting_list.h
+++ b/searchlib/src/vespa/searchlib/predicate/predicate_posting_list.h
@@ -3,7 +3,7 @@
 
 #include <memory>
 #include <cstdint>
-#include <vespa/fastos/dynamiclibrary.h>
+#include <vespa/fastos/types.h>
 
 /**
  * Interface for posting lists used by PredicateSearch.
diff --git a/searchlib/src/vespa/searchlib/queryeval/andsearchnostrict.h b/searchlib/src/vespa/searchlib/queryeval/andsearchnostrict.h
index 9707b02ae58..f809d9028c0 100644
--- a/searchlib/src/vespa/searchlib/queryeval/andsearchnostrict.h
+++ b/searchlib/src/vespa/searchlib/queryeval/andsearchnostrict.h
@@ -4,8 +4,7 @@
 
 #include "andsearch.h"
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 /**
  * A simple implementation of the And search operation.
@@ -56,6 +55,4 @@ private:
     Unpack _unpacker;
 };
 
-} // namespace queryeval
-} // namespace search
-
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/andsearchstrict.h b/searchlib/src/vespa/searchlib/queryeval/andsearchstrict.h
index 63cbb77dbc8..96fb706f50c 100644
--- a/searchlib/src/vespa/searchlib/queryeval/andsearchstrict.h
+++ b/searchlib/src/vespa/searchlib/queryeval/andsearchstrict.h
@@ -3,10 +3,8 @@
 #pragma once
 
 #include "andsearchnostrict.h"
-#include <vespa/fastos/dynamiclibrary.h>
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 /**
  * A simple strict implementation of the And search operation.
@@ -105,6 +103,4 @@ AndSearchStrict<Unpack>::andWith(SearchIterator::UP filter, uint32_t estimate_)
     return filter; // Should always be empty, returning it incase logic changes.
 }
 
-} // namespace queryeval
-} // namespace search
-
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/booleanmatchiteratorwrapper.cpp b/searchlib/src/vespa/searchlib/queryeval/booleanmatchiteratorwrapper.cpp
index f259bb3d242..8061160cb5e 100644
--- a/searchlib/src/vespa/searchlib/queryeval/booleanmatchiteratorwrapper.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/booleanmatchiteratorwrapper.cpp
@@ -5,8 +5,7 @@
 #include <vespa/searchlib/fef/termfieldmatchdataarray.h>
 #include <vespa/vespalib/objects/visit.hpp>
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 void
 BooleanMatchIteratorWrapper::doSeek(uint32_t docid)
@@ -41,5 +40,4 @@ BooleanMatchIteratorWrapper::visitMembers(vespalib::ObjectVisitor &visitor) cons
     // _match not visited
 }
 
-} // namespace queryeval
-} // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/elementiterator.h b/searchlib/src/vespa/searchlib/queryeval/elementiterator.h
index 2f46baf087a..aff0fe29779 100644
--- a/searchlib/src/vespa/searchlib/queryeval/elementiterator.h
+++ b/searchlib/src/vespa/searchlib/queryeval/elementiterator.h
@@ -1,7 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <vespa/searchlib/queryeval/searchiterator.h>
+#include "searchiterator.h"
 
 namespace search::fef { class TermFieldMatchData; }
 
diff --git a/searchlib/src/vespa/searchlib/queryeval/emptysearch.h b/searchlib/src/vespa/searchlib/queryeval/emptysearch.h
index dfb294c6e0c..897decb456b 100644
--- a/searchlib/src/vespa/searchlib/queryeval/emptysearch.h
+++ b/searchlib/src/vespa/searchlib/queryeval/emptysearch.h
@@ -5,8 +5,7 @@
 #include "searchiterator.h"
 #include <vespa/searchlib/common/bitvector.h>
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 /** Search iterator that never yields any hits. */
 class EmptySearch : public SearchIterator
@@ -28,5 +27,4 @@ public:
     ~EmptySearch();
 };
 
-} // namespace queryeval
-} // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/equiv_blueprint.h b/searchlib/src/vespa/searchlib/queryeval/equiv_blueprint.h
index 126d395ddb2..706e05f0156 100644
--- a/searchlib/src/vespa/searchlib/queryeval/equiv_blueprint.h
+++ b/searchlib/src/vespa/searchlib/queryeval/equiv_blueprint.h
@@ -5,8 +5,7 @@
 #include "blueprint.h"
 #include <vespa/searchlib/fef/matchdatalayout.h>
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 class EquivBlueprint : public ComplexLeafBlueprint
 {
@@ -32,5 +31,4 @@ public:
     bool isEquiv() const override { return true; }
 };
 
-} // namespace queryeval
-} // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/fake_result.cpp b/searchlib/src/vespa/searchlib/queryeval/fake_result.cpp
index 8b02dd1d6c9..47e53253210 100644
--- a/searchlib/src/vespa/searchlib/queryeval/fake_result.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/fake_result.cpp
@@ -3,8 +3,7 @@
 #include "fake_result.h"
 #include <ostream>
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 FakeResult::FakeResult()
     : _documents(),
@@ -46,5 +45,4 @@ std::ostream &operator << (std::ostream &out, const FakeResult &result) {
     return out;
 }
 
-} // namespace queryeval
-} // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/hitcollector.h b/searchlib/src/vespa/searchlib/queryeval/hitcollector.h
index 85bbe5ee950..54a48e9ce49 100644
--- a/searchlib/src/vespa/searchlib/queryeval/hitcollector.h
+++ b/searchlib/src/vespa/searchlib/queryeval/hitcollector.h
@@ -3,13 +3,13 @@
 #pragma once
 
 #include "scores.h"
+#include "sorted_hit_sequence.h"
 #include <vespa/searchlib/common/hitrank.h>
 #include <vespa/searchlib/common/resultset.h>
+#include <vespa/vespalib/util/sort.h>
 #include <algorithm>
 #include <vector>
-#include <vespa/vespalib/util/sort.h>
-#include <vespa/fastos/dynamiclibrary.h>
-#include "sorted_hit_sequence.h"
+#include <vespa/fastos/types.h>
 
 namespace search::queryeval {
 
diff --git a/searchlib/src/vespa/searchlib/queryeval/monitoring_dump_iterator.cpp b/searchlib/src/vespa/searchlib/queryeval/monitoring_dump_iterator.cpp
index efbc9d96cc6..a4a72807c0c 100644
--- a/searchlib/src/vespa/searchlib/queryeval/monitoring_dump_iterator.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/monitoring_dump_iterator.cpp
@@ -3,8 +3,7 @@
 #include <vespa/log/log.h>
 LOG_SETUP(".queryeval.monitoring_dump_iterator");
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 MonitoringDumpIterator::MonitoringDumpIterator(MonitoringSearchIterator::UP iterator)
     : _search(std::move(iterator))
@@ -31,6 +30,4 @@ MonitoringDumpIterator::doUnpack(uint32_t docId)
     _search->unpack(docId);
 }
 
-}  // namespace queryeval
-}  // namespace search
-
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/monitoring_dump_iterator.h b/searchlib/src/vespa/searchlib/queryeval/monitoring_dump_iterator.h
index 93229d74a39..7dbe04ac860 100644
--- a/searchlib/src/vespa/searchlib/queryeval/monitoring_dump_iterator.h
+++ b/searchlib/src/vespa/searchlib/queryeval/monitoring_dump_iterator.h
@@ -3,8 +3,7 @@
 
 #include "monitoring_search_iterator.h"
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 /**
  * Search iterator that dumps the search stats of the underlying
@@ -29,6 +28,4 @@ public:
     }
 };
 
-} // namespace queryeval
-} // namespace search
-
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/monitoring_search_iterator.cpp b/searchlib/src/vespa/searchlib/queryeval/monitoring_search_iterator.cpp
index d086d7b2ca5..cff62ea7117 100644
--- a/searchlib/src/vespa/searchlib/queryeval/monitoring_search_iterator.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/monitoring_search_iterator.cpp
@@ -8,8 +8,7 @@ LOG_SETUP(".queryeval.monitoring_search_iterator");
 
 using vespalib::make_string;
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 MonitoringSearchIterator::Stats::Stats()
     : _numSeeks(0),
@@ -237,5 +236,4 @@ MonitoringSearchIterator::visitMembers(vespalib::ObjectVisitor &visitor) const
     _search->visitMembers(visitor);
 }
 
-}  // namespace queryeval
-}  // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/monitoring_search_iterator.h b/searchlib/src/vespa/searchlib/queryeval/monitoring_search_iterator.h
index 6345d203f9e..3d20b79a81d 100644
--- a/searchlib/src/vespa/searchlib/queryeval/monitoring_search_iterator.h
+++ b/searchlib/src/vespa/searchlib/queryeval/monitoring_search_iterator.h
@@ -5,8 +5,7 @@
 #include <vespa/vespalib/objects/objectvisitor.h>
 #include <stack>
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 /**
  * Search iterator that monitors an underlying search iterator
@@ -122,6 +121,4 @@ public:
     const Stats &getStats() const { return _stats; }
 };
 
-} // namespace queryeval
-} // namespace search
-
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/nearsearch.cpp b/searchlib/src/vespa/searchlib/queryeval/nearsearch.cpp
index 2966ac06dcc..5297646d7f8 100644
--- a/searchlib/src/vespa/searchlib/queryeval/nearsearch.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/nearsearch.cpp
@@ -8,8 +8,7 @@
 #include <vespa/log/log.h>
 LOG_SETUP(".nearsearch");
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 namespace {
 
@@ -307,5 +306,4 @@ ONearSearch::match(uint32_t docId)
     return false;
 }
 
-} // queryeval
-} // search
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/nearsearch.h b/searchlib/src/vespa/searchlib/queryeval/nearsearch.h
index e2a93171001..bf3fded2717 100644
--- a/searchlib/src/vespa/searchlib/queryeval/nearsearch.h
+++ b/searchlib/src/vespa/searchlib/queryeval/nearsearch.h
@@ -5,8 +5,7 @@
 #include <vespa/searchlib/fef/termfieldmatchdataarray.h>
 #include "andsearch.h"
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 /**
  * The near search base implements the common logic of the near and o-near search.
@@ -145,6 +144,4 @@ public:
 
 };
 
-} // queryeval
-} // search
-
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/sourceblendersearch.cpp b/searchlib/src/vespa/searchlib/queryeval/sourceblendersearch.cpp
index f6d20d88a6c..8357d403000 100644
--- a/searchlib/src/vespa/searchlib/queryeval/sourceblendersearch.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/sourceblendersearch.cpp
@@ -2,7 +2,6 @@
 
 #include "sourceblendersearch.h"
 #include "isourceselector.h"
-#include <vespa/fastos/dynamiclibrary.h>
 #include <vespa/vespalib/objects/visit.hpp>
 #include <vespa/vespalib/util/array.hpp>
 
diff --git a/vespalib/src/vespa/vespalib/btree/btreeiterator.h b/vespalib/src/vespa/vespalib/btree/btreeiterator.h
index e0df9744265..e44be0fb5e7 100644
--- a/vespalib/src/vespa/vespalib/btree/btreeiterator.h
+++ b/vespalib/src/vespa/vespalib/btree/btreeiterator.h
@@ -5,7 +5,6 @@
 #include "btreenode.h"
 #include "btreenodeallocator.h"
 #include "btreetraits.h"
-#include <vespa/fastos/dynamiclibrary.h>
 
 namespace vespalib::btree {
 
diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/avxprivate.hpp b/vespalib/src/vespa/vespalib/hwaccelrated/avxprivate.hpp
index 2e6bccd1857..f5d87e14802 100644
--- a/vespalib/src/vespa/vespalib/hwaccelrated/avxprivate.hpp
+++ b/vespalib/src/vespa/vespalib/hwaccelrated/avxprivate.hpp
@@ -3,7 +3,7 @@
 #pragma once
 
 #include "private_helpers.hpp"
-#include <vespa/fastos/dynamiclibrary.h>
+#include <vespa/fastos/types.h>
 
 namespace vespalib::hwaccelrated::avx {