mirror of
https://github.com/VectorCamp/vectorscan.git
synced 2025-11-17 09:45:28 +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:
|
||||
@@ -33,10 +33,10 @@
|
||||
#ifndef NG_SPLIT_H
|
||||
#define NG_SPLIT_H
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "ng_holder.h"
|
||||
#include "util/ue2_containers.h"
|
||||
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
|
||||
namespace ue2 {
|
||||
|
||||
@@ -55,21 +55,21 @@ class NGHolder;
|
||||
* vertices which have an edge to every pivot
|
||||
*/
|
||||
void splitGraph(const NGHolder &base, NFAVertex pivot, NGHolder *lhs,
|
||||
ue2::unordered_map<NFAVertex, NFAVertex> *lhs_map,
|
||||
std::unordered_map<NFAVertex, NFAVertex> *lhs_map,
|
||||
NGHolder *rhs,
|
||||
ue2::unordered_map<NFAVertex, NFAVertex> *rhs_map);
|
||||
std::unordered_map<NFAVertex, NFAVertex> *rhs_map);
|
||||
|
||||
void splitGraph(const NGHolder &base, const std::vector<NFAVertex> &pivots,
|
||||
NGHolder *lhs,
|
||||
ue2::unordered_map<NFAVertex, NFAVertex> *lhs_map,
|
||||
std::unordered_map<NFAVertex, NFAVertex> *lhs_map,
|
||||
NGHolder *rhs,
|
||||
ue2::unordered_map<NFAVertex, NFAVertex> *rhs_map);
|
||||
std::unordered_map<NFAVertex, NFAVertex> *rhs_map);
|
||||
|
||||
void splitLHS(const NGHolder &base, NFAVertex pivot, NGHolder *lhs,
|
||||
ue2::unordered_map<NFAVertex, NFAVertex> *lhs_map);
|
||||
std::unordered_map<NFAVertex, NFAVertex> *lhs_map);
|
||||
|
||||
void splitRHS(const NGHolder &base, const std::vector<NFAVertex> &pivots,
|
||||
NGHolder *rhs, ue2::unordered_map<NFAVertex, NFAVertex> *rhs_map);
|
||||
NGHolder *rhs, std::unordered_map<NFAVertex, NFAVertex> *rhs_map);
|
||||
|
||||
} // namespace ue2
|
||||
|
||||
|
||||
Reference in New Issue
Block a user