Drop auto exp. optional

CLIUtils · May 12, 2019 · 99648ce · 99648ce
1 parent 64d8bfd
commit 99648ce
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -51,7 +51,6 @@ jobs:
       clang3.4:
         containerImage: silkeh/clang:3.4
         cli11.std: 11
-        cli11.options: -DCLI11_FORCE_LIBCXX=ON
       clang8:
         containerImage: silkeh/clang:8
         cli11.std: 14

diff --git a/include/CLI/Optional.hpp b/include/CLI/Optional.hpp
@@ -19,11 +19,7 @@
 #define CLI11_STD_OPTIONAL 0
 #endif
 
-#if defined(CLI11_CPP14) && __has_include(<experimental/optional>) && \
-    !defined(CLI11_EXPERIMENTAL_OPTIONAL) \
-    && (!defined(CLI11_STD_OPTIONAL) || CLI11_STD_OPTIONAL == 0)
-#define CLI11_EXPERIMENTAL_OPTIONAL 1
-#elif !defined(CLI11_EXPERIMENTAL_OPTIONAL)
+#if !defined(CLI11_EXPERIMENTAL_OPTIONAL)
 #define CLI11_EXPERIMENTAL_OPTIONAL 0
 #endif