diff --git a/common/albyte.h b/common/albyte.h index f21b45ec..241ce7ad 100644 --- a/common/albyte.h +++ b/common/albyte.h @@ -41,11 +41,11 @@ template::value)> \ inline constexpr al::byte operator op (al::byte lhs, T rhs) noexcept \ { return al::byte(to_integer(lhs) op static_cast(rhs)); } \ template::value)> \ -inline al::byte& operator opeq (al::byte &lhs, T rhs) noexcept \ +inline constexpr al::byte& operator opeq (al::byte &lhs, T rhs) noexcept \ { lhs = lhs op rhs; return lhs; } \ inline constexpr al::byte operator op (al::byte lhs, al::byte rhs) noexcept \ { return al::byte(lhs op to_integer(rhs)); } \ -inline al::byte& operator opeq (al::byte &lhs, al::byte rhs) noexcept \ +inline constexpr al::byte& operator opeq (al::byte &lhs, al::byte rhs) noexcept \ { lhs = lhs op rhs; return lhs; } AL_DECL_OP(|, |=) diff --git a/common/alspan.h b/common/alspan.h index 3c65e2e8..7be07354 100644 --- a/common/alspan.h +++ b/common/alspan.h @@ -118,7 +118,7 @@ public: constexpr span(const span &span_) noexcept : span{al::data(span_), al::size(span_)} { } constexpr span(const span&) noexcept = default; - span& operator=(const span &rhs) noexcept = default; + constexpr span& operator=(const span &rhs) noexcept = default; constexpr reference front() const { return *mData; } constexpr reference back() const { return *(mData+E-1); } @@ -212,7 +212,7 @@ public: constexpr span(const span &span_) noexcept : span{al::data(span_), al::size(span_)} { } constexpr span(const span&) noexcept = default; - span& operator=(const span &rhs) noexcept = default; + constexpr span& operator=(const span &rhs) noexcept = default; constexpr reference front() const { return *mData; } constexpr reference back() const { return *(mDataEnd-1); }