Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-11 02:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Mark List::sort as deprecated, remove List::sortedinsert

Browse source
This commit is contained in:
Tim Wojtulewicz 2019-07-17 14:36:11 -07:00 • committed by Jon Siwek
parent e860a4b22d
commit d2d5043bf0
3 changed files with 13 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/NFA.cc
View file

@ -2,6 +2,8 @@
#include "zeek-config.h"
#include <algorithm>
#include "NFA.h"
#include "EquivClass.h"
@ -342,11 +344,14 @@ NFA_state_list* epsilon_closure(NFA_state_list* states)
if ( ! closuremap.Contains(ns->ID()) )
{
closuremap.Insert(ns->ID());
closure->sortedinsert(ns, NFA_state_cmp_neg);
closure->append(ns);
}
}
}
// Sort all of the closures in the list by ID
std::sort(closure->begin(), closure->end(), NFA_state_cmp_neg);
// Make it fit.
closure->resize(0);
@ -355,15 +360,10 @@ NFA_state_list* epsilon_closure(NFA_state_list* states)
return closure;
}
int NFA_state_cmp_neg(const void* v1, const void* v2)
bool NFA_state_cmp_neg(const NFA_State* v1, const NFA_State* v2)
{
const NFA_State* n1 = (const NFA_State*) v1;
const NFA_State* n2 = (const NFA_State*) v2;
if ( n1->ID() < n2->ID() )
return -1;
else if ( n1->ID() == n2->ID() )
return 0;
if ( v1->ID() < v2->ID() )
return true;
else
return 1;
return false;
}