Fixes for clang-tidy-9

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

diff --git a/src/gromacs/selection/selectioncollection.cpp b/src/gromacs/selection/selectioncollection.cpp
index 197f0962c941bac78aad14919340ad8a6bb6c545..a9c6e6825aea95cfa26d8577b2915cc9d9c11983 100644 (file)
--- a/src/gromacs/selection/selectioncollection.cpp
+++ b/src/gromacs/selection/selectioncollection.cpp
@@ -503,7 +503,7 @@ bool SelectionCollection::Impl::areForcesRequested() const
 
 
 SelectionTopologyProperties
-SelectionCollection::Impl::requiredTopologyPropertiesForPositionType(const std::string& post, bool forces) const
+SelectionCollection::Impl::requiredTopologyPropertiesForPositionType(const std::string& post, bool forces)
 {
     SelectionTopologyProperties props;
     if (!post.empty())
@@ -687,7 +687,8 @@ bool SelectionCollection::requiresIndexGroups() const
 
 SelectionList SelectionCollection::parseFromStdin(int count, bool bInteractive, const std::string& context)
 {
-    return parseInteractive(count, &StandardInputStream::instance(),
+    StandardInputStream inputStream;
+    return parseInteractive(count, &inputStream,
                             bInteractive ? &TextOutputFile::standardError() : nullptr, context);
 }
 
@@ -764,8 +765,7 @@ void SelectionCollection::compile()
         printTree(stderr, false);
     }
 
-    SelectionCompiler compiler;
-    compiler.compile(this);
+    compileSelection(this);
 
     if (impl_->debugLevel_ != Impl::DebugLevel::None)
     {