coffee/continuable
1
0
Fork 0
mirror of https://github.com/Naios/continuable.git synced 2026-02-09 03:06:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Attemt to fix the alignment errors

Browse Source
This commit is contained in:
Denis Blank 2018-01-29 00:36:08 +01:00
parent eed883b0a5
commit 701a8ea1a4
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/continuable/detail/expected.hpp
View File

@ -49,9 +49,11 @@ enum class slot_t { empty, value, error };
template <typename T> template <typename T>
using storage_of_t = // using storage_of_t = //
std::aligned_storage_t<(sizeof(types::error_type) > sizeof(T) std::aligned_storage_t<
? sizeof(types::error_type) (sizeof(types::error_type) > sizeof(T) ? sizeof(types::error_type)
: sizeof(T))>; : sizeof(T)),
(alignof(types::error_type) > alignof(T) ? alignof(types::error_type)
: alignof(T))>;
template <typename T> template <typename T>
struct expected_base { struct expected_base {
@ -297,11 +299,27 @@ private:
template <typename V> template <typename V>
V& cast() noexcept { V& cast() noexcept {
assert(!is_empty()); assert(!is_empty());
#ifndef _NDEBUG
void* ptr = &this->storage_;
auto space = sizeof(this->storage_);
void* aligned = std::align(alignof(V), sizeof(V), ptr, space);
assert(aligned && "Bad alignment!");
#endif // _NDEBUG
return *reinterpret_cast<V*>(&this->storage_); return *reinterpret_cast<V*>(&this->storage_);
} }
template <typename V> template <typename V>
V const& cast() const noexcept { V const& cast() const noexcept {
assert(!is_empty()); assert(!is_empty());
#ifndef _NDEBUG
void* ptr = const_cast<void*>(static_cast<void const*>(&this->storage_));
auto space = sizeof(this->storage_);
void* aligned = std::align(alignof(V), sizeof(V), ptr, space);
assert(aligned && "Bad alignment!");
#endif // _NDEBUG
return *reinterpret_cast<V const*>(&this->storage_); return *reinterpret_cast<V const*>(&this->storage_);
} }