Use std::optional instead of std::experimental::optional.

3 files changed, 4 insertions, 4 deletions

diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_index.h b/searchlib/src/vespa/searchlib/predicate/predicate_index.h
index 196c1df16de..b0fb0eda4c5 100644
--- a/searchlib/src/vespa/searchlib/predicate/predicate_index.h
+++ b/searchlib/src/vespa/searchlib/predicate/predicate_index.h
@@ -29,7 +29,7 @@ class PredicateIndex : public PopulateInterface {
     using FeatureMap = std::unordered_map<uint64_t, std::vector<IntervalT>>;
     using generation_t = vespalib::GenerationHandler::generation_t;
     template <typename T>
-    using optional = std::experimental::optional<T>;
+    using optional = std::optional<T>;
 
 public:
     typedef std::unique_ptr<PredicateIndex> UP;
diff --git a/searchlib/src/vespa/searchlib/predicate/simple_index.h b/searchlib/src/vespa/searchlib/predicate/simple_index.h
index 4edc0ff2d14..986b46d7008 100644
--- a/searchlib/src/vespa/searchlib/predicate/simple_index.h
+++ b/searchlib/src/vespa/searchlib/predicate/simple_index.h
@@ -6,7 +6,7 @@
 #include <vespa/vespalib/btree/btreestore.h>
 #include <vespa/vespalib/data/databuffer.h>
 #include <vespa/vespalib/util/rcuvector.h>
-#include <experimental/optional>
+#include <optional>
 
 namespace search::predicate {
 
@@ -139,7 +139,7 @@ private:
     using GenerationHolder = vespalib::GenerationHolder;
     using generation_t = vespalib::GenerationHandler::generation_t;
     template <typename T>
-    using optional = std::experimental::optional<T>;
+    using optional = std::optional<T>;
 
     Dictionary _dictionary;
     BTreeStore _btree_posting_lists;
diff --git a/searchlib/src/vespa/searchlib/queryeval/predicate_blueprint.h b/searchlib/src/vespa/searchlib/queryeval/predicate_blueprint.h
index 3d92b19c421..16b725cd4b0 100644
--- a/searchlib/src/vespa/searchlib/queryeval/predicate_blueprint.h
+++ b/searchlib/src/vespa/searchlib/queryeval/predicate_blueprint.h
@@ -56,7 +56,7 @@ private:
     using BTreeIterator = predicate::SimpleIndex<datastore::EntryRef>::BTreeIterator;
     using VectorIterator = predicate::SimpleIndex<datastore::EntryRef>::VectorIterator;
     template <typename T>
-    using optional = std::experimental::optional<T>;
+    using optional = std::optional<T>;
     using Alloc = vespalib::alloc::Alloc;
 
     const PredicateAttribute & predicate_attribute() const {