warnings and errors

lanl · Feb 24, 2025 · 69d2604 · 69d2604
1 parent 738282a
commit 69d2604
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/singularity-eos/base/indexable_types.hpp b/singularity-eos/base/indexable_types.hpp
@@ -60,7 +60,6 @@ class VariadicIndexer {
             typename = std::enable_if_t<variadic_utils::contains<T, Ts...>::value>>
   PORTABLE_FORCEINLINE_FUNCTION Real &operator[](const T &t) {
     // get the index of T in the variadic type list
-    constexpr std::size_t N = sizeof...(Ts);
     std::size_t idx = 0;
     std::size_t i = 0;
     ((std::is_same_v<T, Ts> ? idx = i : ++i), ...);

diff --git a/singularity-eos/eos/eos_helmholtz.hpp b/singularity-eos/eos/eos_helmholtz.hpp
@@ -462,10 +462,9 @@ class Helmholtz : public EosBase<Helmholtz> {
   PORTABLE_INLINE_FUNCTION int nlambda() const noexcept { return 3; }
   template <typename T>
   static inline constexpr bool NeedsLambda() {
-    using namespace IndexableTypes;
-    return std::is_same<T, MeanAtomicMass>::value ||
-           std::is_same<T, MeanAtomicNumber>::value ||
-           std::is_same<T, LogTemperature>::value
+    return std::is_same<T, IndexableTypes::MeanAtomicMass>::value ||
+           std::is_same<T, IndexableTypes::MeanAtomicNumber>::value ||
+           std::is_same<T, IndexableTypes::LogTemperature>::value
   }
   static constexpr unsigned long PreferredInput() {
     return thermalqs::density | thermalqs::temperature;

diff --git a/singularity-eos/eos/eos_spiner.hpp b/singularity-eos/eos/eos_spiner.hpp
@@ -1372,8 +1372,8 @@ PORTABLE_INLINE_FUNCTION Real SpinerEOSDependsRhoT::lTFromlRhoSie_(
     }
   }
   if (!variadic_utils::is_nullptr(lambda)) {
-    IndexerUtils::Get<LogDensity>(lambda, Lambda::lRho) = lRho;
-    IndexerUtils::Get<LogTemperature>(lambda, Lambda::lT) = lT;
+    IndexerUtils::Get<IndexableTypes::LogDensity>(lambda, Lambda::lRho) = lRho;
+    IndexerUtils::Get<IndexableTypes::LogTemperature>(lambda, Lambda::lT) = lT;
   }
 #ifdef PORTABILITY_STRATEGY_NONE
   if (memoryStatus_ != DataStatus::OnDevice) {