mirror of
https://github.com/VectorCamp/vectorscan.git
synced 2025-11-20 02:47:11 +03:00
util: switch from Boost to std::unordered set/map
This commit replaces the ue2::unordered_{set,map} types with their STL
versions, with some new hashing utilities in util/hash.h. The new types
ue2_unordered_set<T> and ue2_unordered_map<Key, T> default to using the
ue2_hasher.
The header util/ue2_containers.h has been removed, and the flat_set/map
containers moved to util/flat_containers.h.
This commit is contained in:
committed by
Matthew Barr
parent
a425bb9b7c
commit
9cf66b6ac9
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2015-2016, Intel Corporation
|
||||
* Copyright (c) 2015-2017, Intel Corporation
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
@@ -28,14 +28,16 @@
|
||||
|
||||
/** \file
|
||||
* \brief State numbering and late graph restructuring code.
|
||||
|
||||
*/
|
||||
|
||||
#ifndef NG_RESTRUCTURING_H
|
||||
#define NG_RESTRUCTURING_H
|
||||
|
||||
#include "ng_holder.h"
|
||||
#include "ue2common.h"
|
||||
#include "util/ue2_containers.h"
|
||||
#include "util/flat_containers.h"
|
||||
|
||||
#include <unordered_map>
|
||||
|
||||
namespace ue2 {
|
||||
|
||||
@@ -48,14 +50,14 @@ static constexpr u32 NO_STATE = ~0;
|
||||
/**
|
||||
* \brief Gives each participating vertex in the graph a unique state index.
|
||||
*/
|
||||
unordered_map<NFAVertex, u32>
|
||||
std::unordered_map<NFAVertex, u32>
|
||||
numberStates(NGHolder &h, const flat_set<NFAVertex> &tops);
|
||||
|
||||
/**
|
||||
* \brief Counts the number of states (vertices with state indices) in the
|
||||
* graph.
|
||||
*/
|
||||
u32 countStates(const unordered_map<NFAVertex, u32> &state_ids);
|
||||
u32 countStates(const std::unordered_map<NFAVertex, u32> &state_ids);
|
||||
|
||||
} // namespace ue2
|
||||
|
||||
|
||||
Reference in New Issue
Block a user