github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-09-29 11:16:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

use the correct way to refer to void *

Browse Source
This commit is contained in:
Alex Coyte
2016-05-06 13:20:00 +10:00
committed by Matthew Barr
parent afd378b09e
commit b097cb1b53
6 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nfagraph/ng_calc_components.cpp
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, Intel Corporation
* Copyright (c) 2015-2016, Intel Corporation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@ -219,8 +219,8 @@ vector<NFAEdge> findShellEdges(const NGHolder &g,
static
void removeVertices(const flat_set<NFAVertex> &verts, NFAUndirectedGraph &ug,
ue2::unordered_map<NFAVertex, NFAUndirectedVertex> &old2new,
ue2::unordered_map<NFAVertex, NFAUndirectedVertex> &new2old) {
ue2::unordered_map<NFAVertex, NFAUndirectedVertex> &old2new,
ue2::unordered_map<NFAUndirectedVertex, NFAVertex> &new2old) {
for (auto v : verts) {
assert(contains(old2new, v));
auto uv = old2new.at(v);
@@ -280,7 +280,7 @@ void splitIntoComponents(const NGHolder &g, deque<unique_ptr<NGHolder>> &comps,
createUnGraph(g.g, true, true, ug, old2new, newIdx2old);
// Construct reverse mapping.
ue2::unordered_map<NFAVertex, NFAUndirectedVertex> new2old;
ue2::unordered_map<NFAUndirectedVertex, NFAVertex> new2old;
for (const auto &m : old2new) {
new2old.emplace(m.second, m.first);
}
@@ -308,7 +308,7 @@ void splitIntoComponents(const NGHolder &g, deque<unique_ptr<NGHolder>> &comps,
// Collect vertex lists per component.
for (const auto &m : split_components) {
NFAVertex uv = m.first;
NFAUndirectedVertex uv = m.first;
u32 c = m.second;
assert(contains(new2old, uv));
NFAVertex v = new2old.at(uv);

4
src/nfagraph/ng_rose.cpp
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, Intel Corporation
* Copyright (c) 2015-2016, Intel Corporation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@ -2245,7 +2245,7 @@ bool improveLHS(RoseInGraph &ig, const vector<RoseInEdge> &edges,
const vector<RoseInEdge> &local = by_src[v];
vector<NGHolder *> graphs;
map<RoseInVertex, vector<RoseInEdge> > by_graph;
map<NGHolder *, vector<RoseInEdge> > by_graph;
for (const auto &e : local) {
NGHolder *gp = ig[e].graph.get();
if (!contains(by_graph, gp)) {