diff -Nru boost1.62-1.62.0+dfsg/debian/changelog boost1.62-1.62.0+dfsg/debian/changelog --- boost1.62-1.62.0+dfsg/debian/changelog 2017-11-07 08:50:59.000000000 +0000 +++ boost1.62-1.62.0+dfsg/debian/changelog 2018-01-06 20:44:32.000000000 +0000 @@ -1,33 +1,10 @@ -boost1.62 (1.62.0+dfsg-4build5) bionic; urgency=medium +boost1.62 (1.62.0+dfsg-5) unstable; urgency=medium - * No-change rebuild for icu soname change. + * patches/flat-map-remove-partial-specializations.patch: New. Upstream + patch to remove now-unnecessary partial specializations. Closes: + #883987. - -- Matthias Klose Tue, 07 Nov 2017 08:50:59 +0000 - -boost1.62 (1.62.0+dfsg-4build4) bionic; urgency=medium - - * No-change rebuild for libicu soname change. - - -- Matthias Klose Wed, 25 Oct 2017 15:38:04 +0000 - -boost1.62 (1.62.0+dfsg-4build3) artful; urgency=medium - - * No-change rebuild to build with python3.6. - - -- Matthias Klose Mon, 24 Jul 2017 13:49:07 +0000 - -boost1.62 (1.62.0+dfsg-4build2) artful; urgency=medium - - * No-change rebuild to pick up -fPIE compiler default in static - libraries - - -- Steve Langasek Fri, 02 Jun 2017 22:26:02 +0000 - -boost1.62 (1.62.0+dfsg-4build1) artful; urgency=medium - - * No change rebuild to add Python 3.6 support. - - -- Michael Hudson-Doyle Fri, 12 May 2017 11:18:00 +1200 + -- Steve M. Robbins Sat, 06 Jan 2018 14:44:32 -0600 boost1.62 (1.62.0+dfsg-4) unstable; urgency=medium diff -Nru boost1.62-1.62.0+dfsg/debian/patches/flat-map-remove-partial-specializations.patch boost1.62-1.62.0+dfsg/debian/patches/flat-map-remove-partial-specializations.patch --- boost1.62-1.62.0+dfsg/debian/patches/flat-map-remove-partial-specializations.patch 1970-01-01 00:00:00.000000000 +0000 +++ boost1.62-1.62.0+dfsg/debian/patches/flat-map-remove-partial-specializations.patch 2018-01-06 20:44:32.000000000 +0000 @@ -0,0 +1,52 @@ +From 5e4a107e82ab3281688311d22d2bfc2fddcf84a3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= +Date: Fri, 25 Nov 2016 23:56:33 +0100 +Subject: [PATCH] Fixes Ticket #12534: flat_map fails to compile if included + after type_traits is instantiated under gcc + +--- + doc/container.qbk | 1 + + include/boost/container/detail/pair.hpp | 30 ------------------------------ + 2 files changed, 1 insertion(+), 30 deletions(-) + +diff --git a/include/boost/container/detail/pair.hpp b/include/boost/container/detail/pair.hpp +index 63d1dead..4abff4b4 100644 +--- a/boost/container/detail/pair.hpp ++++ b/boost/container/detail/pair.hpp +@@ -428,36 +428,6 @@ inline void swap(pair& x, pair& y) + } //namespace container_detail { + } //namespace container { + +- +-//Without this specialization recursive flat_(multi)map instantiation fails +-//because is_enum needs to instantiate the recursive pair, leading to a compilation error). +-//This breaks the cycle clearly stating that pair is not an enum avoiding any instantiation. +-template +-struct is_enum; +- +-template +-struct is_enum< ::boost::container::container_detail::pair > +-{ +- static const bool value = false; +-}; +- +-template +-struct is_enum< ::std::pair > +-{ +- static const bool value = false; +-}; +- +-template +-struct is_class; +- +-//This specialization is needed to avoid instantiation of pair in +-//is_class, and allow recursive maps. +-template +-struct is_class< ::boost::container::container_detail::pair > +-{ +- static const bool value = true; +-}; +- + #ifdef BOOST_NO_CXX11_RVALUE_REFERENCES + + template diff -Nru boost1.62-1.62.0+dfsg/debian/patches/series boost1.62-1.62.0+dfsg/debian/patches/series --- boost1.62-1.62.0+dfsg/debian/patches/series 2016-11-12 18:39:04.000000000 +0000 +++ boost1.62-1.62.0+dfsg/debian/patches/series 2018-01-06 20:36:17.000000000 +0000 @@ -8,3 +8,4 @@ # fixed alternatively? boost-context-use-sysv-not-aapcs.patch no-gcc-march-options.patch upstream-add-degree-reverse_graph.patch +flat-map-remove-partial-specializations.patch