[boost] Apply patch to fix boostorg/graph#268

cqc-alec · Jul 2, 2021 · 87040d8 · 87040d8
1 parent f590070
commit 87040d8
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/recipes/boost/all/conandata.yml b/recipes/boost/all/conandata.yml
@@ -117,13 +117,19 @@ patches:
       base_path: "source_subfolder"
     - patch_file: "patches/boost_locale_fail_on_missing_backend.patch"
       base_path: "source_subfolder"
+    - patch_file: "patches/graph_issue_268.patch"
+      base_path: "source_subfolder"
   1.75.0:
     - patch_file: "patches/boost_build_qcc_fix_debug_build_parameter_since_1_74.patch"
       base_path: "source_subfolder"
     - patch_file: "patches/python_base_prefix_since_1_74.patch"
       base_path: "source_subfolder"
     - patch_file: "patches/boost_locale_fail_on_missing_backend.patch"
       base_path: "source_subfolder"
+    - patch_file: "patches/graph_issue_268.patch"
+      base_path: "source_subfolder"
   1.76.0:
     - patch_file: "patches/boost_locale_fail_on_missing_backend.patch"
       base_path: "source_subfolder"
+    - patch_file: "patches/graph_issue_268.patch"
+      base_path: "source_subfolder"
diff --git a/recipes/boost/all/patches/graph_issue_268.patch b/recipes/boost/all/patches/graph_issue_268.patch
@@ -0,0 +1,26 @@
+diff --git a/boost/graph/detail/adjacency_list.hpp b/boost/graph/detail/adjacency_list.hpp
+index c1a2ada2..806b3f0e 100644
+--- a/boost/graph/detail/adjacency_list.hpp
++++ b/boost/graph/detail/adjacency_list.hpp
+@@ -2069,15 +2069,20 @@ namespace detail
+     inline void reindex_edge_list(
+         EdgeList& el, vertex_descriptor u, boost::disallow_parallel_edge_tag)
+     {
+-        for (typename EdgeList::iterator ei = el.begin(); ei != el.end(); ++ei)
++        typename EdgeList::iterator ei = el.begin(), e_end = el.end();
++        while (ei != e_end) {
+         {
+             if (ei->get_target() > u)
+             {
+                 typename EdgeList::value_type ce = *ei;
++                ++ei;
+                 el.erase(ce);
+                 --ce.get_target();
+                 el.insert(ce);
+             }
++            else {
++                ++ei;
++            }
+         }
+     }
+ } // namespace detail