remove trivial dtor from a number of EB implicit functions so that th…

…ey are trivially destructible and thus can work with DPC++
rajeeja · Mar 29, 2020 · 36185dc · 36185dc
1 parent 42f5cc8
commit 36185dc
Show file tree

Hide file tree

Showing 15 changed files with 0 additions and 24 deletions.
diff --git a/Src/EB/AMReX_EB2_IF_Complement.H b/Src/EB/AMReX_EB2_IF_Complement.H
@@ -17,7 +17,6 @@ public:
 
     ComplementIF (F&& a_f) : m_f(std::move(a_f)) {}
     ComplementIF (F const& a_f) : m_f(a_f) {}
-    ~ComplementIF () {}
 
     ComplementIF (const ComplementIF& rhs) = default;
     ComplementIF (ComplementIF&& rhs) = default;

diff --git a/Src/EB/AMReX_EB2_IF_Difference.H b/Src/EB/AMReX_EB2_IF_Difference.H
@@ -25,7 +25,6 @@ public:
         : m_f(a_f),
           m_g(a_g)
     {}
-    ~DifferenceIF () {}
 
     DifferenceIF (const DifferenceIF& rhs) = default;
     DifferenceIF (DifferenceIF&& rhs) = default;

diff --git a/Src/EB/AMReX_EB2_IF_Extrusion.H b/Src/EB/AMReX_EB2_IF_Extrusion.H
@@ -23,7 +23,6 @@ public:
         : m_f(a_f),
           m_direction(direction)
     {}
-    ~ExtrusionIF () {}
 
     ExtrusionIF (const ExtrusionIF& rhs) = default;
     ExtrusionIF (ExtrusionIF&& rhs) = default;

diff --git a/Src/EB/AMReX_EB2_IF_Intersection.H b/Src/EB/AMReX_EB2_IF_Intersection.H
@@ -50,8 +50,6 @@ class IntersectionIF
 public:
     using GpuTuple<Fs...>::GpuTuple;
 
-    ~IntersectionIF () {}
-
     inline Real operator() (const RealArray& p) const noexcept
     {
         return op_impl(p, makeIndexSequence<sizeof...(Fs)>());

diff --git a/Src/EB/AMReX_EB2_IF_Lathe.H b/Src/EB/AMReX_EB2_IF_Lathe.H
@@ -18,7 +18,6 @@ public:
 
     LatheIF (F&& a_f) : m_f(std::move(a_f)) {}
     LatheIF (F const& a_f) : m_f(a_f) {}
-    ~LatheIF () {}
 
     LatheIF (const LatheIF& rhs) = default;
     LatheIF (LatheIF&& rhs) = default;

diff --git a/Src/EB/AMReX_EB2_IF_Polynomial.H b/Src/EB/AMReX_EB2_IF_Polynomial.H
@@ -49,7 +49,6 @@ public:
         Gpu::htod_memcpy(m_dp, m_polynomial.data(), m_size*sizeof(PolyTerm));
     }
 
-    ~PolynomialIF () {}
 
     PolynomialIF (const PolynomialIF& rhs) = default;
     PolynomialIF (PolynomialIF&& rhs) = default;

diff --git a/Src/EB/AMReX_EB2_IF_Rotation.H b/Src/EB/AMReX_EB2_IF_Rotation.H
@@ -27,7 +27,6 @@ public:
           m_sin_angle(std::sin(angle)),
           m_dir(dir)
         {}
-    ~RotationIF () {}
 
     RotationIF (const RotationIF& rhs) = default;
     RotationIF (RotationIF&& rhs) = default;

diff --git a/Src/EB/AMReX_EB2_IF_Scale.H b/Src/EB/AMReX_EB2_IF_Scale.H
@@ -32,8 +32,6 @@ public:
 #endif
         {}
 
-    ~ScaleIF () {}
-
     ScaleIF (const ScaleIF& rhs) = default;
     ScaleIF (ScaleIF&& rhs) = default;
     ScaleIF& operator= (const ScaleIF& rhs) = delete;

diff --git a/Src/EB/AMReX_EB2_IF_Spline.H b/Src/EB/AMReX_EB2_IF_Spline.H
@@ -20,9 +20,6 @@ class SplineIF {
   //! Constructor
   SplineIF() {}
 
-  //! Destructor
-  ~SplineIF() {}
-
   void addSplineElement(std::vector<amrex::RealVect> pts) {
     SplineDistFcnElement2d * theSpline = new SplineDistFcnElement2d();
     theSpline->set_control_points(pts);

diff --git a/Src/EB/AMReX_EB2_IF_Translation.H b/Src/EB/AMReX_EB2_IF_Translation.H
@@ -23,7 +23,6 @@ public:
         : m_f(a_f),
           m_offset(makeXDim3(a_offset))
         {}
-    ~TranslationIF () {}
 
     TranslationIF (const TranslationIF& rhs) = default;
     TranslationIF (TranslationIF&& rhs) = default;

diff --git a/Src/EB/AMReX_EB2_IF_Union.H b/Src/EB/AMReX_EB2_IF_Union.H
@@ -50,8 +50,6 @@ class UnionIF
 public:
     using GpuTuple<Fs...>::GpuTuple;
 
-    ~UnionIF () {}
-
     inline Real operator() (const RealArray& p) const noexcept
     {
         return op_impl(p, makeIndexSequence<sizeof...(Fs)>());

diff --git a/Tests/LinearSolvers/CellEB/MyEB.H b/Tests/LinearSolvers/CellEB/MyEB.H
@@ -24,8 +24,6 @@ public:
           m_sign(a_inside ? 1.0 : -1.0)
         {}
 
-    ~FlowerIF () {}
-
     FlowerIF (const FlowerIF& rhs) noexcept = default;
     FlowerIF (FlowerIF&& rhs) noexcept = default;
     FlowerIF& operator= (const FlowerIF& rhs) = delete;

diff --git a/Tests/LinearSolvers/CellEB2/MyEB.H b/Tests/LinearSolvers/CellEB2/MyEB.H
@@ -24,8 +24,6 @@ public:
           m_sign(a_inside ? 1.0 : -1.0)
         {}
 
-    ~FlowerIF () {}
-
     FlowerIF (const FlowerIF& rhs) noexcept = default;
     FlowerIF (FlowerIF&& rhs) noexcept = default;
     FlowerIF& operator= (const FlowerIF& rhs) = delete;

diff --git a/Tests/LinearSolvers/EBConvergenceTest/MyEB.H b/Tests/LinearSolvers/EBConvergenceTest/MyEB.H
@@ -24,8 +24,6 @@ public:
           m_sign(a_inside ? 1.0 : -1.0)
         {}
 
-    ~FlowerIF () {}
-
     FlowerIF (const FlowerIF& rhs) noexcept = default;
     FlowerIF (FlowerIF&& rhs) noexcept = default;
     FlowerIF& operator= (const FlowerIF& rhs) = delete;

diff --git a/Tests/LinearSolvers/EBflux_grad/MyEB.H b/Tests/LinearSolvers/EBflux_grad/MyEB.H
@@ -24,8 +24,6 @@ public:
           m_sign(a_inside ? 1.0 : -1.0)
         {}
 
-    ~FlowerIF () {}
-
     FlowerIF (const FlowerIF& rhs) noexcept = default;
     FlowerIF (FlowerIF&& rhs) noexcept = default;
     FlowerIF& operator= (const FlowerIF& rhs) = delete;