Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[boost-python] Apply fix for MSVC /permissive-

This commit is contained in:
Robert Schumacher 2018-08-16 11:23:15 -07:00
parent 97a61f417d
commit 28abc94084
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/boost-python/CONTROL
View File

@ -1,5 +1,5 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-python
Version: 1.67.0-1
Version: 1.67.0-2
Build-Depends: boost-bind, boost-config, boost-core, boost-detail, boost-graph, boost-integer, boost-iterator, boost-mpl, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-utility, boost-vcpkg-helpers, python3
Description: Boost python module

1
ports/boost-python/portfile.cmake
View File

@ -8,6 +8,7 @@ vcpkg_from_github(
REF boost-1.67.0
SHA512 59091af63626cc6e33f76bded8733b5fb044f7139197e6c887e8e279831954c1e8b67341b6b2f3c9dce97e67a166996321ea439609d225dab7f68762423d6211
HEAD_REF master
PATCHES unwind-type.patch
)
# Find Python. Can't use find_package here, but we already know where everything is

31
ports/boost-python/unwind-type.patch Normal file
View File

@ -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 <class Generator, class U>
inline typename Generator::result_type
@@ -83,7 +83,7 @@ struct unwind_helper<false>
template <class Generator, class U>
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<reference_to_pointer_>
// why bother?
template <class Generator, class U>
inline typename Generator::result_type
-#ifndef _MSC_VER
+#if !defined(_MSC_VER) || _MSC_VER >= 1915
unwind_type(boost::type<U>*, Generator*)
#else
unwind_type(boost::type<U>*p =0, Generator* =0)