Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / selection / nbsearch.cpp

diff --git a/src/gromacs/selection/nbsearch.cpp b/src/gromacs/selection/nbsearch.cpp
index b50c4dbd539c81fa63cc38077b496cf05976995f..1e8f1cfdadfe46617dab5a475ca22e327ef95578 100644 (file)
--- a/src/gromacs/selection/nbsearch.cpp
+++ b/src/gromacs/selection/nbsearch.cpp
@@ -639,14 +639,14 @@ void AnalysisNeighborhoodPairSearchImpl::startSearch(
                        "Exclusion IDs must be set when exclusions are enabled");
     if (positions.index_ < 0)
     {
-        testPositions_ = ConstArrayRef<rvec>(positions.x_, positions.count_);
+        testPositions_ = constArrayRefFromArray<rvec>(positions.x_, positions.count_);
         reset(0);
     }
     else
     {
         // Somewhat of a hack: setup the array such that only the last position
         // will be used.
-        testPositions_ = ConstArrayRef<rvec>(positions.x_, positions.index_ + 1);
+        testPositions_ = constArrayRefFromArray<rvec>(positions.x_, positions.index_ + 1);
         reset(positions.index_);
     }
 }