Fix minor regressions in 4.2.0 (#4538)

Fixes #4537 Description of changes: - use proper integral sizes - remove unused code
espressomd · Apr 17, 2023 · dce211d · dce211d
1 parent 3e9a6bf
commit dce211d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 deletions.
diff --git a/src/scafacos/src/Scafacos.cpp b/src/scafacos/src/Scafacos.cpp
@@ -21,7 +21,6 @@
 
 #include "utils.hpp"
 
-#include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
@@ -71,18 +70,6 @@ std::vector<std::string> Scafacos::available_methods() {
   return methods;
 }
 
-static std::string parse_method_parameters(
-    std::vector<std::vector<std::string>> const &parameters) {
-  std::string method_params = "";
-  for (auto const &parameter : parameters) {
-    for (auto const &value : parameter) {
-      method_params += " " + value;
-    }
-  }
-  std::replace(method_params.begin(), method_params.end(), ' ', ',');
-  return method_params.substr(1);
-}
-
 Scafacos::Scafacos(MPI_Comm comm, std::string method, std::string parameters)
     : m_method_name{std::move(method)}, m_parameters{std::move(parameters)} {
 

diff --git a/src/utils/tests/integral_parameter_test.cpp b/src/utils/tests/integral_parameter_test.cpp
@@ -38,11 +38,11 @@ BOOST_AUTO_TEST_CASE(integral_parameter_) {
                    std::pair<std::size_t, int>>::value,
       "");
 
-  BOOST_CHECK(std::make_pair(1ul, 13) ==
+  BOOST_CHECK(std::make_pair(std::size_t{1u}, 13) ==
               (Utils::integral_parameter<F, 1, 5>(1, 13)));
-  BOOST_CHECK(std::make_pair(3ul, 13) ==
+  BOOST_CHECK(std::make_pair(std::size_t{3u}, 13) ==
               (Utils::integral_parameter<F, 1, 5>(3, 13)));
-  BOOST_CHECK(std::make_pair(5ul, 13) ==
+  BOOST_CHECK(std::make_pair(std::size_t{5u}, 13) ==
               (Utils::integral_parameter<F, 1, 5>(5, 13)));
   BOOST_CHECK_THROW((Utils::integral_parameter<F, 1, 5>(6, 13)),
                     std::exception);