Use std::move explicitly to avoid ambiguity with boost

diff --git a/src/nfagraph/ng_limex.cpp b/src/nfagraph/ng_limex.cpp
index e92790b98580e7d98f5827c5e023f47abcbd27e2..7f157c3334916042f17df0ae95d77370e37a2319 100644 (file)
--- a/src/nfagraph/ng_limex.cpp
+++ b/src/nfagraph/ng_limex.cpp
@@ -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);
     }
 

diff --git a/src/nfagraph/ng_limex_accel.cpp b/src/nfagraph/ng_limex_accel.cpp
index bfba7c71b9d70e6cac490851d65bf7d56d05229e..cd662d9c3d3c492201eda09520b51027f93fbc5a 100644 (file)
--- a/src/nfagraph/ng_limex_accel.cpp
+++ b/src/nfagraph/ng_limex_accel.cpp
@@ -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;
         }

diff --git a/src/rose/rose_build_anchored.cpp b/src/rose/rose_build_anchored.cpp
index 7c8c9023585ad5edfd95ecdca1042434b3a359cb..d4e08bb340e556b706725ca14e0f619cfe5d835d 100644 (file)
--- a/src/rose/rose_build_anchored.cpp
+++ b/src/rose/rose_build_anchored.cpp
@@ -185,7 +185,7 @@ void remapAnchoredReports(raw_dfa &rdfa, const RoseBuildImpl &build) {
             assert(id < build.literal_info.size());
             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);
             new_reports.insert(frag.lit_program_offset);
         }
-        ds.reports = move(new_reports);
+        ds.reports = std::move(new_reports);
     }
 }
 

diff --git a/src/rose/rose_build_bytecode.cpp b/src/rose/rose_build_bytecode.cpp
index 8dcf1d66d3c55bdd6edc4da9c3f860eaa11b7baf..4b35e9e59e63b9e481f7d71db9b78e171961dc3e 100644 (file)
--- a/src/rose/rose_build_bytecode.cpp
+++ b/src/rose/rose_build_bytecode.cpp
@@ -4596,7 +4596,7 @@ map<u32, vector<RoseEdge>> findEdgesByLiteral(const RoseBuildImpl &build) {
                  return tie(g[source(a, g)].index, g[target(a, 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;

diff --git a/src/rose/rose_build_compile.cpp b/src/rose/rose_build_compile.cpp
index 7dd55d5f85fcc42a24c7daeb10f0792f9d02be17..00586f65d0378fbdd150e6522f1d5542889c610b 100644 (file)
--- a/src/rose/rose_build_compile.cpp
+++ b/src/rose/rose_build_compile.cpp
@@ -1032,7 +1032,7 @@ void packInfixTops(NGHolder &h, RoseGraph &g,
                 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()) {
             DEBUG_PRINTF("edge (start,%zu) has only unused tops\n", h[v].index);
             dead.push_back(e);

diff --git a/src/rose/rose_build_merge.cpp b/src/rose/rose_build_merge.cpp
index 54a7390ea917f026a0768674d5837421625d9436..685d152362609ff94c2af67094c2daa85978ca87 100644 (file)
--- a/src/rose/rose_build_merge.cpp
+++ b/src/rose/rose_build_merge.cpp
@@ -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:
@@ -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);
             new_tops.insert(top_mapping.at(t));
         }
-        h[e].tops = move(new_tops);
+        h[e].tops = std::move(new_tops);
     }
 }
 

diff --git a/src/rose/rose_build_role_aliasing.cpp b/src/rose/rose_build_role_aliasing.cpp
index 3ad4566ebf859648d1568fa09582244cbd39e136..f8174d74fef0c57be7ef29b645adde94ad37bbb0 100644 (file)
--- a/src/rose/rose_build_role_aliasing.cpp
+++ b/src/rose/rose_build_role_aliasing.cpp
@@ -838,7 +838,7 @@ void pruneUnusedTops(NGHolder &h, const RoseGraph &g,
         auto pt_inserter = inserter(pruned_tops, pruned_tops.end());
         set_intersection(h[e].tops.begin(), h[e].tops.end(),
                          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()) {
             DEBUG_PRINTF("edge (start,%zu) has only unused tops\n", h[v].index);
             dead.push_back(e);
@@ -1460,7 +1460,7 @@ void splitAndFilterBuckets(vector<vector<RoseVertex>> &buckets,
         return; // No new buckets created.
     }
 
-    buckets = move(out);
+    buckets = std::move(out);
     removeSingletonBuckets(buckets);
 }