Merge branch 'develop'

This commit is contained in:
Ion Gaztañaga
2014-10-12 10:26:00 +02:00

View File

@@ -390,12 +390,12 @@
//!For non-conforming compilers with rvalue references like Visual 2010 & 2012, //!For non-conforming compilers with rvalue references like Visual 2010 & 2012,
//!an explicit move is performed if RET_TYPE is not a reference. //!an explicit move is performed if RET_TYPE is not a reference.
//! //!
//! <b>Caution</b>: When using this macro in a non-conforming or C++03 //! <b>Caution</b>: When using this macro in non-conforming or C++03
//!compilers, a move will be performed even if the C++11 standard does not allow it //!compilers, a move will be performed even if the C++11 standard does not allow it
//!(e.g. returning a static variable). The user is responsible for using this macro //!(e.g. returning a static variable). The user is responsible for using this macro
//!only used to return local objects that met C++11 criteria. //!only to return local objects that met C++11 criteria.
#define BOOST_MOVE_RET(RET_TYPE, REF)\ #define BOOST_MOVE_RET(RET_TYPE, REF)\
(REF) REF
// //
#else //!defined(BOOST_MOVE_MSVC_AUTO_MOVE_RETURN_BUG) || defined(BOOST_MOVE_DOXYGEN_INVOKED) #else //!defined(BOOST_MOVE_MSVC_AUTO_MOVE_RETURN_BUG) || defined(BOOST_MOVE_DOXYGEN_INVOKED)