Merge pull request #45 from lanl/jmm/fix-warnings

Fix warnings
lanl · Jul 20, 2023 · 3c6c72a · 3c6c72a
2 parents ed44803 + 5185525
commit 3c6c72a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/singularity-opac/base/opac_error.hpp b/singularity-opac/base/opac_error.hpp
@@ -27,7 +27,6 @@ namespace singularity {
   printf("%s", x);                                                             \
   std::exit(1)
 #endif
-#define UNDEFINED_ERROR OPAC_ERROR("DEFINE ME\n")
 
 } // namespace singularity
 

diff --git a/singularity-opac/constants/constants.hpp b/singularity-opac/constants/constants.hpp
@@ -18,14 +18,6 @@
 
 #include <ports-of-call/portability.hpp>
 
-#ifdef SINGULARITY_ENABLE_EXCEPTIONS
-#include <stdexcept>
-#define CONSTANTS_ERROR(x) (throw std::runtime_error(x))
-#else
-#define CONSTANTS_ERROR(x) printf("%s", x)
-#endif
-#define UNDEFINED_ERROR CONSTANTS_ERROR("DEFINE ME\n")
-
 namespace singularity {
 
 struct BaseUnity {
@@ -211,7 +203,4 @@ using PhysicalConstantsCGS =
 
 } // namespace singularity
 
-#undef CONSTANTS_ERROR
-#undef UNDEFINED_ERROR
-
 #endif // SINGULARITY_OPAC_CONSTANTS_CONSTANTS_
diff --git a/singularity-opac/neutrinos/non_cgs_neutrinos.hpp b/singularity-opac/neutrinos/non_cgs_neutrinos.hpp
@@ -66,7 +66,7 @@ class NonCGSUnits {
   }
 
   template <typename FrequencyIndexer, typename DataIndexer>
-  PORTABLE_INLINE_FUNCTION Real AbsorptionCoefficient(
+  PORTABLE_INLINE_FUNCTION void AbsorptionCoefficient(
       const Real rho, const Real temp, const Real Ye, RadiationType type,
       FrequencyIndexer &nu_bins, DataIndexer &coeffs, const int nbins,
       Real *lambda = nullptr) const {