[pkg-boost-commits] r15058 - in /boost/branches/1.62.0/debian: changelog patches/flat-map-remove-partial-specializations.patch patches/series

[smr at users.alioth.debian.org]

Author: smr
Date: Sat Jan  6 21:36:57 2018
New Revision: 15058

URL: http://svn.debian.org/wsvn/pkg-boost/?sc=1&rev=15058
Log:
Apply patch to remove unnecessary partial specializations.

Added:
    boost/branches/1.62.0/debian/patches/flat-map-remove-partial-specializations.patch
Modified:
    boost/branches/1.62.0/debian/changelog
    boost/branches/1.62.0/debian/patches/series

Modified: boost/branches/1.62.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boost/boost/branches/1.62.0/debian/changelog?rev=15058&op=diff
==============================================================================
--- boost/branches/1.62.0/debian/changelog	(original)
+++ boost/branches/1.62.0/debian/changelog	Sat Jan  6 21:36:57 2018
@@ -1,3 +1,11 @@
+boost1.62 (1.62.0+dfsg-5) unstable; urgency=medium
+
+  * patches/flat-map-remove-partial-specializations.patch: New.  Upstream
+    patch to remove now-unnecessary partial specializations.  Closes:
+    #883987.
+
+ -- Steve M. Robbins <smr at debian.org>  Sat, 06 Jan 2018 14:44:32 -0600
+
 boost1.62 (1.62.0+dfsg-4) unstable; urgency=medium
 
   * New patch upstream-add-degree-reverse_graph.patch.

Added: boost/branches/1.62.0/debian/patches/flat-map-remove-partial-specializations.patch
URL: http://svn.debian.org/wsvn/pkg-boost/boost/branches/1.62.0/debian/patches/flat-map-remove-partial-specializations.patch?rev=15058&op=file
==============================================================================
--- boost/branches/1.62.0/debian/patches/flat-map-remove-partial-specializations.patch	(added)
+++ boost/branches/1.62.0/debian/patches/flat-map-remove-partial-specializations.patch	Sat Jan  6 21:36:57 2018
@@ -0,0 +1,52 @@
+From 5e4a107e82ab3281688311d22d2bfc2fddcf84a3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= <igaztanaga at gmail.com>
+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<T1, T2>& x, pair<T1, T2>& 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<class T>
+-struct is_enum;
+-
+-template<class T, class U>
+-struct is_enum< ::boost::container::container_detail::pair<T, U> >
+-{
+-   static const bool value = false;
+-};
+-
+-template<class T, class U>
+-struct is_enum< ::std::pair<T, U> >
+-{
+-   static const bool value = false;
+-};
+-
+-template <class T>
+-struct is_class;
+-
+-//This specialization is needed to avoid instantiation of pair in
+-//is_class, and allow recursive maps.
+-template <class T1, class T2>
+-struct is_class< ::boost::container::container_detail::pair<T1, T2> >
+-{
+-   static const bool value = true;
+-};
+-
+ #ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
+ 
+ template<class T1, class T2>

Modified: boost/branches/1.62.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-boost/boost/branches/1.62.0/debian/patches/series?rev=15058&op=diff
==============================================================================
--- boost/branches/1.62.0/debian/patches/series	(original)
+++ boost/branches/1.62.0/debian/patches/series	Sat Jan  6 21:36:57 2018
@@ -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