diff --git a/doc/move.qbk b/doc/move.qbk index 2c9a807..729e92a 100644 --- a/doc/move.qbk +++ b/doc/move.qbk @@ -767,6 +767,8 @@ Many thanks to all boosters that have tested, reviewed and improved the library. * Added [macroref BOOST_MOVE_BASE BOOST_MOVE_BASE] utility. * Added [funcref boost::adl_move_swap adl_move_swap] utility. * Reduced dependencies on other Boost libraries to make the library a bit more lightweight. +* Fixed bugs: + * [@https://svn.boost.org/trac/boost/ticket/11044 Trac #11044: ['"boost::rv inherits off union, when such passed as template argument"]]. [endsect] diff --git a/include/boost/move/detail/type_traits.hpp b/include/boost/move/detail/type_traits.hpp index ad29e7f..ac0bbcd 100644 --- a/include/boost/move/detail/type_traits.hpp +++ b/include/boost/move/detail/type_traits.hpp @@ -847,7 +847,7 @@ struct alignment_of_impl // Using a combination of the two seems to make the most of a bad job: : alignment_logic< sizeof(alignment_of_hack) - 2*sizeof(T), __alignof(T)> {}; -#elif !defined(BOOST_ALIGNMENT_OF) +#elif !defined(BOOST_MOVE_ALIGNMENT_OF) : alignment_logic< sizeof(alignment_of_hack) - 2*sizeof(T), sizeof(T)> {}; #else