fix noexcept

celeritas-project · Nov 28, 2024 · 47f1cc4 · 47f1cc4
1 parent 876dc9f
commit 47f1cc4
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 8 deletions.
diff --git a/src/corecel/sys/ScopedMem.cc b/src/corecel/sys/ScopedMem.cc
@@ -7,8 +7,6 @@
 //---------------------------------------------------------------------------//
 #include "ScopedMem.hh"
 
-#include "corecel/Config.hh"
-
 #if defined(__APPLE__)
 #    include <cstring>
 #    include <mach/mach.h>

diff --git a/src/corecel/sys/ScopedMem.hh b/src/corecel/sys/ScopedMem.hh
@@ -9,6 +9,8 @@
 
 #include <string_view>
 
+#include "corecel/Config.hh"
+
 #include "corecel/cont/InitializedValue.hh"
 
 #include "MemRegistry.hh"

diff --git a/src/orange/surf/GeneralQuadric.cc b/src/orange/surf/GeneralQuadric.cc
@@ -44,8 +44,10 @@ GeneralQuadric::GeneralQuadric(Real3 const& abc,
 /*!
  * Promote from a simple quadric.
  */
+// Remove after upgrade to clang-tidy-18:
 // NOLINTNEXTLINE(bugprone-exception-escape)
-GeneralQuadric::GeneralQuadric(SimpleQuadric const& other) noexcept
+GeneralQuadric::GeneralQuadric(SimpleQuadric const& other) noexcept(
+    !CELERITAS_DEBUG)
     : GeneralQuadric{make_array(other.second()),
                      Real3{0, 0, 0},
                      make_array(other.first()),

diff --git a/src/orange/surf/GeneralQuadric.hh b/src/orange/surf/GeneralQuadric.hh
@@ -7,6 +7,8 @@
 //---------------------------------------------------------------------------//
 #pragma once
 
+#include "corecel/Config.hh"
+
 #include "corecel/Types.hh"
 #include "corecel/cont/Array.hh"
 #include "corecel/cont/Span.hh"
@@ -70,7 +72,8 @@ class GeneralQuadric
     explicit inline CELER_FUNCTION GeneralQuadric(Span<R, StorageSpan::extent>);
 
     // Promote from a simple quadric
-    explicit GeneralQuadric(SimpleQuadric const& other) noexcept;
+    explicit GeneralQuadric(SimpleQuadric const& other) noexcept(
+        !CELERITAS_DEBUG);
 
     //// ACCESSORS ////
 

diff --git a/src/orange/surf/SimpleQuadric.cc b/src/orange/surf/SimpleQuadric.cc
@@ -48,8 +48,9 @@ SimpleQuadric::SimpleQuadric(Real3 const& abc, Real3 const& def, real_type g)
  * whereas the simple quadric has a different sign for the constant:
  * \f$ dx + ey + fz + g = 0 \f$ .
  */
+// Remove after upgrade to clang-tidy-18:
 // NOLINTNEXTLINE(bugprone-exception-escape)
-SimpleQuadric::SimpleQuadric(Plane const& other) noexcept
+SimpleQuadric::SimpleQuadric(Plane const& other) noexcept(!CELERITAS_DEBUG)
     : SimpleQuadric{{0, 0, 0}, other.normal(), negate(other.displacement())}
 {
 }
@@ -95,8 +96,9 @@ template SimpleQuadric::SimpleQuadric(CylAligned<Axis::z> const&) noexcept;
        + x_0^2 + y_0^2 + z_0^2 - r^2 = 0
  * \endverbatim
  */
+// Remove after upgrade to clang-tidy-18:
 // NOLINTNEXTLINE(bugprone-exception-escape)
-SimpleQuadric::SimpleQuadric(Sphere const& other) noexcept
+SimpleQuadric::SimpleQuadric(Sphere const& other) noexcept(!CELERITAS_DEBUG)
 {
     Real3 const& origin = other.origin();
 

diff --git a/src/orange/surf/SimpleQuadric.hh b/src/orange/surf/SimpleQuadric.hh
@@ -7,6 +7,8 @@
 //---------------------------------------------------------------------------//
 #pragma once
 
+#include "corecel/Config.hh"
+
 #include "corecel/Types.hh"
 #include "corecel/cont/Array.hh"
 #include "corecel/cont/Span.hh"
@@ -69,14 +71,14 @@ class SimpleQuadric
     explicit inline CELER_FUNCTION SimpleQuadric(Span<R, StorageSpan::extent>);
 
     // Promote from a plane
-    explicit SimpleQuadric(Plane const& other) noexcept;
+    explicit SimpleQuadric(Plane const& other) noexcept(!CELERITAS_DEBUG);
 
     // Promote from an axis-aligned cylinder
     template<Axis T>
     explicit SimpleQuadric(CylAligned<T> const& other) noexcept;
 
     // Promote from a sphere
-    explicit SimpleQuadric(Sphere const& other) noexcept;
+    explicit SimpleQuadric(Sphere const& other) noexcept(!CELERITAS_DEBUG);
 
     // Promote from a cone
     template<Axis T>