TartanLlama/expected
1
0
Fork 1
mirror of https://github.com/TartanLlama/expected.git synced 2025-08-03 10:54:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8 from adah1972/order_warning_fix

Browse Source 
Fix -Wreorder warnings.
This commit is contained in:
Simon Brand
2017-12-28 09:38:58 +00:00
committed by GitHub
parent 2468058ca3 cfbc995c12
commit 304eefda71
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tl/expected.hpp
View File

@@ -325,11 +325,11 @@ struct expected_storage_base {
m_unexpect.~unexpected<E>(); m_unexpect.~unexpected<E>();
} }
} }
bool m_has_val;
union { union {
T m_val; T m_val;
unexpected<E> m_unexpect; unexpected<E> m_unexpect;
}; };
bool m_has_val;
}; };
// This specialization is for when both `T` and `E` are trivially-destructible, // This specialization is for when both `T` and `E` are trivially-destructible,
@@ -365,11 +365,11 @@ template <class T, class E> struct expected_storage_base<T, E, true, true> {
: m_unexpect(il, std::forward<Args>(args)...), m_has_val(false) {} : m_unexpect(il, std::forward<Args>(args)...), m_has_val(false) {}
~expected_storage_base() = default; ~expected_storage_base() = default;
bool m_has_val;
union { union {
T m_val; T m_val;
unexpected<E> m_unexpect; unexpected<E> m_unexpect;
}; };
bool m_has_val;
}; };
// T is trivial, E is not. // T is trivial, E is not.
@@ -409,11 +409,11 @@ template <class T, class E> struct expected_storage_base<T, E, true, false> {
} }
} }
bool m_has_val;
union { union {
T m_val; T m_val;
unexpected<E> m_unexpect; unexpected<E> m_unexpect;
}; };
bool m_has_val;
}; };
// E is trivial, T is not. // E is trivial, T is not.
@@ -452,11 +452,11 @@ template <class T, class E> struct expected_storage_base<T, E, false, true> {
m_val.~T(); m_val.~T();
} }
} }
bool m_has_val;
union { union {
T m_val; T m_val;
unexpected<E> m_unexpect; unexpected<E> m_unexpect;
}; };
bool m_has_val;
}; };
// `T` is `void`, `E` is trivially-destructible // `T` is `void`, `E` is trivially-destructible
@@ -481,12 +481,12 @@ template <class E> struct expected_storage_base<void, E, false, true> {
: m_unexpect(il, std::forward<Args>(args)...), m_has_val(false) {} : m_unexpect(il, std::forward<Args>(args)...), m_has_val(false) {}
~expected_storage_base() = default; ~expected_storage_base() = default;
bool m_has_val;
struct dummy {}; struct dummy {};
union { union {
dummy m_val; dummy m_val;
unexpected<E> m_unexpect; unexpected<E> m_unexpect;
}; };
bool m_has_val;
}; };
// `T` is `void`, `E` is not trivially-destructible // `T` is `void`, `E` is not trivially-destructible
@@ -516,12 +516,12 @@ template <class E> struct expected_storage_base<void, E, false, false> {
} }
} }
bool m_has_val;
struct dummy {}; struct dummy {};
union { union {
dummy m_val; dummy m_val;
unexpected<E> m_unexpect; unexpected<E> m_unexpect;
}; };
bool m_has_val;
}; };
// This base class provides some handy member functions which can be used in // This base class provides some handy member functions which can be used in