Removing unqualified calls to std::move()

GrossfieldLab · Jan 24, 2024 · 28f97aa · 28f97aa
1 parent 0977114
commit 28f97aa
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Packages/Clustering/HAC.cpp b/Packages/Clustering/HAC.cpp
@@ -55,7 +55,7 @@ void HAC::cluster()
  for (idxT i = 0; i < eltCount; i++)
  {
  unique_ptr<vector<idxT>> cluster_ptr(new vector<idxT>{i});
- currStg.push_back(move(cluster_ptr));
+ currStg.push_back(std::move(cluster_ptr));
  vector<idxT> clusterRecord{i};
  recordCurrStg[i] = clusterRecord;
  }
@@ -118,4 +118,4 @@ void HAC::cluster()
  }
  stage--;
 }
-} // namespace Clustering
+} // namespace Clustering
diff --git a/Tools/dihedrals.cpp b/Tools/dihedrals.cpp
@@ -279,7 +279,7 @@ sels_to_dihedralAGs(const vector<vector<string>> &dihedral_sels,
  for (auto sel : sels)
  reordered += selectAtoms(oo_D, sel);
 
- oo_D = move(reordered);
+ oo_D = std::move(reordered);
  cerr << "included group of size: " << to_string(reordered.size())
  << "\n";
  return false;
@@ -294,7 +294,7 @@ sels_to_dihedralAGs(const vector<vector<string>> &dihedral_sels,
  for (auto sel : sels)
  reordered += selectAtoms(oo_D, sel);
 
- oo_D = move(reordered);
+ oo_D = std::move(reordered);
  return false;
  }
  };
@@ -324,7 +324,7 @@ sels_to_dihedralAGs(const vector<vector<string>> &dihedral_sels,
  return (*chkSizeReorder)(oo_D, dSels);
  }),
  dihedralInstances.end());
- dihedralAGs.push_back(move(dihedralInstances));
+ dihedralAGs.push_back(std::move(dihedralInstances));
  }
  return dihedralAGs;
 }
@@ -386,7 +386,7 @@ int main(int argc, char *argv[]) {
  *(p_ofstream) << "# " << header << "\n";
  v_filePtrs.push_back(p_ofstream);
  }
- vv_filePtrs.push_back(move(v_filePtrs));
+ vv_filePtrs.push_back(std::move(v_filePtrs));
  }
  } else {
  vector<string> user_tags = split(topts->tags, atom_delim);
@@ -406,7 +406,7 @@ int main(int argc, char *argv[]) {
  *p_ofstream << "# " << header << "\n";
  v_filePtrs.push_back(p_ofstream);
  }
- vv_filePtrs.push_back(move(v_filePtrs));
+ vv_filePtrs.push_back(std::move(v_filePtrs));
  }
  }
 

diff --git a/Tools/ocf.cpp b/Tools/ocf.cpp
@@ -262,7 +262,7 @@ int main(int argc, char *argv[])
  AtomicGroup scope = selectAtoms(model, sopts->selection);
  pTraj traj = mtopts->trajectory;
  // move unique ptr to Weights into main function ownership for ease of use.
- auto weights = move(wopts->pWeights);
+ auto weights = std::move(wopts->pWeights);
  // Attach trajectory to weights
  weights->addTraj(traj);
  // initialize max offset at top level, define either with user input