Merge branch 'develop'

This commit is contained in:
Ion Gaztañaga
2015-02-26 00:42:03 +01:00
2 changed files with 3 additions and 1 deletions

View File

@ -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]

View File

@ -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<T>) - 2*sizeof(T), __alignof(T)>
{};
#elif !defined(BOOST_ALIGNMENT_OF)
#elif !defined(BOOST_MOVE_ALIGNMENT_OF)
: alignment_logic< sizeof(alignment_of_hack<T>) - 2*sizeof(T), sizeof(T)>
{};
#else