From: Justin Viiret <justin.viiret@intel.com>
Date: Thu, 29 Jun 2017 00:26:17 +0000 (+1000)
Subject: limex_compile: use small_color_map
X-Git-Tag: v4.6.0^2~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48f9a6d518f7d32832c7dc9f18970ce9d12f604d;p=thirdparty%2Fvectorscan.git

limex_compile: use small_color_map
---

diff --git a/src/nfa/limex_compile.cpp b/src/nfa/limex_compile.cpp
index 7183d4b7..5e18b800 100644
--- a/src/nfa/limex_compile.cpp
+++ b/src/nfa/limex_compile.cpp
@@ -55,6 +55,7 @@
 #include "util/container.h"
 #include "util/graph.h"
 #include "util/graph_range.h"
+#include "util/graph_small_color_map.h"
 #include "util/order_check.h"
 #include "util/verify_types.h"
 #include "util/ue2_containers.h"
@@ -544,11 +545,9 @@ void filterAccelStates(NGHolder &g, const map<u32, set<NFAVertex>> &tops,
     ue2::unordered_map<NFAVertex, AccelScheme> out;
 
     try {
-        vector<boost::default_color_type> colour(num_vertices(g));
         boost::breadth_first_search(g, g.start,
-            visitor(fas_visitor(*accel_map, &out))
-                .color_map(make_iterator_property_map(colour.begin(),
-                                                      get(vertex_index, g))));
+                                    visitor(fas_visitor(*accel_map, &out))
+                                        .color_map(make_small_color_map(g)));
     } catch (fas_visitor *) {
         ; /* found max accel_states */
     }
@@ -1615,9 +1614,7 @@ bool cannotDie(const build_info &args, const set<NFAVertex> &tops) {
     // top, looking for a cyclic path consisting of vertices of dot reach. If
     // one exists, than the NFA cannot die after this top is triggered.
 
-    vector<boost::default_color_type> colours(num_vertices(h));
-    auto colour_map = boost::make_iterator_property_map(colours.begin(),
-                                                        get(vertex_index, h));
+    auto colour_map = make_small_color_map(h);
 
     struct CycleFound {};
     struct CannotDieVisitor : public boost::default_dfs_visitor {