[pkg-boost-commits] r15016 - in /boost/trunk/debian: changelog patches/series patches/upstream-add-degree-reverse_graph.patch

[smr at users.alioth.debian.org]

Author: smr
Date: Sat Nov 12 18:47:21 2016
New Revision: 15016

URL: http://svn.debian.org/wsvn/pkg-boost/?sc=1&rev=15016
Log:
Upstream patch to add missing degree() specialization for reverse_graph.  Needed for digikam build.

Added:
    boost/trunk/debian/patches/upstream-add-degree-reverse_graph.patch
Modified:
    boost/trunk/debian/changelog
    boost/trunk/debian/patches/series

Modified: boost/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boost/boost/trunk/debian/changelog?rev=15016&op=diff
==============================================================================
--- boost/trunk/debian/changelog	(original)
+++ boost/trunk/debian/changelog	Sat Nov 12 18:47:21 2016
@@ -1,3 +1,9 @@
+boost1.62 (1.62.0+dfsg-4) unstable; urgency=medium
+
+  * New patch upstream-add-degree-reverse_graph.patch.
+
+ -- Steve M. Robbins <smr at debian.org>  Sat, 12 Nov 2016 12:46:50 -0600
+
 boost1.62 (1.62.0+dfsg-3) unstable; urgency=high
 
   * Build Boost.Python 2 & 3 bindings in separate builddirs. Closes: #842927

Modified: boost/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-boost/boost/trunk/debian/patches/series?rev=15016&op=diff
==============================================================================
--- boost/trunk/debian/patches/series	(original)
+++ boost/trunk/debian/patches/series	Sat Nov 12 18:47:21 2016
@@ -7,4 +7,4 @@
 no-gcc-m-options.diff
 # fixed alternatively? boost-context-use-sysv-not-aapcs.patch
 no-gcc-march-options.patch
-
+upstream-add-degree-reverse_graph.patch

Added: boost/trunk/debian/patches/upstream-add-degree-reverse_graph.patch
URL: http://svn.debian.org/wsvn/pkg-boost/boost/trunk/debian/patches/upstream-add-degree-reverse_graph.patch?rev=15016&op=file
==============================================================================
--- boost/trunk/debian/patches/upstream-add-degree-reverse_graph.patch	(added)
+++ boost/trunk/debian/patches/upstream-add-degree-reverse_graph.patch	Sat Nov 12 18:47:21 2016
@@ -0,0 +1,53 @@
+From 387bcb3d72c1646dfa0acc25ab7a444bd0ed05f0 Mon Sep 17 00:00:00 2001
+From: Matt Barr <matthew.barr at intel.com>
+Date: Tue, 1 Nov 2016 07:03:54 +1100
+Subject: [PATCH] Add degree to reverse_graph (#78)
+
+degree is required for BidirectionalGraphConcept.
+Also adds the concept check to the reverse_graph unit test.
+
+Note: Edited by Steve Robbins to correct the file paths.
+
+---
+ include/boost/graph/reverse_graph.hpp | 7 +++++++
+ test/reverse_graph_cc.cpp             | 2 ++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/include/boost/graph/reverse_graph.hpp b/include/boost/graph/reverse_graph.hpp
+index 24eb1c7..56ffe72 100644
+--- a/boost/graph/reverse_graph.hpp
++++ b/boost/graph/reverse_graph.hpp
+@@ -322,6 +322,13 @@ target(const detail::reverse_graph_edge_descriptor<Edge>& e, const reverse_graph
+     return source(e.underlying_descx, g.m_g);
+ }
+ 
++template <class BidirectionalGraph, class GRef>
++inline typename graph_traits<BidirectionalGraph>::degree_size_type
++degree(const typename graph_traits<BidirectionalGraph>::vertex_descriptor u,
++          const reverse_graph<BidirectionalGraph,GRef>& g)
++{
++    return degree(u, g.m_g);
++}
+ 
+ namespace detail {
+ 
+diff --git a/test/reverse_graph_cc.cpp b/test/reverse_graph_cc.cpp
+index eef53bf..145eb30 100644
+--- a/libs/graph/test/reverse_graph_cc.cpp
++++ b/libs/graph/test/reverse_graph_cc.cpp
+@@ -25,6 +25,7 @@ int main(int,char*[])
+     > AdjList;
+     typedef reverse_graph<AdjList> Graph;
+     BOOST_CONCEPT_ASSERT(( VertexListGraphConcept<Graph> ));
++    BOOST_CONCEPT_ASSERT(( BidirectionalGraphConcept<Graph> ));
+     typedef graph_traits<Graph>::vertex_descriptor Vertex;
+     typedef graph_traits<Graph>::edge_descriptor Edge;
+     BOOST_CONCEPT_ASSERT(( ReadablePropertyGraphConcept<Graph, Vertex, vertex_color_t> ));
+@@ -43,6 +44,7 @@ int main(int,char*[])
+     > AdjList;
+     typedef reverse_graph<AdjList,AdjList&> Graph;
+     BOOST_CONCEPT_ASSERT(( VertexListGraphConcept<Graph> ));
++    BOOST_CONCEPT_ASSERT(( BidirectionalGraphConcept<Graph> ));
+     typedef graph_traits<Graph>::vertex_descriptor Vertex;
+     typedef graph_traits<Graph>::edge_descriptor Edge;
+     BOOST_CONCEPT_ASSERT(( PropertyGraphConcept<Graph, Vertex, vertex_color_t> ));