From 28f97aad8bf758a94e2433b1f2ffcad9389f7dea Mon Sep 17 00:00:00 2001 From: "Tod D. Romo" Date: Wed, 24 Jan 2024 17:08:37 -0500 Subject: [PATCH] Removing unqualified calls to std::move() --- Packages/Clustering/HAC.cpp | 4 ++-- Tools/dihedrals.cpp | 10 +++++----- Tools/ocf.cpp | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Packages/Clustering/HAC.cpp b/Packages/Clustering/HAC.cpp index 83f0ce770..0478722a8 100644 --- 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> cluster_ptr(new vector{i}); - currStg.push_back(move(cluster_ptr)); + currStg.push_back(std::move(cluster_ptr)); vector clusterRecord{i}; recordCurrStg[i] = clusterRecord; } @@ -118,4 +118,4 @@ void HAC::cluster() } stage--; } -} // namespace Clustering \ No newline at end of file +} // namespace Clustering diff --git a/Tools/dihedrals.cpp b/Tools/dihedrals.cpp index e52988b3f..f3fe632ba 100644 --- a/Tools/dihedrals.cpp +++ b/Tools/dihedrals.cpp @@ -279,7 +279,7 @@ sels_to_dihedralAGs(const vector> &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> &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> &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 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 index 14a6a6289..a5a19874b 100644 --- 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