From 0365d491b5ddc9c2cb3b012eb765335490891b63 Mon Sep 17 00:00:00 2001 From: Jason Rhinelander Date: Thu, 8 Jun 2017 16:57:49 -0300 Subject: [PATCH] Remove feature macro for libc++ 3.8 (and possibly others--including the derived version on OS X), doesn't define the macro, but does support std::experimental::optional. This removes the extra macro check and just assumes the header existing is enough, which is what we do for and . --- include/pybind11/stl.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/pybind11/stl.h b/include/pybind11/stl.h index 3d38b5397..535eb4951 100644 --- a/include/pybind11/stl.h +++ b/include/pybind11/stl.h @@ -32,9 +32,7 @@ // std::experimental::optional (but not allowed in c++11 mode) # if defined(PYBIND11_CPP14) && __has_include() # include -# if __cpp_lib_experimental_optional // just in case -# define PYBIND11_HAS_EXP_OPTIONAL 1 -# endif +# define PYBIND11_HAS_EXP_OPTIONAL 1 # endif // std::variant # if defined(PYBIND11_CPP17) && __has_include()