remove optional.h and include optional directly

aminya · aminya · commit b0702ea0532f · 2020-12-04T13:53:11.000-06:00
diff --git a/src/bindings/em/auto-wrap.h b/src/bindings/em/auto-wrap.h
@@ -7,7 +7,8 @@
 #include <emscripten/val.h>
 #include "flat_set.h"
 #include "marker-index.h"
-#include "optional.h"
+#include <optional>
+using std::optional;
 #include "point.h"
 #include "text.h"
 
diff --git a/src/bindings/marker-index-wrapper.cc b/src/bindings/marker-index-wrapper.cc
@@ -3,7 +3,8 @@
 #include "marker-index.h"
 #include "nan.h"
 #include "noop.h"
-#include "optional.h"
+#include <optional>
+using std::optional;
 #include "point-wrapper.h"
 #include "range.h"
 
diff --git a/src/bindings/marker-index-wrapper.h b/src/bindings/marker-index-wrapper.h
@@ -1,6 +1,7 @@
 #include "nan.h"
 #include "marker-index.h"
-#include "optional.h"
+#include <optional>
+using std::optional;
 #include "range.h"
 
 class MarkerIndexWrapper : public Nan::ObjectWrap {
diff --git a/src/bindings/number-conversion.h b/src/bindings/number-conversion.h
@@ -2,7 +2,8 @@
 #define SUPERSTRING_NUMBER_CONVERSION_H
 
 #include "nan.h"
-#include "optional.h"
+#include <optional>
+using std::optional;
 
 namespace number_conversion {
   template<typename T>
diff --git a/src/bindings/point-wrapper.h b/src/bindings/point-wrapper.h
@@ -2,7 +2,8 @@
 #define SUPERSTRING_POINT_WRAPPER_H
 
 #include "nan.h"
-#include "optional.h"
+#include <optional>
+using std::optional;
 #include "point.h"
 
 class PointWrapper : public Nan::ObjectWrap {
diff --git a/src/bindings/range-wrapper.h b/src/bindings/range-wrapper.h
@@ -2,7 +2,8 @@
 #define SUPERSTRING_RANGE_WRAPPER_H
 
 #include "nan.h"
-#include "optional.h"
+#include <optional>
+using std::optional;
 #include "point.h"
 #include "range.h"
 
diff --git a/src/bindings/string-conversion.h b/src/bindings/string-conversion.h
@@ -3,7 +3,8 @@
 
 #include <string>
 #include "nan.h"
-#include "optional.h"
+#include <optional>
+using std::optional;
 #include "text.h"
 
 namespace string_conversion {
diff --git a/src/core/encoding-conversion.h b/src/core/encoding-conversion.h
@@ -1,7 +1,8 @@
 #ifndef SUPERSTRING_ENCODING_CONVERSION_H_
 #define SUPERSTRING_ENCODING_CONVERSION_H_
 
-#include "optional.h"
+#include <optional>
+using std::optional;
 #include "text.h"
 #include <stdio.h>
 
diff --git a/src/core/optional.h b/src/core/optional.h
diff --git a/src/core/patch.cc b/src/core/patch.cc
@@ -1,5 +1,6 @@
 #include "patch.h"
-#include "optional.h"
+#include <optional>
+using std::optional;
 #include "text.h"
 #include "text-slice.h"
 #include <assert.h>
diff --git a/src/core/patch.h b/src/core/patch.h
@@ -1,7 +1,8 @@
 #ifndef PATCH_H_
 #define PATCH_H_
 
-#include "optional.h"
+#include <optional>
+using std::optional;
 #include "point.h"
 #include "serializer.h"
 #include "text.h"
diff --git a/src/core/regex.h b/src/core/regex.h
@@ -1,7 +1,8 @@
 #ifndef REGEX_H_
 #define REGEX_H_
 
-#include "optional.h"
+#include <optional>
+using std::optional;
 #include <string>
 
 struct pcre2_real_code_16;
diff --git a/src/core/text.h b/src/core/text.h
@@ -7,7 +7,8 @@
 #include <ostream>
 #include "serializer.h"
 #include "point.h"
-#include "optional.h"
+#include <optional>
+using std::optional;
 
 class TextSlice;
 
