|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r81472 - in trunk/boost/variant: . detail
From: marshall_at_[hidden]
Date: 2012-11-22 01:13:21
Author: marshall
Date: 2012-11-22 01:13:20 EST (Thu, 22 Nov 2012)
New Revision: 81472
URL: http://svn.boost.org/trac/boost/changeset/81472
Log:
Remove usage of deprecated macros
Text files modified:
trunk/boost/variant/detail/move.hpp | 2 +-
trunk/boost/variant/variant.hpp | 24 ++++++++++++------------
2 files changed, 13 insertions(+), 13 deletions(-)
Modified: trunk/boost/variant/detail/move.hpp
==============================================================================
--- trunk/boost/variant/detail/move.hpp (original)
+++ trunk/boost/variant/detail/move.hpp 2012-11-22 01:13:20 EST (Thu, 22 Nov 2012)
@@ -82,7 +82,7 @@
} // namespace detail
-#ifdef BOOST_NO_RVALUE_REFERENCES
+#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
template <typename T>
inline
Modified: trunk/boost/variant/variant.hpp
==============================================================================
--- trunk/boost/variant/variant.hpp (original)
+++ trunk/boost/variant/variant.hpp 2012-11-22 01:13:20 EST (Thu, 22 Nov 2012)
@@ -437,7 +437,7 @@
//
// Internal visitor that moves the value it visits into the given buffer.
//
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
class move_into
: public static_visitor<>
{
@@ -1613,7 +1613,7 @@
indicate_which(operand.which());
}
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
variant(variant&& operand)
{
// Move the value of operand into *this...
@@ -1778,7 +1778,7 @@
friend class assigner;
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
// class move_assigner
//
// Internal visitor that "move assigns" the visited value to the given variant
@@ -1921,7 +1921,7 @@
};
friend class move_assigner;
-#endif // BOOST_NO_RVALUE_REFERENCES
+#endif // BOOST_NO_CXX11_RVALUE_REFERENCES
void variant_assign(const variant& rhs)
{
@@ -1940,7 +1940,7 @@
}
}
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
void variant_assign(variant&& rhs)
{
// If the contained types are EXACTLY the same...
@@ -1957,7 +1957,7 @@
rhs.internal_apply_visitor(visitor);
}
}
-#endif // BOOST_NO_RVALUE_REFERENCES
+#endif // BOOST_NO_CXX11_RVALUE_REFERENCES
private: // helpers, for modifiers (below)
@@ -1979,7 +1979,7 @@
}
}
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
template <typename T>
void move_assign(T&& rhs)
{
@@ -1997,18 +1997,18 @@
variant_assign( detail::variant::move(temp) );
}
}
-#endif // BOOST_NO_RVALUE_REFERENCES
+#endif // BOOST_NO_CXX11_RVALUE_REFERENCES
public: // modifiers
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
template <class T>
typename boost::enable_if<boost::is_rvalue_reference<T&&>, variant& >::type operator=(T&& rhs)
{
move_assign( detail::variant::move(rhs) );
return *this;
}
-#endif // BOOST_NO_RVALUE_REFERENCES
+#endif // BOOST_NO_CXX11_RVALUE_REFERENCES
template <typename T>
variant& operator=(const T& rhs)
@@ -2024,13 +2024,13 @@
return *this;
}
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
variant& operator=(variant&& rhs)
{
variant_assign( detail::variant::move(rhs) );
return *this;
}
-#endif // BOOST_NO_RVALUE_REFERENCES
+#endif // BOOST_NO_CXX11_RVALUE_REFERENCES
void swap(variant& rhs)
{
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk