Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r73861 - in sandbox/conversion/boost/conversion: . detail type_traits
From: vicente.botet_at_[hidden]
Date: 2011-08-17 17:54:26


Author: viboes
Date: 2011-08-17 17:54:25 EDT (Wed, 17 Aug 2011)
New Revision: 73861
URL: http://svn.boost.org/trac/boost/changeset/73861

Log:
conversion: change EXPLICT_ by EXPLICTLY_
Text files modified:
   sandbox/conversion/boost/conversion/detail/is_extrinsically_explicit_convertible_or_fallback_tagged.hpp | 46 ++++++++++++++++++++--------------------
   sandbox/conversion/boost/conversion/detail/is_extrinsically_explicit_convertible_tagged.hpp | 46 ++++++++++++++++++++--------------------
   sandbox/conversion/boost/conversion/explicit_convert_to.hpp | 4 +-
   sandbox/conversion/boost/conversion/is_extrinsically_explicit_convertible.hpp | 40 +++++++++++++++++-----------------
   sandbox/conversion/boost/conversion/type_traits/is_explicitly_convertible.hpp | 22 +++++++++---------
   5 files changed, 79 insertions(+), 79 deletions(-)

Modified: sandbox/conversion/boost/conversion/detail/is_extrinsically_explicit_convertible_or_fallback_tagged.hpp
==============================================================================
--- sandbox/conversion/boost/conversion/detail/is_extrinsically_explicit_convertible_or_fallback_tagged.hpp (original)
+++ sandbox/conversion/boost/conversion/detail/is_extrinsically_explicit_convertible_or_fallback_tagged.hpp 2011-08-17 17:54:25 EDT (Wed, 17 Aug 2011)
@@ -12,8 +12,8 @@
  * @brief Defines the type trait @c is_extrinsically_explicit_convertible_or_fallback.
  */
 
-#ifndef BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_OR_FALLBACK_TAGGED_HPP
-#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_OR_FALLBACK_TAGGED_HPP
+#ifndef BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_HPP
+#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_HPP
 
 
 #if defined(BOOST_CONVERSION_DOXYGEN_INVOKED)
@@ -35,7 +35,7 @@
     struct is_extrinsically_explicit_convertible_or_fallback_tagged {};
 
   //! Macro defined if and only if the compiler doesn't support the features needed to define the @c is_extrinsically_explicit_convertible_or_fallback type trait for classes.
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_OR_FALLBACK_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED
 
   }
 }
@@ -59,53 +59,53 @@
   #if defined _MSC_VER
     #if ! defined BOOST_NO_SFINAE_EXPR
 #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
     #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_OR_FALLBACK_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED
     #endif
   #elif defined __clang__
- //#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_OR_FALLBACK_TAGGED
- //#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_DECLTYPE
+ //#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED
+ //#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_DECLTYPE
   #elif defined __GNUC__
      #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 7 )
        #if ! defined BOOST_NO_SFINAE_EXPR
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
        #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_OR_FALLBACK_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED
        #endif
      #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_OR_FALLBACK_TAGGED
- //#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_DECLTYPE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED
+ //#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_DECLTYPE
      #endif
   #else
 #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_DECLTYPE
+ #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_DECLTYPE
   #endif
 #elif ! defined BOOST_NO_SFINAE_EXPR
   #if defined __clang__
-#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
+#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
   #elif defined __GNUC__
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
   #else
     #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
   #endif
 #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_OR_FALLBACK_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED
 #endif
 
 #if ! defined BOOST_NO_RVALUE_REFERENCES
   #if defined _MSC_VER
   #elif defined __clang__
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_RVALUE
   #elif defined __GNUC__
      #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 4 )
      #else
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_RVALUE
      #endif
   #else
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_RVALUE
   #endif
 #endif
 
@@ -129,7 +129,7 @@
>
         struct imp;
 
-#if defined BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_DECLTYPE
+#if defined BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_DECLTYPE
         template <typename S, typename T, typename F>
         struct imp<S,T,F,false,false>
         {
@@ -137,7 +137,7 @@
           static decltype((
               convert_to_or_fallback(declval<S1>(),declval<F1>(), conversion::dummy::type_tag<T1>()) // EXPR
               , true_type()))
- #if defined BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_RVALUE
+ #if defined BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_RVALUE
           selector(S1&&, T1&&, F1&&);
           #else
           selector(S1&, T1&, F1&);
@@ -150,7 +150,7 @@
           typedef typename common_type<decltype(selector(declval<S>(), declval<T>(), declval<F>()))>::type type;
         };
 
-#elif defined BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
+#elif defined BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
 
         template <typename S, typename T, typename F>
         struct imp<S,T,F,false,false>

Modified: sandbox/conversion/boost/conversion/detail/is_extrinsically_explicit_convertible_tagged.hpp
==============================================================================
--- sandbox/conversion/boost/conversion/detail/is_extrinsically_explicit_convertible_tagged.hpp (original)
+++ sandbox/conversion/boost/conversion/detail/is_extrinsically_explicit_convertible_tagged.hpp 2011-08-17 17:54:25 EDT (Wed, 17 Aug 2011)
@@ -12,8 +12,8 @@
  * @brief Defines the type trait @c is_extrinsically_explicit_convertible.
  */
 
-#ifndef BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_TAGGED_HPP
-#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_TAGGED_HPP
+#ifndef BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_HPP
+#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_HPP
 
 
 #if defined(BOOST_CONVERSION_DOXYGEN_INVOKED)
@@ -35,7 +35,7 @@
     struct is_extrinsically_explicit_convertible_tagged {};
 
   //! Macro defined if and only if the compiler doesn't support the features needed to define the @c is_extrinsically_explicit_convertible type trait for classes.
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED
 
   }
 }
@@ -59,53 +59,53 @@
   #if defined _MSC_VER
     #if ! defined BOOST_NO_SFINAE_EXPR
 #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_SIZEOF
     #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED
     #endif
   #elif defined __clang__
- //#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_TAGGED_USES_DECLTYPE
- //#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_TAGGED_USES_SIZEOF
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_TAGGED
+ //#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_DECLTYPE
+ //#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED
   #elif defined __GNUC__
      #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 7 )
        #if ! defined BOOST_NO_SFINAE_EXPR
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_SIZEOF
        #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED
        #endif
      #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_TAGGED
- //#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_TAGGED_USES_DECLTYPE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED
+ //#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_DECLTYPE
      #endif
   #else
 #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_TAGGED_USES_DECLTYPE
+ #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_DECLTYPE
   #endif
 #elif ! defined BOOST_NO_SFINAE_EXPR
   #if defined __clang__
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_SIZEOF
   #elif defined __GNUC__
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_SIZEOF
   #else
     #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_SIZEOF
   #endif
 #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED
 #endif
 
 #if ! defined BOOST_NO_RVALUE_REFERENCES
   #if defined _MSC_VER
   #elif defined __clang__
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_TAGGED_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_RVALUE
   #elif defined __GNUC__
      #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 4 )
      #else
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_TAGGED_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_RVALUE
      #endif
   #else
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_TAGGED_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_RVALUE
   #endif
 #endif
 
@@ -129,7 +129,7 @@
>
     struct imp;
 
-#if defined BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_TAGGED_USES_DECLTYPE
+#if defined BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_DECLTYPE
     template <typename S, typename T>
     struct imp<S,T,false,false>
     {
@@ -137,7 +137,7 @@
       static decltype((
           explicit_convert_to(declval<S1>(), conversion::dummy::type_tag<T1>()) // EXPR
           , true_type()))
- #if defined BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_TAGGED_USES_RVALUE
+ #if defined BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_RVALUE
       selector(S1&&, T1&&);
       #else
       selector(S1&, T1&);
@@ -150,7 +150,7 @@
       typedef typename common_type<decltype(selector(declval<S>(), declval<T>()))>::type type;
     };
 
-#elif defined BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_TAGGED_USES_SIZEOF
+#elif defined BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_SIZEOF
 
     template <typename S, typename T>
     struct imp<S,T,false,false>

Modified: sandbox/conversion/boost/conversion/explicit_convert_to.hpp
==============================================================================
--- sandbox/conversion/boost/conversion/explicit_convert_to.hpp (original)
+++ sandbox/conversion/boost/conversion/explicit_convert_to.hpp 2011-08-17 17:54:25 EDT (Wed, 17 Aug 2011)
@@ -32,8 +32,8 @@
  * specialization is the only option in these cases.
  */
 
-#ifndef BOOST_CONVERSION_EXPLICIT_CONVERT_TO_HPP
-#define BOOST_CONVERSION_EXPLICIT_CONVERT_TO_HPP
+#ifndef BOOST_CONVERSION_EXPLICITLY_CONVERT_TO_HPP
+#define BOOST_CONVERSION_EXPLICITLY_CONVERT_TO_HPP
 
 #include <boost/conversion/implicit_convert_to.hpp>
 #include <boost/utility/enable_if.hpp>

Modified: sandbox/conversion/boost/conversion/is_extrinsically_explicit_convertible.hpp
==============================================================================
--- sandbox/conversion/boost/conversion/is_extrinsically_explicit_convertible.hpp (original)
+++ sandbox/conversion/boost/conversion/is_extrinsically_explicit_convertible.hpp 2011-08-17 17:54:25 EDT (Wed, 17 Aug 2011)
@@ -12,8 +12,8 @@
  * @brief Defines the type trait @c is_extrinsically_explicit_convertible.
  */
 
-#ifndef BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_HPP
-#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_HPP
+#ifndef BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_HPP
+#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_HPP
 
 #if defined(BOOST_CONVERSION_DOXYGEN_INVOKED)
 namespace boost {
@@ -38,7 +38,7 @@
     struct is_extrinsically_explicit_convertible {};
 
   //! Macro defined if and only if the compiler doesn't support the features needed to define the @c is_extrinsically_explicit_convertible type trait for classes.
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE
 
   }
 }
@@ -60,47 +60,47 @@
 #if ! defined BOOST_NO_DECLTYPE
   #if defined _MSC_VER
     #if ! defined BOOST_NO_SFINAE_EXPR
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_USES_SIZEOF
     #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE
     #endif
   #elif defined __clang__
- //#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_USES_DECLTYPE
- //#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_USES_SIZEOF
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE
+ //#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_USES_DECLTYPE
+ //#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_USES_SIZEOF
+ #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE
   #elif defined __GNUC__
      #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 7 )
        #if ! defined BOOST_NO_SFINAE_EXPR
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_USES_SIZEOF
        #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE
        #endif
      #else
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_USES_DECLTYPE
+ #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_USES_DECLTYPE
      #endif
   #else
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_USES_DECLTYPE
+ #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_USES_DECLTYPE
   #endif
 #elif ! defined BOOST_NO_SFINAE_EXPR
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_USES_SIZEOF
   #if defined __clang__
   #elif defined __GNUC__
   #endif
 #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE
 #endif
 
 #if ! defined BOOST_NO_RVALUE_REFERENCES
   #if defined _MSC_VER
   #elif defined __clang__
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_USES_RVALUE
   #elif defined __GNUC__
      #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 4 )
      #else
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_USES_RVALUE
      #endif
   #else
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_USES_RVALUE
   #endif
 #endif
 
@@ -125,7 +125,7 @@
             ))
>
         struct imp;
-#if defined BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_USES_DECLTYPE
+#if defined BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_USES_DECLTYPE
 #error
         template <class S, class T>
         struct imp<S,T,false,false>
@@ -134,7 +134,7 @@
           static decltype((
               ::boost::conversion::explicit_convert_to<T1>(declval<S1>()) // EXPR
               , true_type()))
- #if defined BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_TAGGED_USES_RVALUE
+ #if defined BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_RVALUE
           selector(S1&&, T1&&);
           #else
           selector(S1&, T1&);
@@ -146,7 +146,7 @@
 
           typedef typename common_type<decltype(selector(declval<S>(), declval<T>()))>::type type;
         };
-#elif defined BOOST_CONVERSION_IS_EXTRINSIC_EXPLICIT_CONVERTIBLE_USES_SIZEOF
+#elif defined BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_USES_SIZEOF
         template <class S, class T>
         struct imp<S,T,false,false>
         {

Modified: sandbox/conversion/boost/conversion/type_traits/is_explicitly_convertible.hpp
==============================================================================
--- sandbox/conversion/boost/conversion/type_traits/is_explicitly_convertible.hpp (original)
+++ sandbox/conversion/boost/conversion/type_traits/is_explicitly_convertible.hpp 2011-08-17 17:54:25 EDT (Wed, 17 Aug 2011)
@@ -50,7 +50,7 @@
   //! using the @c static_cast version.
   //! In this case the trait is equivalent to @c is_constructible<Target,Source>.
 
- #define BOOST_CONVERSION_NO_IS_EXPLICIT_CONVERTIBLE
+ #define BOOST_CONVERSION_NO_IS_EXPLICITLY_CONVERTIBLE
 
 }
 #else
@@ -78,26 +78,26 @@
 
 #if ! defined BOOST_NO_DECLTYPE
   #if defined _MSC_VER
- #define BOOST_CONVERSION_NO_IS_EXPLICIT_CONVERTIBLE
+ #define BOOST_CONVERSION_NO_IS_EXPLICITLY_CONVERTIBLE
   #elif defined __clang__
- #define BOOST_CONVERSION_IS_EXPLICIT_CONVERTIBLE_USES_DECLTYPE
+ #define BOOST_CONVERSION_IS_EXPLICITLY_CONVERTIBLE_USES_DECLTYPE
   #elif defined __GNUC__
      #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 4 )
        #if ! defined BOOST_NO_SFINAE_EXPR
- #define BOOST_CONVERSION_IS_EXPLICIT_CONVERTIBLE_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXPLICITLY_CONVERTIBLE_USES_SIZEOF
        #else
- #define BOOST_CONVERSION_NO_IS_EXPLICIT_CONVERTIBLE
+ #define BOOST_CONVERSION_NO_IS_EXPLICITLY_CONVERTIBLE
        #endif
      #else
- #define BOOST_CONVERSION_IS_EXPLICIT_CONVERTIBLE_USES_DECLTYPE
+ #define BOOST_CONVERSION_IS_EXPLICITLY_CONVERTIBLE_USES_DECLTYPE
      #endif
   #else
- #define BOOST_CONVERSION_IS_EXPLICIT_CONVERTIBLE_USES_DECLTYPE
+ #define BOOST_CONVERSION_IS_EXPLICITLY_CONVERTIBLE_USES_DECLTYPE
   #endif
 #elif ! defined BOOST_NO_SFINAE_EXPR
- #define BOOST_CONVERSION_IS_EXPLICIT_CONVERTIBLE_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXPLICITLY_CONVERTIBLE_USES_SIZEOF
 #else
- #define BOOST_CONVERSION_NO_IS_EXPLICIT_CONVERTIBLE
+ #define BOOST_CONVERSION_NO_IS_EXPLICITLY_CONVERTIBLE
 #endif
 
 
@@ -105,7 +105,7 @@
   namespace type_traits {
     namespace detail {
       namespace is_explicitly_convertible {
-#if defined BOOST_CONVERSION_IS_EXPLICIT_CONVERTIBLE_USES_DECLTYPE
+#if defined BOOST_CONVERSION_IS_EXPLICITLY_CONVERTIBLE_USES_DECLTYPE
 
     // specific positive test functions
   template <typename S, typename T>
@@ -128,7 +128,7 @@
     {};
 
 
-#elif defined BOOST_CONVERSION_IS_EXPLICIT_CONVERTIBLE_USES_SIZEOF
+#elif defined BOOST_CONVERSION_IS_EXPLICITLY_CONVERTIBLE_USES_SIZEOF
 
 // specialization for void, abstract, function or any of the parameters is void, scalar or reference
 // depends on whether static_cast<T>(declval<Args>() ...) is well formed


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