[Boost-commit] svn:boost r71171 - in sandbox/opaque/boost/opaque: . meta_mixin

Subject: [Boost-commit] svn:boost r71171 - in sandbox/opaque/boost/opaque: . meta_mixin
From: vicente.botet_at_[hidden]
Date: 2011-04-10 16:51:34

Author: viboes
Date: 2011-04-10 16:51:33 EDT (Sun, 10 Apr 2011)
New Revision: 71171
URL: http://svn.boost.org/trac/boost/changeset/71171

Log:
Opaque: update comments
Text files modified: 
   sandbox/opaque/boost/opaque/meta_mixin/combined_operators.hpp                        |     1 -                                       
   sandbox/opaque/boost/opaque/meta_mixin/operators.hpp                                 |     6 +++++-                                  
   sandbox/opaque/boost/opaque/meta_mixin/using_explicit_conversion_to_ut_hierarchy.hpp |     7 +++++--                                 
   sandbox/opaque/boost/opaque/new_class.hpp                                            |     2 +-                                      
   4 files changed, 11 insertions(+), 5 deletions(-)

Modified: sandbox/opaque/boost/opaque/meta_mixin/combined_operators.hpp
==============================================================================
--- sandbox/opaque/boost/opaque/meta_mixin/combined_operators.hpp	(original)
+++ sandbox/opaque/boost/opaque/meta_mixin/combined_operators.hpp	2011-04-10 16:51:33 EDT (Sun, 10 Apr 2011)
@@ -27,7 +27,6 @@
 #define BOOST_OPAQUE_COMBINED_OPERATORS_HPP
 #if !defined(BOOST_OPAQUE_DOXYGEN_INVOKED)
 
-#include <boost/operators.hpp>
 #include <boost/opaque/meta_mixin/operators.hpp>
 
 namespace boost {

Modified: sandbox/opaque/boost/opaque/meta_mixin/operators.hpp
==============================================================================
--- sandbox/opaque/boost/opaque/meta_mixin/operators.hpp	(original)
+++ sandbox/opaque/boost/opaque/meta_mixin/operators.hpp	2011-04-10 16:51:33 EDT (Sun, 10 Apr 2011)
@@ -64,7 +64,9 @@
 #if !defined(BOOST_OPAQUE_DOXYGEN_INVOKED)
 
 #include <boost/config.hpp>
+#if !defined(BOOST_OPAQUE_NOT_DEPENDS_ON_CONVERSION)
 #include <boost/conversion/convert_to.hpp>
+#endif
 
 #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS_BUG
 
@@ -140,12 +142,14 @@
     struct using_explicit_conversion_to {
         template <typename Final, typename Base>
         struct type: Base {
+#if !defined(BOOST_OPAQUE_NOT_DEPENDS_ON_CONVERSION) || defined(BOOST_OPAQUE_DOXYGEN_INVOKED)
             friend T convert_to(Final const& rhs,
                 boost::dummy::type_tag<T> const&)
             {
               return T(Final::underlying(rhs));
             }
-    #if !defined(BOOST_NO_EXPLICIT_CONVERSION_OPERATORS)
+#endif
+    #if !defined(BOOST_NO_EXPLICIT_CONVERSION_OPERATORS) || defined(BOOST_OPAQUE_DOXYGEN_INVOKED)
             explicit operator T() const
             {
               return T(Final::underlying(this));

Modified: sandbox/opaque/boost/opaque/meta_mixin/using_explicit_conversion_to_ut_hierarchy.hpp
==============================================================================
--- sandbox/opaque/boost/opaque/meta_mixin/using_explicit_conversion_to_ut_hierarchy.hpp	(original)
+++ sandbox/opaque/boost/opaque/meta_mixin/using_explicit_conversion_to_ut_hierarchy.hpp	2011-04-10 16:51:33 EDT (Sun, 10 Apr 2011)
@@ -23,8 +23,9 @@
 #include <boost/type_traits/is_class.hpp>
 #include <boost/type_traits/is_base_of.hpp>
 #include <boost/mpl/and.hpp>
+#if !defined(BOOST_OPAQUE_NOT_DEPENDS_ON_CONVERSION)
 #include <boost/conversion/convert_to.hpp>
-
+#endif
 namespace boost {
   namespace opaque {
 
@@ -75,12 +76,14 @@
       : opaque_detail::transitive_explicit_substituable_next_level<BaseClass, Final, UT, Base,
         mpl::and_<is_class<UT>, is_base_of<BaseClass, UT> >::value>
       {
+#if !defined(BOOST_OPAQUE_NOT_DEPENDS_ON_CONVERSION) || defined(BOOST_OPAQUE_DOXYGEN_INVOKED)
         friend UT convert_to(Final const& rhs,
             boost::dummy::type_tag<UT> const&)
         {
           return Final::final(&rhs).underlying();
         }
-#if !defined(BOOST_NO_EXPLICIT_CONVERSION_OPERATORS)
+#endif
+#if !defined(BOOST_NO_EXPLICIT_CONVERSION_OPERATORS)  || defined(BOOST_OPAQUE_DOXYGEN_INVOKED)
         explicit operator UT() const
         {
           return Final::final(this).underlying();

Modified: sandbox/opaque/boost/opaque/new_class.hpp
==============================================================================
--- sandbox/opaque/boost/opaque/new_class.hpp	(original)
+++ sandbox/opaque/boost/opaque/new_class.hpp	2011-04-10 16:51:33 EDT (Sun, 10 Apr 2011)
@@ -111,7 +111,7 @@
       underlying_type& underlying() {
         return val_;
       }
-#if !defined(BOOST_NO_EXPLICIT_CONVERSION_OPERATORS)
+#if !defined(BOOST_NO_EXPLICIT_CONVERSION_OPERATORS)  || defined(BOOST_OPAQUE_DOXYGEN_INVOKED)
       //! explicit conversion operator to the underlying type.
       //!
       //! @Remark Only provided when supported by the compiler.