Skip to content

Fix develop compilation on some compilers #1080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pcarruscag merged 2 commits into from
Oct 1, 2020
Merged

Fix develop compilation on some compilers #1080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fe1876
fix mac compilation
pcarruscag Sep 30, 2020
dc66231
Merge remote-tracking branch 'upstream/develop' into feature_simd_num…
pcarruscag Sep 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Common/include/containers/C2DContainer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class AccessorImpl
return *this; \
} \
\
~AccessorImpl() \
~AccessorImpl() noexcept \
{ \
MemoryAllocation::aligned_free<Scalar_t>(m_data); \
}
Expand Down Expand Up @@ -519,12 +519,12 @@ class C2DContainer :
/*!
* \brief Move ctor, implemented by base class (if fully static works as copy).
*/
C2DContainer(C2DContainer&&) noexcept = default;
C2DContainer(C2DContainer&&) noexcept(std::is_nothrow_move_constructible<Scalar>::value) = default;

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

/*!
* \overload Set all entries to rhs value (syntax sugar, see "resize").
Expand Down
4 changes: 2 additions & 2 deletions Common/include/parallelization/special_vectorization.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class ARRAY_T {
/*--- Special construction using the "register type" directly. ---*/

FORCEINLINE Array(Register y) { reg = y; }
FORCEINLINE Array(const Array& other) { reg = other.reg; }
FORCEINLINE Array(const Array& other) noexcept { reg = other.reg; }

/*--- Specialized construction primitives. ---*/

Expand All @@ -80,7 +80,7 @@ class ARRAY_T {

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