Fix cppcheck 2.15.0 warnings

artis-mcrt · Sep 1, 2024 · f6c59c5 · f6c59c5
1 parent fe38c4a
commit f6c59c5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/grid.cc b/grid.cc
@@ -1505,10 +1505,10 @@ auto get_poscoordpointnum(const double pos, const double time, const int axis) -
         return n_r;
       }
     }
-    assert_always(false);
-  } else {
-    assert_always(false);
   }
+
+  assert_always(false);
+  return -1;
 }
 
 constexpr auto get_gridcoords_from_xyz(const std::array<double, 3> pos_xyz) -> std::array<double, 3> {

diff --git a/sn3d.h b/sn3d.h
@@ -99,7 +99,11 @@ inline thread_local auto gslworkspace =
 #ifdef __NVCOMPILER_CUDA_ARCH__
 #define printout(...) printf(__VA_ARGS__)
 
-#define __artis_assert(e) assert(e)
+#define __artis_assert(e)                         \
+  {                                               \
+    const bool assertpass = static_cast<bool>(e); \
+    assert(assertpass)                            \
+  }
 
 #else
 inline void print_line_start() {