mirrors/CLI11
1
0
Fork 0
mirror of https://github.com/CLIUtils/CLI11.git synced 2025-05-02 05:33:53 +00:00
Code Issues Releases Wiki Activity

Fix for experimental optional with optional #158

Browse Source
This commit is contained in:
Henry Fredrick Schreiner 2018-09-03 20:24:30 +02:00 committed by Henry Schreiner
parent 7e724c5cf3
commit b53eb51603
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/CLI/Optional.hpp
View File

@ -10,13 +10,16 @@
// [CLI11:verbatim] // [CLI11:verbatim]
#ifdef __has_include #ifdef __has_include
// You can explicitly enable or disable support
// by defining these to 1 or 0.
#if defined(CLI11_CPP17) && __has_include(<optional>) && \ #if defined(CLI11_CPP17) && __has_include(<optional>) && \
!defined(CLI11_STD_OPTIONAL) !defined(CLI11_STD_OPTIONAL)
#define CLI11_STD_OPTIONAL 1 #define CLI11_STD_OPTIONAL 1
#endif #endif
#if defined(CLI11_CPP14) && __has_include(<experimental/optional>) && \ #if defined(CLI11_CPP14) && __has_include(<experimental/optional>) && \
!defined(CLI11_EXPERIMENTAL_OPTIONAL) !defined(CLI11_EXPERIMENTAL_OPTIONAL) \
&& (!defined(CLI11_STD_OPTIONAL) || CLI11_STD_OPTIONAL != 0)
#define CLI11_EXPERIMENTAL_OPTIONAL 1 #define CLI11_EXPERIMENTAL_OPTIONAL 1
#endif #endif