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

dfa: standardise 'using' instead of typedef

Browse Source
This commit is contained in:
Justin Viiret
2017-05-15 10:02:13 +10:00
committed by Matthew Barr
parent 0d7d52625c
commit 85f7790a21
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nfagraph/ng_haig.cpp
View File

@@ -285,8 +285,8 @@ public:
class Automaton_Haig_Merge {
public:
typedef vector<u16> StateSet;
typedef ue2::unordered_map<StateSet, dstate_id_t> StateMap;
using StateSet = vector<u16>;
using StateMap = unordered_map<StateSet, dstate_id_t>;
explicit Automaton_Haig_Merge(const vector<const raw_som_dfa *> &in)
: nfas(in.begin(), in.end()), dead(in.size()) {
@@ -515,7 +515,7 @@ bool doHaig(const NGHolder &g, som_type som,
raw_som_dfa *rdfa) {
u32 state_limit = HAIG_FINAL_DFA_STATE_LIMIT; /* haig never backs down from
a fight */
typedef typename Auto::StateSet StateSet;
using StateSet = typename Auto::StateSet;
vector<StateSet> nfa_state_map;
Auto n(g, som, triggers, unordered_som);
try {
@@ -721,7 +721,7 @@ unique_ptr<raw_som_dfa> attemptToMergeHaig(const vector<const raw_som_dfa *> &df
}
}
typedef Automaton_Haig_Merge::StateSet StateSet;
using StateSet = Automaton_Haig_Merge::StateSet;
vector<StateSet> nfa_state_map;
auto rdfa = ue2::make_unique<raw_som_dfa>(dfas[0]->kind, unordered_som,
NODE_START,