Merge branch 'develop'

This commit is contained in:
Ion Gaztañaga
2014-10-04 17:08:56 +02:00
3 changed files with 8 additions and 7 deletions

View File

@@ -761,6 +761,7 @@ Many thanks to all boosters that have tested, reviewed and improved the library.
* Added `move_if_noexcept` utility. Thanks to Antony Polukhin for the implementation. * Added `move_if_noexcept` utility. Thanks to Antony Polukhin for the implementation.
* Fixed bugs: * Fixed bugs:
* [@https://svn.boost.org/trac/boost/ticket/9785 Trac #9785: ['"Compiler warning with intel icc in boost/move/core.hpp"]], * [@https://svn.boost.org/trac/boost/ticket/9785 Trac #9785: ['"Compiler warning with intel icc in boost/move/core.hpp"]],
* [@https://svn.boost.org/trac/boost/ticket/10460 Trac #10460: ['"Compiler error due to looser throw specifier"]],
* [@https://github.com/boostorg/move/pull/3 Git Pull #3: ['"Don't delete copy constructor when rvalue references are disabled"]], * [@https://github.com/boostorg/move/pull/3 Git Pull #3: ['"Don't delete copy constructor when rvalue references are disabled"]],
[endsect] [endsect]

View File

@@ -19,15 +19,15 @@ class Base
public: public:
Base(){} Base(){}
Base(const Base &x) {/**/} // Copy ctor Base(const Base &/*x*/) {/**/} // Copy ctor
Base(BOOST_RV_REF(Base) x) {/**/} // Move ctor Base(BOOST_RV_REF(Base) /*x*/) {/**/} // Move ctor
Base& operator=(BOOST_RV_REF(Base) x) Base& operator=(BOOST_RV_REF(Base) /*x*/)
{/**/ return *this;} // Move assign {/**/ return *this;} // Move assign
Base& operator=(BOOST_COPY_ASSIGN_REF(Base) x) Base& operator=(BOOST_COPY_ASSIGN_REF(Base) /*x*/)
{/**/ return *this;} // Copy assign {/**/ return *this;} // Copy assign
virtual Base *clone() const virtual Base *clone() const
{ return new Base(*this); } { return new Base(*this); }

View File

@@ -71,7 +71,7 @@
>::type >::type
{ {
rv(); rv();
~rv(); ~rv() throw();
rv(rv const&); rv(rv const&);
void operator=(rv const&); void operator=(rv const&);
} BOOST_MOVE_ATTRIBUTE_MAY_ALIAS; } BOOST_MOVE_ATTRIBUTE_MAY_ALIAS;