From 72976d34f6694ad6a7f29aa39d3128f98d8ddd42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Fri, 26 Feb 2016 20:46:58 +0100 Subject: [PATCH] Fixes Boost Trac #11832: "clang-cl + boost intrusive = miscompile" --- doc/intrusive.qbk | 7 +++++++ include/boost/intrusive/detail/parent_from_member.hpp | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/intrusive.qbk b/doc/intrusive.qbk index bfa5302..edcb9ec 100644 --- a/doc/intrusive.qbk +++ b/doc/intrusive.qbk @@ -3835,6 +3835,13 @@ to be inserted in intrusive containers are allocated using `std::vector` or `std [section:release_notes Release Notes] +[section:release_notes_boost_1_61_00 Boost 1.61 Release] + +* Fixed bugs: + * [@https://svn.boost.org/trac/boost/ticket/11832 Boost Trac #11832: ['clang-cl + boost intrusive = miscompile]] + +[endsect] + [section:release_notes_boost_1_60_00 Boost 1.60 Release] * [link intrusive.advanced_lookups_insertions Advanced lookup and insertions] in ordered associative containers diff --git a/include/boost/intrusive/detail/parent_from_member.hpp b/include/boost/intrusive/detail/parent_from_member.hpp index e2fd471..275229a 100644 --- a/include/boost/intrusive/detail/parent_from_member.hpp +++ b/include/boost/intrusive/detail/parent_from_member.hpp @@ -24,7 +24,7 @@ #include #include -#if defined(BOOST_MSVC) || ((defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) && defined(BOOST_INTEL)) +#if defined(_MSC_VER) #define BOOST_INTRUSIVE_MSVC_ABI_PTR_TO_MEMBER #include #endif