From ba42457254cc362eddc099f22b60d469cc6369e0 Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Mon, 27 Feb 2017 13:17:51 +0000 Subject: [PATCH] ext: Fix undefined macro in pybind MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I63a2506d3c028f78cacce8308e2f0e4880531dec Signed-off-by: Andreas Sandberg Reviewed-by: Andreas Hansson Reviewed-by: Curtis Dunham Reviewed-on: https://gem5-review.googlesource.com/2230 Reviewed-by: Tony Gutierrez Reviewed-by: Jason Lowe-Power Reviewed-by: Pierre-Yves Péneau --- ext/pybind11/include/pybind11/common.h | 3 ++- ext/pybind11/include/pybind11/stl.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ext/pybind11/include/pybind11/common.h b/ext/pybind11/include/pybind11/common.h index 712c1a5d6..f7a383007 100644 --- a/ext/pybind11/include/pybind11/common.h +++ b/ext/pybind11/include/pybind11/common.h @@ -558,7 +558,8 @@ PYBIND11_DECL_FMT(bool, "?"); struct nodelete { template void operator()(T*) { } }; // overload_cast requires variable templates: C++14 or MSVC 2015 Update 2 -#if defined(PYBIND11_CPP14) || _MSC_FULL_VER >= 190023918 +#if defined(PYBIND11_CPP14) || ( \ + defined(_MSC_FULL_VER) &&_MSC_FULL_VER >= 190023918) #define PYBIND11_OVERLOAD_CAST 1 NAMESPACE_BEGIN(detail) diff --git a/ext/pybind11/include/pybind11/stl.h b/ext/pybind11/include/pybind11/stl.h index d4b0fc914..7d6e8b102 100644 --- a/ext/pybind11/include/pybind11/stl.h +++ b/ext/pybind11/include/pybind11/stl.h @@ -246,7 +246,7 @@ template struct optional_caster { PYBIND11_TYPE_CASTER(T, _("Optional[") + value_conv::name() + _("]")); }; -#if PYBIND11_HAS_OPTIONAL +#ifdef PYBIND11_HAS_OPTIONAL template struct type_caster> : public optional_caster> {}; @@ -254,7 +254,7 @@ template<> struct type_caster : public void_caster {}; #endif -#if PYBIND11_HAS_EXP_OPTIONAL +#ifdef PYBIND11_HAS_EXP_OPTIONAL template struct type_caster> : public optional_caster> {}; -- 2.30.2