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

Use std::move explicitly to avoid ambiguity with boost

Browse Source
This commit is contained in:
Matthew Barr 2017-03-03 14:53:41 +11:00
parent eed2743d04
commit c50a931bb4
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nfagraph/ng_limex.cpp
View File

@ -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 * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
@ -354,7 +354,7 @@ void attemptToUseAsStart(const NGHolder &g, NFAVertex u,
auto ni_inserter = inserter(new_inter, new_inter.end()); auto ni_inserter = inserter(new_inter, new_inter.end());
set_intersection(top_inter.begin(), top_inter.end(), set_intersection(top_inter.begin(), top_inter.end(),
v_tops.begin(), v_tops.end(), ni_inserter); v_tops.begin(), v_tops.end(), ni_inserter);
top_inter = move(new_inter); top_inter = std::move(new_inter);
succs.insert(v); succs.insert(v);
} }

4
src/nfagraph/ng_limex_accel.cpp
View File

@ -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 * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
@ -552,7 +552,7 @@ AccelScheme findBestAccelScheme(vector<vector<CharReach> > paths,
if (look_for_double_byte) { if (look_for_double_byte) {
DAccelScheme da = findBestDoubleAccelScheme(paths, terminating); DAccelScheme da = findBestDoubleAccelScheme(paths, terminating);
if (da.double_byte.size() <= DOUBLE_SHUFTI_LIMIT) { if (da.double_byte.size() <= DOUBLE_SHUFTI_LIMIT) {
rv.double_byte = move(da.double_byte); rv.double_byte = std::move(da.double_byte);
rv.double_cr = move(da.double_cr); rv.double_cr = move(da.double_cr);
rv.double_offset = da.double_offset; rv.double_offset = da.double_offset;
} }

4
src/rose/rose_build_anchored.cpp
View File

@ -185,7 +185,7 @@ void remapAnchoredReports(raw_dfa &rdfa, const RoseBuildImpl &build) {
assert(id < build.literal_info.size()); assert(id < build.literal_info.size());
new_reports.insert(build.literal_info.at(id).fragment_id); new_reports.insert(build.literal_info.at(id).fragment_id);
} }
ds.reports = move(new_reports); ds.reports = std::move(new_reports);
} }
} }
@ -220,7 +220,7 @@ void remapIdsToPrograms(const RoseBuildImpl &build, raw_dfa &rdfa) {
auto &frag = build.fragments.at(fragment_id); auto &frag = build.fragments.at(fragment_id);
new_reports.insert(frag.lit_program_offset); new_reports.insert(frag.lit_program_offset);
} }
ds.reports = move(new_reports); ds.reports = std::move(new_reports);
} }
} }

2
src/rose/rose_build_bytecode.cpp
View File

@ -4596,7 +4596,7 @@ map<u32, vector<RoseEdge>> findEdgesByLiteral(const RoseBuildImpl &build) {
return tie(g[source(a, g)].index, g[target(a, g)].index) < return tie(g[source(a, g)].index, g[target(a, g)].index) <
tie(g[source(b, g)].index, g[target(b, g)].index); tie(g[source(b, g)].index, g[target(b, g)].index);
}); });
lit_edge_map.emplace(m.first, move(edge_list)); lit_edge_map.emplace(m.first, std::move(edge_list));
} }
return lit_edge_map; return lit_edge_map;

2
src/rose/rose_build_compile.cpp
View File

@ -1032,7 +1032,7 @@ void packInfixTops(NGHolder &h, RoseGraph &g,
updated_tops.insert(top_mapping.at(t)); updated_tops.insert(top_mapping.at(t));
} }
} }
h[e].tops = move(updated_tops); h[e].tops = std::move(updated_tops);
if (h[e].tops.empty()) { if (h[e].tops.empty()) {
DEBUG_PRINTF("edge (start,%zu) has only unused tops\n", h[v].index); DEBUG_PRINTF("edge (start,%zu) has only unused tops\n", h[v].index);
dead.push_back(e); dead.push_back(e);

4
src/rose/rose_build_merge.cpp
View File

@ -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 * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
@ -1759,7 +1759,7 @@ void replaceTops(NGHolder &h, const map<u32, u32> &top_mapping) {
DEBUG_PRINTF("vertex %zu has top %u\n", h[v].index, t); DEBUG_PRINTF("vertex %zu has top %u\n", h[v].index, t);
new_tops.insert(top_mapping.at(t)); new_tops.insert(top_mapping.at(t));
} }
h[e].tops = move(new_tops); h[e].tops = std::move(new_tops);
} }
} }

4
src/rose/rose_build_role_aliasing.cpp
View File

@ -838,7 +838,7 @@ void pruneUnusedTops(NGHolder &h, const RoseGraph &g,
auto pt_inserter = inserter(pruned_tops, pruned_tops.end()); auto pt_inserter = inserter(pruned_tops, pruned_tops.end());
set_intersection(h[e].tops.begin(), h[e].tops.end(), set_intersection(h[e].tops.begin(), h[e].tops.end(),
used_tops.begin(), used_tops.end(), pt_inserter); used_tops.begin(), used_tops.end(), pt_inserter);
h[e].tops = move(pruned_tops); h[e].tops = std::move(pruned_tops);
if (h[e].tops.empty()) { if (h[e].tops.empty()) {
DEBUG_PRINTF("edge (start,%zu) has only unused tops\n", h[v].index); DEBUG_PRINTF("edge (start,%zu) has only unused tops\n", h[v].index);
dead.push_back(e); dead.push_back(e);
@ -1460,7 +1460,7 @@ void splitAndFilterBuckets(vector<vector<RoseVertex>> &buckets,
return; // No new buckets created. return; // No new buckets created.
} }
buckets = move(out); buckets = std::move(out);
removeSingletonBuckets(buckets); removeSingletonBuckets(buckets);
} }