Fix regressions

Remove superflous runtime checks on the vector size. Address narrowing conversion compiler diagnostics.
espressomd · Jul 31, 2024 · 7d1d73c · 7d1d73c
1 parent 887e11e
commit 7d1d73c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/core/nonbonded_interactions/nonbonded_interaction_data.hpp b/src/core/nonbonded_interactions/nonbonded_interaction_data.hpp
@@ -35,7 +35,6 @@
 #include <algorithm>
 #include <cassert>
 #include <cmath>
-#include <cstddef>
 #include <memory>
 #include <vector>
 
@@ -397,7 +396,7 @@ class InteractionsNonBonded : public System::Leaf<InteractionsNonBonded> {
   auto get_ia_param_key(int i, int j) const {
     assert(i >= 0 and i <= max_seen_particle_type);
     assert(j >= 0 and j <= max_seen_particle_type);
-    auto const key = static_cast<std::size_t>(
+    auto const key = static_cast<unsigned int>(
         Utils::lower_triangular(std::max(i, j), std::min(i, j)));
     assert(key < m_nonbonded_ia_params.size());
     return key;
@@ -415,15 +414,15 @@ class InteractionsNonBonded : public System::Leaf<InteractionsNonBonded> {
    * @return Reference to interaction parameters for the type pair.
    */
   auto &get_ia_param(int i, int j) {
-    return *m_nonbonded_ia_params.at(get_ia_param_key(i, j));
+    return *m_nonbonded_ia_params[get_ia_param_key(i, j)];
   }
 
   auto const &get_ia_param(int i, int j) const {
-    return *m_nonbonded_ia_params.at(get_ia_param_key(i, j));
+    return *m_nonbonded_ia_params[get_ia_param_key(i, j)];
   }
 
   auto get_ia_param_ref_counted(int i, int j) const {
-    return m_nonbonded_ia_params.at(get_ia_param_key(i, j));
+    return m_nonbonded_ia_params[get_ia_param_key(i, j)];
   }
 
   void set_ia_param(int i, int j, std::shared_ptr<IA_parameters> const &ia) {

diff --git a/src/python/espressomd/CMakeLists.txt b/src/python/espressomd/CMakeLists.txt
@@ -49,6 +49,7 @@ target_compile_options(
   espresso_pyx_flags
   INTERFACE
     $<$<NOT:$<CXX_COMPILER_ID:Intel,IntelLLVM>>:-Wno-pedantic>
+    $<$<NOT:$<CXX_COMPILER_ID:Intel,IntelLLVM>>:-Wno-cast-qual>
     $<$<NOT:$<CXX_COMPILER_ID:Intel,IntelLLVM>>:-Wno-deprecated-declarations>
     $<$<CXX_COMPILER_ID:Intel,IntelLLVM>:-diag-disable=1224>
     $<$<CXX_COMPILER_ID:GNU>:-Wno-cpp>