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

Commit ed87259

Browse files
authored
Merge pull request #2767 from Geod24/revert-2692-std_optional
Revert "std::optional" merged-on-behalf-of: David Nadlinger <code@klickverbot.at>
2 parents fa285ee + 2ee3de3 commit ed87259

File tree

10 files changed

+2
-362
lines changed

10 files changed

+2
-362
lines changed

changelog/std_optional.dd

Lines changed: 0 additions & 3 deletions
This file was deleted.

mak/COPY

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ COPY=\
7575
$(IMPDIR)\core\stdcpp\array.d \
7676
$(IMPDIR)\core\stdcpp\exception.d \
7777
$(IMPDIR)\core\stdcpp\new_.d \
78-
$(IMPDIR)\core\stdcpp\optional.d \
7978
$(IMPDIR)\core\stdcpp\string.d \
8079
$(IMPDIR)\core\stdcpp\string_view.d \
8180
$(IMPDIR)\core\stdcpp\typeinfo.d \

mak/DOCS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ DOCS=\
4747
$(DOCDIR)\core_stdcpp_array.html \
4848
$(DOCDIR)\core_stdcpp_exception.html \
4949
$(DOCDIR)\core_stdcpp_new_.html \
50-
$(DOCDIR)\core_stdcpp_optional.html \
5150
$(DOCDIR)\core_stdcpp_string.html \
5251
$(DOCDIR)\core_stdcpp_string_view.html \
5352
$(DOCDIR)\core_stdcpp_typeinfo.html \

mak/SRCS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ SRCS=\
7373
src\core\stdcpp\array.d \
7474
src\core\stdcpp\exception.d \
7575
src\core\stdcpp\new_.d \
76-
src\core\stdcpp\optional.d \
7776
src\core\stdcpp\string.d \
7877
src\core\stdcpp\string_view.d \
7978
src\core\stdcpp\type_traits.d \

mak/WINDOWS

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,6 @@ $(IMPDIR)\core\stdcpp\exception.d : src\core\stdcpp\exception.d
270270
$(IMPDIR)\core\stdcpp\new_.d : src\core\stdcpp\new_.d
271271
copy $** $@
272272

273-
$(IMPDIR)\core\stdcpp\optional.d : src\core\stdcpp\optional.d
274-
copy $** $@
275-
276273
$(IMPDIR)\core\stdcpp\string.d : src\core\stdcpp\string.d
277274
copy $** $@
278275

setmscver.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ if exist dflags.txt del /q dflags.txt
99
if exist add_tests.txt del /q add_tests.txt
1010
if %_MSC_VER% GTR 1900 echo /std:c++17 > cflags.txt
1111
if %_MSC_VER% GTR 1900 echo -extern-std=c++17 > dflags.txt
12-
if %_MSC_VER% GTR 1900 echo optional string_view > add_tests.txt
12+
if %_MSC_VER% GTR 1900 echo string_view > add_tests.txt
1313
del ver.c ver_raw.txt

src/core/stdcpp/optional.d

Lines changed: 0 additions & 201 deletions
This file was deleted.

test/stdcpp/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ HASCPP17:=`echo wow | $(CXX) -std=c++17 -E -xc++ - > /dev/null 2>&1 && echo yes`
44

55
TESTS:=allocator new
66
TESTS11:=array
7-
TESTS17:=optional string_view
7+
TESTS17:=string_view
88
OLDABITESTS:=
99

1010
ifeq (osx,$(OS))

test/stdcpp/src/optional.cpp

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)