Skip to content

Commit fd2fa75

Browse files
authored
Merge pull request #1080 from su2code/feature_simd_numerics
Fix develop compilation on some compilers
2 parents bc39e7e + dc66231 commit fd2fa75

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

Common/include/containers/C2DContainer.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ class AccessorImpl
119119
return *this; \
120120
} \
121121
\
122-
~AccessorImpl() \
122+
~AccessorImpl() noexcept \
123123
{ \
124124
MemoryAllocation::aligned_free<Scalar_t>(m_data); \
125125
}
@@ -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 = default;
522+
C2DContainer(C2DContainer&&) noexcept(std::is_nothrow_move_constructible<Scalar>::value) = default;
523523

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

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

Common/include/parallelization/special_vectorization.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class ARRAY_T {
6363
/*--- Special construction using the "register type" directly. ---*/
6464

6565
FORCEINLINE Array(Register y) { reg = y; }
66-
FORCEINLINE Array(const Array& other) { reg = other.reg; }
66+
FORCEINLINE Array(const Array& other) noexcept { reg = other.reg; }
6767

6868
/*--- Specialized construction primitives. ---*/
6969

@@ -80,7 +80,7 @@ class ARRAY_T {
8080

8181
#define MAKE_COMPOUND(OP,IMPL)\
8282
FORCEINLINE Array& operator OP (Scalar x) { reg = IMPL(reg, set1_p(SIZE_TAG, x)); return *this; }\
83-
FORCEINLINE Array& operator OP (const Array& other) { reg = IMPL(reg, other.reg); return *this; }
83+
FORCEINLINE Array& operator OP (const Array& other) noexcept { reg = IMPL(reg, other.reg); return *this; }
8484
MAKE_COMPOUND(=, second)
8585
MAKE_COMPOUND(+=, add_p)
8686
MAKE_COMPOUND(-=, sub_p)

0 commit comments

Comments
 (0)