#ifndef REFERENT_STORAGE_DWA200278_HPP
# define REFERENT_STORAGE_DWA200278_HPP
# include <boost/mpl/if.hpp>
+# include <boost/type_traits/aligned_storage.hpp>
# include <cstddef>
namespace boost { namespace python { namespace detail {
-struct alignment_dummy;
-typedef void (*function_ptr)();
-typedef int (alignment_dummy::*member_ptr);
-typedef int (alignment_dummy::*member_function_ptr)();
-
-# define BOOST_PYTHON_ALIGNER(T, n) \
- typename mpl::if_c< \
- sizeof(T) <= size, T, char>::type t##n
-
-// Storage for size bytes, aligned to all fundamental types no larger than size
-template <std::size_t size>
-union aligned_storage
+template <std::size_t size, std::size_t alignment = std::size_t(-1)>
+struct aligned_storage
{
- BOOST_PYTHON_ALIGNER(char, 0);
- BOOST_PYTHON_ALIGNER(short, 1);
- BOOST_PYTHON_ALIGNER(int, 2);
- BOOST_PYTHON_ALIGNER(long, 3);
- BOOST_PYTHON_ALIGNER(float, 4);
- BOOST_PYTHON_ALIGNER(double, 5);
- BOOST_PYTHON_ALIGNER(long double, 6);
- BOOST_PYTHON_ALIGNER(void*, 7);
- BOOST_PYTHON_ALIGNER(function_ptr, 8);
- BOOST_PYTHON_ALIGNER(member_ptr, 9);
- BOOST_PYTHON_ALIGNER(member_function_ptr, 10);
+ union type
+ {
+ typename ::boost::aligned_storage<size, alignment>::type data;
char bytes[size];
+ };
};
-
-# undef BOOST_PYTHON_ALIGNER
-
+
// Compute the size of T's referent. We wouldn't need this at all,
// but sizeof() is broken in CodeWarriors <= 8.0
template <class T> struct referent_size;
std::size_t, value = sizeof(T));
};
-
// A metafunction returning a POD type which can store U, where T ==
// U&. If T is not a reference type, returns a POD which can store T.
template <class T>
struct referent_storage
{
- typedef aligned_storage<
- ::boost::python::detail::referent_size<T>::value
- > type;
+ typedef typename aligned_storage<referent_size<T>::value, alignment_of<T>::value>::type type;
};
}}} // namespace boost::python::detail