Use std::move explicitly to avoid ambiguity with boost

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

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
* 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());
set_intersection(top_inter.begin(), top_inter.end(),
v_tops.begin(), v_tops.end(), ni_inserter);
top_inter = move(new_inter);
top_inter = std::move(new_inter);
succs.insert(v);
}

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
* 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) {
DAccelScheme da = findBestDoubleAccelScheme(paths, terminating);
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_offset = da.double_offset;
}