From 28abc94084b450de58c278d9654b13fd5ec49eec Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 16 Aug 2018 11:23:15 -0700 Subject: [boost-python] Apply fix for MSVC /permissive- --- ports/boost-python/unwind-type.patch | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 ports/boost-python/unwind-type.patch (limited to 'ports/boost-python/unwind-type.patch') diff --git a/ports/boost-python/unwind-type.patch b/ports/boost-python/unwind-type.patch new file mode 100644 index 000000000..62e9c8185 --- /dev/null +++ b/ports/boost-python/unwind-type.patch @@ -0,0 +1,31 @@ +diff --git a/include/boost/python/detail/unwind_type.hpp b/include/boost/python/detail/unwind_type.hpp +index f6cdab6..da9633b 100644 +--- a/include/boost/python/detail/unwind_type.hpp ++++ b/include/boost/python/detail/unwind_type.hpp +@@ -11,7 +11,7 @@ + + namespace boost { namespace python { namespace detail { + +-#ifndef _MSC_VER //if forward declared, msvc6.5 does not recognize them as inline ++#if !defined(_MSC_VER) || _MSC_VER >= 1915 //if forward declared, msvc6.5 does not recognize them as inline + // forward declaration, required (at least) by Tru64 cxx V6.5-042 + template + inline typename Generator::result_type +@@ -83,7 +83,7 @@ struct unwind_helper + + template + inline typename Generator::result_type +-#ifndef _MSC_VER ++#if !defined(_MSC_VER) || _MSC_VER >= 1915 + unwind_type(U const& p, Generator*) + #else + unwind_type(U const& p, Generator* = 0) +@@ -148,7 +148,7 @@ struct unwind_helper2 + // why bother? + template + inline typename Generator::result_type +-#ifndef _MSC_VER ++#if !defined(_MSC_VER) || _MSC_VER >= 1915 + unwind_type(boost::type*, Generator*) + #else + unwind_type(boost::type*p =0, Generator* =0) -- cgit v1.2.3