diff options
| author | Felipe Magno de Almeida <felipe@expertisesolutions.com.br> | 2016-09-22 19:27:56 -0300 |
|---|---|---|
| committer | Felipe Magno de Almeida <felipe@expertisesolutions.com.br> | 2016-09-22 19:27:56 -0300 |
| commit | 88419e5e87152cf28d64c9e7d35993785e68fbe2 (patch) | |
| tree | 80602b6f7b5c72822c895e5b79554934f5aec442 | |
| parent | af82abb57a77a0f64ef5a691b9da9457257c5577 (diff) | |
| download | efl-88419e5e87152cf28d64c9e7d35993785e68fbe2.tar.gz | |
eina-cxx: Implement aligned_union for GCC 4.9
| -rw-r--r-- | src/bindings/cxx/eina_cxx/eina_aligned_union.hh | 31 | ||||
| -rw-r--r-- | src/bindings/cxx/eina_cxx/eina_variant.hh | 4 |
2 files changed, 34 insertions, 1 deletions
diff --git a/src/bindings/cxx/eina_cxx/eina_aligned_union.hh b/src/bindings/cxx/eina_cxx/eina_aligned_union.hh new file mode 100644 index 0000000000..eabe878408 --- /dev/null +++ b/src/bindings/cxx/eina_cxx/eina_aligned_union.hh @@ -0,0 +1,31 @@ +#ifndef EFL_EINA_EINA_ALIGNED_UNION_HH_ +#define EFL_EINA_EINA_ALIGNED_UNION_HH_ + +namespace efl { namespace eina { namespace _mpl { + +template <std::size_t...Numbers> +struct max; + +template <std::size_t A0> +struct max<A0> : std::integral_constant<std::size_t, A0> {}; + +template <std::size_t A0, std::size_t A1, std::size_t...Args> +struct max<A0, A1, Args...> : max<(A0 > A1 ? A0 : A1), Args...> {}; + +} + +// Workaround needed for GCC before 5.1 +template <std::size_t Min, typename...Args> +struct aligned_union +{ + static constexpr std::size_t alignment_value = _mpl::max<alignof(Args)...>::value; + + typedef typename std::aligned_storage + < _mpl::max<Min, sizeof(Args)...>::value + , alignment_value >::type type; +}; + +} } + +#endif + diff --git a/src/bindings/cxx/eina_cxx/eina_variant.hh b/src/bindings/cxx/eina_cxx/eina_variant.hh index 6bdd1a9d8e..fb92954c65 100644 --- a/src/bindings/cxx/eina_cxx/eina_variant.hh +++ b/src/bindings/cxx/eina_cxx/eina_variant.hh @@ -7,6 +7,8 @@ #include <type_traits> #include <tuple> +#include <eina_aligned_union.hh> + namespace efl { namespace eina { namespace _impl { @@ -236,7 +238,7 @@ private: new (&buffer) T(std::move(object)); } - typedef typename std::aligned_union<1, Args...>::type buffer_type; + typedef typename eina::aligned_union<1, Args...>::type buffer_type; friend bool operator==(variant<Args...> const& lhs, variant<Args...> const& rhs) { |