Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Commit e1636ad

Browse files
committed
remove optional.h and include optional directly
1 parent ea704b2 commit e1636ad

13 files changed

+24
-19
lines changed

src/bindings/em/auto-wrap.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
#include <emscripten/val.h>
88
#include "flat_set.h"
99
#include "marker-index.h"
10-
#include "optional.h"
10+
#include <optional>
11+
using std::optional;
1112
#include "point.h"
1213
#include "text.h"
1314

src/bindings/marker-index-wrapper.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
#include "marker-index.h"
44
#include "nan.h"
55
#include "noop.h"
6-
#include "optional.h"
6+
#include <optional>
7+
using std::optional;
78
#include "point-wrapper.h"
89
#include "range.h"
910

src/bindings/marker-index-wrapper.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include "nan.h"
22
#include "marker-index.h"
3-
#include "optional.h"
3+
#include <optional>
4+
using std::optional;
45
#include "range.h"
56

67
class MarkerIndexWrapper : public Nan::ObjectWrap {

src/bindings/number-conversion.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
#define SUPERSTRING_NUMBER_CONVERSION_H
33

44
#include "nan.h"
5-
#include "optional.h"
5+
#include <optional>
6+
using std::optional;
67

78
namespace number_conversion {
89
template<typename T>

src/bindings/point-wrapper.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
#define SUPERSTRING_POINT_WRAPPER_H
33

44
#include "nan.h"
5-
#include "optional.h"
5+
#include <optional>
6+
using std::optional;
67
#include "point.h"
78

89
class PointWrapper : public Nan::ObjectWrap {

src/bindings/range-wrapper.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
#define SUPERSTRING_RANGE_WRAPPER_H
33

44
#include "nan.h"
5-
#include "optional.h"
5+
#include <optional>
6+
using std::optional;
67
#include "point.h"
78
#include "range.h"
89

src/bindings/string-conversion.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33

44
#include <string>
55
#include "nan.h"
6-
#include "optional.h"
6+
#include <optional>
7+
using std::optional;
78
#include "text.h"
89

910
namespace string_conversion {

src/core/encoding-conversion.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#ifndef SUPERSTRING_ENCODING_CONVERSION_H_
22
#define SUPERSTRING_ENCODING_CONVERSION_H_
33

4-
#include "optional.h"
4+
#include <optional>
5+
using std::optional;
56
#include "text.h"
67
#include <stdio.h>
78

src/core/optional.h

-7
This file was deleted.

src/core/patch.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "patch.h"
2-
#include "optional.h"
2+
#include <optional>
3+
using std::optional;
34
#include "text.h"
45
#include "text-slice.h"
56
#include <assert.h>

src/core/patch.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#ifndef PATCH_H_
22
#define PATCH_H_
33

4-
#include "optional.h"
4+
#include <optional>
5+
using std::optional;
56
#include "point.h"
67
#include "serializer.h"
78
#include "text.h"

src/core/regex.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#ifndef REGEX_H_
22
#define REGEX_H_
33

4-
#include "optional.h"
4+
#include <optional>
5+
using std::optional;
56
#include <string>
67

78
struct pcre2_real_code_16;

src/core/text.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
#include <ostream>
88
#include "serializer.h"
99
#include "point.h"
10-
#include "optional.h"
10+
#include <optional>
11+
using std::optional;
1112

1213
class TextSlice;
1314

0 commit comments

Comments
 (0)