From 52530c4b74929812801900e327d4facb87a9c0c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= <igaztanaga@gmail.com>
Date: Thu, 8 Sep 2011 06:57:58 +0000
Subject: [PATCH] Documentation fixes

[SVN r74305]
---
 include/boost/move/move.hpp | 58 +++++++++++++++----------------------
 1 file changed, 23 insertions(+), 35 deletions(-)

diff --git a/include/boost/move/move.hpp b/include/boost/move/move.hpp
index 0a289fc..87d63c6 100644
--- a/include/boost/move/move.hpp
+++ b/include/boost/move/move.hpp
@@ -15,6 +15,8 @@
 #ifndef BOOST_MOVE_MOVE_HPP
 #define BOOST_MOVE_MOVE_HPP
 
+#if !defined(BOOST_MOVE_DOXYGEN_INVOKED)
+
 /// @cond
 
 #include <boost/config.hpp>
@@ -206,6 +208,8 @@
 
 /// @endcond
 
+#endif //#if !defined(BOOST_MOVE_DOXYGEN_INVOKED)
+
 #if defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED)
 
    //Move emulation rv breaks standard aliasing rules so add workarounds for some compilers
@@ -508,21 +512,6 @@
 
    #endif   //#if defined(BOOST_MOVE_USE_STANDARD_LIBRARY_MOVE)
 
-   //////////////////////////////////////////////////////////////////////////////
-   //
-   //                         BOOST_ENABLE_MOVE_EMULATION
-   //
-   //////////////////////////////////////////////////////////////////////////////
-
-   ///@cond
-
-   #define BOOST_ENABLE_MOVE_EMULATION(TYPE)\
-      typedef int boost_move_emulation_t;
-   \
-   //
-
-   /// @endcond
-
    //! This macro marks a type as movable but not copyable, disabling copy construction
    //! and assignment. The user will need to write a move constructor/assignment as explained
    //! in the documentation to fully write a movable but not copyable class.
@@ -540,18 +529,9 @@
    #define BOOST_COPYABLE_AND_MOVABLE(TYPE)\
    //
 
-   /// @cond
-
-   #define BOOST_RV_REF_2_TEMPL_ARGS(TYPE, ARG1, ARG2)\
-      TYPE<ARG1, ARG2> && \
+   #define BOOST_COPYABLE_AND_MOVABLE_ALT(TYPE)\
    //
 
-   #define BOOST_RV_REF_3_TEMPL_ARGS(TYPE, ARG1, ARG2, ARG3)\
-      TYPE<ARG1, ARG2, ARG3> && \
-   //
-
-   /// @endcond
-
    //!This macro is used to achieve portable syntax in move
    //!constructors and assignments for classes marked as
    //!BOOST_COPYABLE_AND_MOVABLE or BOOST_MOVABLE_BUT_NOT_COPYABLE
@@ -565,8 +545,24 @@
       const TYPE & \
    //
 
+   //! This macro is used to implement portable perfect forwarding
+   //! as explained in the documentation.
+   #define BOOST_FWD_REF(TYPE)\
+      TYPE && \
+   //
+
+
+   #if !defined(BOOST_MOVE_DOXYGEN_INVOKED)
    /// @cond
 
+   #define BOOST_RV_REF_2_TEMPL_ARGS(TYPE, ARG1, ARG2)\
+      TYPE<ARG1, ARG2> && \
+   //
+
+   #define BOOST_RV_REF_3_TEMPL_ARGS(TYPE, ARG1, ARG2, ARG3)\
+      TYPE<ARG1, ARG2, ARG3> && \
+   //
+
    #define BOOST_COPY_REF_2_TEMPL_ARGS(TYPE, ARG1, ARG2)\
       const TYPE<ARG1, ARG2> & \
    //
@@ -575,22 +571,14 @@
       TYPE<ARG1, ARG2, ARG3>& \
    //
 
-   /// @endcond
-
-   //! This macro is used to implement portable perfect forwarding
-   //! as explained in the documentation.
-   #define BOOST_FWD_REF(TYPE)\
-      TYPE && \
-   //
-
-   /// @cond
-
    #define BOOST_CATCH_CONST_RLVALUE(TYPE)\
       const TYPE & \
    //
 
    /// @endcond
 
+   #endif   //#if !defined(BOOST_MOVE_DOXYGEN_INVOKED)
+
 #endif   //BOOST_NO_RVALUE_REFERENCES
 
 namespace boost {