diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-11-22 09:47:40 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-22 09:47:40 -0800 |
| commit | 45f4b820e5743b89bca3508ba2028cdd5d8bbd17 (patch) | |
| tree | f874a8c4a7392309bdbb86447288597ec0a4a281 /ports/boost-python/unwind-type.patch | |
| parent | 62d67d3bf8eeff1afa8009041fd08b8822676b7b (diff) | |
| parent | 8831e8f25f1ff6546ee4a5291b91d599421637b3 (diff) | |
| download | vcpkg-45f4b820e5743b89bca3508ba2028cdd5d8bbd17.tar.gz vcpkg-45f4b820e5743b89bca3508ba2028cdd5d8bbd17.zip | |
Merge branch 'master' into vcpkg_nuget
Diffstat (limited to 'ports/boost-python/unwind-type.patch')
| -rw-r--r-- | ports/boost-python/unwind-type.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/ports/boost-python/unwind-type.patch b/ports/boost-python/unwind-type.patch deleted file mode 100644 index 62e9c8185..000000000 --- a/ports/boost-python/unwind-type.patch +++ /dev/null @@ -1,31 +0,0 @@ -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)
|