Fix cppcheck 2.15.0 warnings

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

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
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() {

diff --git a/vpkt.cc b/vpkt.cc
@@ -111,8 +111,8 @@ void add_to_vspecpol(const Packet &vpkt, const int obsdirindex, const int opacho
 }
 
 // Routine to add a packet to the outcoming spectrum.
-void add_to_vpkt_grid(const Packet &vpkt, const std::array<double, 3> vel, const int wlbin, const int obsdirindex,
-                      const std::array<double, 3> obs) {
+void add_to_vpkt_grid(const Packet &vpkt, const std::array<double, 3> &vel, const int wlbin, const int obsdirindex,
+                      const std::array<double, 3> &obs) {
   double vref1{NAN};
   double vref2{NAN};
 
@@ -160,7 +160,7 @@ void add_to_vpkt_grid(const Packet &vpkt, const std::array<double, 3> vel, const
 }
 
 auto rlc_emiss_vpkt(const Packet &pkt, const double t_current, const double t_arrive, const double nu_rf,
-                    const double e_rf, const int obsdirindex, const std::array<double, 3> obsdir,
+                    const double e_rf, const int obsdirindex, const std::array<double, 3> &obsdir,
                     const enum packet_type type_before_rpkt, std::stringstream &vpkt_contrib_row) -> bool {
   int mgi = 0;