Skip to content

Commit 869907b

Browse files
committed
fix more compiler issues
1 parent fd2fa75 commit 869907b

4 files changed

Lines changed: 13 additions & 6 deletions

File tree

Common/include/containers/C2DContainer.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -519,12 +519,12 @@ class C2DContainer :
519519
/*!
520520
* \brief Move ctor, implemented by base class (if fully static works as copy).
521521
*/
522-
C2DContainer(C2DContainer&&) noexcept(std::is_nothrow_move_constructible<Scalar>::value) = default;
522+
C2DContainer(C2DContainer&&) = default;
523523

524524
/*!
525525
* \brief Move assign operator, implemented by base class (if fully static works as copy).
526526
*/
527-
C2DContainer& operator= (C2DContainer&&) noexcept(std::is_nothrow_move_assignable<Scalar>::value) = default;
527+
C2DContainer& operator= (C2DContainer&&) = default;
528528

529529
/*!
530530
* \overload Set all entries to rhs value (syntax sugar, see "resize").

SU2_CFD/include/numerics_simd/flow/convection/centered.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,7 @@ class CCenteredBase : public Base {
175175

176176
/*--- Stop preaccumulation. ---*/
177177

178-
AD::SetPreaccOut(flux, nVar, Double::Size);
179-
AD::EndPreacc();
178+
stopPreacc(flux);
180179

181180
/*--- Update the vector and system matrix. ---*/
182181

SU2_CFD/include/numerics_simd/flow/convection/roe.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,7 @@ class CRoeBase : public Base {
204204

205205
/*--- Stop preaccumulation. ---*/
206206

207-
AD::SetPreaccOut(flux, nVar, Double::Size);
208-
AD::EndPreacc();
207+
stopPreacc(flux);
209208

210209
/*--- Update the vector and system matrix. ---*/
211210

SU2_CFD/include/numerics_simd/util.hpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,15 @@ FORCEINLINE MatrixDbl<nRows,nCols> gatherVariables(Int iPoint, const Container&
145145
return x;
146146
}
147147

148+
/*!
149+
* \brief Stop the AD preaccumulation.
150+
*/
151+
template<size_t nVar>
152+
FORCEINLINE void stopPreacc(VectorDbl<nVar>& x) {
153+
AD::SetPreaccOut(x, nVar, Double::Size);
154+
AD::EndPreacc();
155+
}
156+
148157
/*!
149158
* \brief Distance vector, from point i to point j.
150159
*/

0 commit comments

Comments
 (0)