Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r73864 - in sandbox/conversion/boost/conversion: . detail
From: vicente.botet_at_[hidden]
Date: 2011-08-17 18:02:06


Author: viboes
Date: 2011-08-17 18:02:05 EDT (Wed, 17 Aug 2011)
New Revision: 73864
URL: http://svn.boost.org/trac/boost/changeset/73864

Log:
conversion: change EXTRINSIC_ by EXTRINSICALLY_
Text files modified:
   sandbox/conversion/boost/conversion/detail/is_extrinsically_assignable_tagged.hpp | 58 ++++++++++++++++++++--------------------
   sandbox/conversion/boost/conversion/detail/is_extrinsically_convertible_tagged.hpp | 50 +++++++++++++++++-----------------
   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/detail/is_extrinsically_try_assignable_tagged.hpp | 56 +++++++++++++++++++-------------------
   sandbox/conversion/boost/conversion/detail/is_extrinsically_try_convertible_tagged.hpp | 48 ++++++++++++++++----------------
   sandbox/conversion/boost/conversion/is_extrinsically_assignable.hpp | 54 ++++++++++++++++++------------------
   sandbox/conversion/boost/conversion/is_extrinsically_convertible.hpp | 38 +++++++++++++-------------
   sandbox/conversion/boost/conversion/is_extrinsically_explicit_convertible.hpp | 40 +++++++++++++-------------
   9 files changed, 218 insertions(+), 218 deletions(-)

Modified: sandbox/conversion/boost/conversion/detail/is_extrinsically_assignable_tagged.hpp
==============================================================================
--- sandbox/conversion/boost/conversion/detail/is_extrinsically_assignable_tagged.hpp (original)
+++ sandbox/conversion/boost/conversion/detail/is_extrinsically_assignable_tagged.hpp 2011-08-17 18:02:05 EDT (Wed, 17 Aug 2011)
@@ -12,8 +12,8 @@
  * @brief Defines the type trait @c is_extrinsically_assignable_tagged.
  */
 
-#ifndef BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_TAGGED_HPP
-#define BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_TAGGED_HPP
+#ifndef BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED_HPP
+#define BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED_HPP
 
 #if defined(BOOST_CONVERSION_DOXYGEN_INVOKED)
 namespace boost {
@@ -34,7 +34,7 @@
     struct is_extrinsically_assignable_tagged {};
 
   //! Macro defined if and only if the compiler doesn't support the features needed to define the @c is_extrinsically_assignable type trait for classes.
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_ASSIGNABLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED
 
   }
 }
@@ -59,61 +59,61 @@
   #if defined _MSC_VER
     #if ! defined BOOST_NO_SFINAE_EXPR
 #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED_USES_SIZEOF
     #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_ASSIGNABLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED
     #endif
   #elif defined __clang__
-//#define BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_TAGGED_USES_SIZEOF
-//#define BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_TAGGED_USES_DECLTYPE
-#define BOOST_CONVERSION_NO_IS_EXTRINSIC_ASSIGNABLE_TAGGED
+//#define BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED_USES_SIZEOF
+//#define BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED_USES_DECLTYPE
+#define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED
 #elif defined __GNUC__
      #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 4 )
        #if ! defined BOOST_NO_SFINAE_EXPR
- #define BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED_USES_SIZEOF
        #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_ASSIGNABLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED
        #endif
      #else
- //#define BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_TAGGED_USES_SIZEOF
- //#define BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_TAGGED_USES_DECLTYPE
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_ASSIGNABLE_TAGGED
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED_USES_SIZEOF
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED_USES_DECLTYPE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED
      #endif
   #else
 #error
- //#define BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_TAGGED_USES_SIZEOF
- #define BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_TAGGED_USES_DECLTYPE
- //#define BOOST_CONVERSION_NO_IS_EXTRINSIC_ASSIGNABLE_TAGGED
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED_USES_DECLTYPE
+ //#define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED
   #endif
 #elif ! defined BOOST_NO_SFINAE_EXPR
   #if defined _MSC_VER
 #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED_USES_SIZEOF
 #elif defined __clang__
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_ASSIGNABLE_TAGGED
- //#define BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED_USES_SIZEOF
   #elif defined __GNUC__
- //#define BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_TAGGED_USES_SIZEOF
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_ASSIGNABLE_TAGGED
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED
   #else
 #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED_USES_SIZEOF
   #endif
 #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_ASSIGNABLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED
 #endif
 
 #if ! defined BOOST_NO_RVALUE_REFERENCES
   #if defined _MSC_VER
   #elif defined __clang__
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_ASSIGNABLE_TAGGED_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED_USES_RVALUE
   #elif defined __GNUC__
      #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 4 )
      #else
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_ASSIGNABLE_TAGGED_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED_USES_RVALUE
      #endif
   #else
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_ASSIGNABLE_TAGGED_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED_USES_RVALUE
   #endif
 #endif
 
@@ -135,7 +135,7 @@
          || is_function<T>::value >
         struct imp;
 
-#if defined BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_TAGGED_USES_DECLTYPE
+#if defined BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED_USES_DECLTYPE
         template <typename T, typename S>
         struct imp<T,S,false,false>
         {
@@ -143,7 +143,7 @@
           static decltype((
               assign_to(declval<T1>(), declval<S1>()) // EXPR
               , true_type()))
- #if defined BOOST_CONVERSION_TT_IS_EXTRINSIC_ASSIGNABLE_TAGGED_USES_RVALUE
+ #if defined BOOST_CONVERSION_TT_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED_USES_RVALUE
           selector(T1&&, S1&&);
           #else
           selector(T1&, S1&);
@@ -156,7 +156,7 @@
           typedef typename common_type<decltype(selector(declval<T>(), declval<S>()))>::type type;
         };
 
-#elif defined BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_TAGGED_USES_SIZEOF
+#elif defined BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_TAGGED_USES_SIZEOF
 
         template <typename T, typename S>
         struct imp<T,S,false,false>

Modified: sandbox/conversion/boost/conversion/detail/is_extrinsically_convertible_tagged.hpp
==============================================================================
--- sandbox/conversion/boost/conversion/detail/is_extrinsically_convertible_tagged.hpp (original)
+++ sandbox/conversion/boost/conversion/detail/is_extrinsically_convertible_tagged.hpp 2011-08-17 18:02:05 EDT (Wed, 17 Aug 2011)
@@ -12,8 +12,8 @@
  * @brief Defines the type trait @c is_extrinsically_convertible_tagged.
  */
 
-#ifndef BOOST_CONVERSION_IS_EXTRINSIC_CONVERTIBLE_TAGGED_HPP
-#define BOOST_CONVERSION_IS_EXTRINSIC_CONVERTIBLE_TAGGED_HPP
+#ifndef BOOST_CONVERSION_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED_HPP
+#define BOOST_CONVERSION_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED_HPP
 
 #if defined(BOOST_CONVERSION_DOXYGEN_INVOKED)
 namespace boost {
@@ -34,7 +34,7 @@
     struct is_extrinsically_convertible_tagged {};
 
   //! Macro defined if and only if the compiler doesn't support the features needed to define the @c is_extrinsically_convertible type trait for classes.
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_CONVERTIBLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED
 
   }
 }
@@ -59,57 +59,57 @@
   #if defined _MSC_VER
     #if ! defined BOOST_NO_SFINAE_EXPR
 #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_CONVERTIBLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED_USES_SIZEOF
     #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_CONVERTIBLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED
     #endif
   #elif defined __clang__
- //#define BOOST_CONVERSION_IS_EXTRINSIC_CONVERTIBLE_TAGGED_USES_DECLTYPE
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_CONVERTIBLE_TAGGED
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED_USES_DECLTYPE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED
   #elif defined __GNUC__
      #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 7 )
        #if ! defined BOOST_NO_SFINAE_EXPR
- #define BOOST_CONVERSION_IS_EXTRINSIC_CONVERTIBLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED_USES_SIZEOF
        #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_CONVERTIBLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED
        #endif
      #else
- //#define BOOST_CONVERSION_IS_EXTRINSIC_CONVERTIBLE_TAGGED_USES_DECLTYPE
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_CONVERTIBLE_TAGGED
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED_USES_DECLTYPE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED
      #endif
   #else
 #error
- //#define BOOST_CONVERSION_IS_EXTRINSIC_CONVERTIBLE_TAGGED_USES_SIZEOF
- #define BOOST_CONVERSION_IS_EXTRINSIC_CONVERTIBLE_TAGGED_USES_DECLTYPE
- //#define BOOST_CONVERSION_NO_IS_EXTRINSIC_CONVERTIBLE_TAGGED
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED_USES_DECLTYPE
+ //#define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED
   #endif
 #elif ! defined BOOST_NO_SFINAE_EXPR
   #if defined _MSC_VER
 #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_CONVERTIBLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED_USES_SIZEOF
 #elif defined __clang__
- #define BOOST_CONVERSION_IS_EXTRINSIC_CONVERTIBLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED_USES_SIZEOF
   #elif defined __GNUC__
- #define BOOST_CONVERSION_IS_EXTRINSIC_CONVERTIBLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED_USES_SIZEOF
   #else
 #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_CONVERTIBLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED_USES_SIZEOF
   #endif
 #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_CONVERTIBLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED
 #endif
 
 #if ! defined BOOST_NO_RVALUE_REFERENCES
   #if defined _MSC_VER
   #elif defined __clang__
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_CONVERTIBLE_TAGGED_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED_USES_RVALUE
   #elif defined __GNUC__
      #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 4 )
      #else
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_CONVERTIBLE_TAGGED_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED_USES_RVALUE
      #endif
   #else
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_CONVERTIBLE_TAGGED_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED_USES_RVALUE
   #endif
 #endif
 
@@ -131,7 +131,7 @@
        || is_function<T>::value >
       struct imp;
 
-#if defined BOOST_CONVERSION_IS_EXTRINSIC_CONVERTIBLE_TAGGED_USES_DECLTYPE
+#if defined BOOST_CONVERSION_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED_USES_DECLTYPE
       template <typename S, typename T>
       struct imp<S,T,false,false>
       {
@@ -139,7 +139,7 @@
         static decltype((
             implicit_convert_to(declval<S1>(), conversion::dummy::type_tag<T1>()) // EXPR
             , true_type()))
- #if defined BOOST_CONVERSION_TT_IS_EXTRINSIC_CONVERTIBLE_TAGGED_USES_RVALUE
+ #if defined BOOST_CONVERSION_TT_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED_USES_RVALUE
         selector(S1&&, T1&&);
         #else
         selector(S1&, T1&);
@@ -152,7 +152,7 @@
         typedef typename common_type<decltype(selector(declval<S>(), declval<T>()))>::type type;
       };
 
-#elif defined BOOST_CONVERSION_IS_EXTRINSIC_CONVERTIBLE_TAGGED_USES_SIZEOF
+#elif defined BOOST_CONVERSION_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED_USES_SIZEOF
 
       template <typename S, typename T>
       struct imp<S,T,false,false>

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 18:02:05 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_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_HPP
-#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_HPP
+#ifndef BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_HPP
+#define BOOST_CONVERSION_IS_EXTRINSICALLY_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_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_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_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
     #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED
     #endif
   #elif defined __clang__
- //#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
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_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_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
        #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED
        #endif
      #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED
- //#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_DECLTYPE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_DECLTYPE
      #endif
   #else
 #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_DECLTYPE
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_DECLTYPE
   #endif
 #elif ! defined BOOST_NO_SFINAE_EXPR
   #if defined __clang__
-#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
+#define BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
   #elif defined __GNUC__
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
   #else
     #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
   #endif
 #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_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_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_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_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_RVALUE
      #endif
   #else
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_RVALUE
   #endif
 #endif
 
@@ -129,7 +129,7 @@
>
         struct imp;
 
-#if defined BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_DECLTYPE
+#if defined BOOST_CONVERSION_IS_EXTRINSICALLY_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_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_RVALUE
+ #if defined BOOST_CONVERSION_TT_IS_EXTRINSICALLY_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_EXPLICITLY_CONVERTIBLE_OR_FALLBACK_TAGGED_USES_SIZEOF
+#elif defined BOOST_CONVERSION_IS_EXTRINSICALLY_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 18:02:05 EDT (Wed, 17 Aug 2011)
@@ -12,8 +12,8 @@
  * @brief Defines the type trait @c is_extrinsically_explicit_convertible.
  */
 
-#ifndef BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_HPP
-#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_HPP
+#ifndef BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_TAGGED_HPP
+#define BOOST_CONVERSION_IS_EXTRINSICALLY_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_EXPLICITLY_CONVERTIBLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_TAGGED
 
   }
 }
@@ -59,53 +59,53 @@
   #if defined _MSC_VER
     #if ! defined BOOST_NO_SFINAE_EXPR
 #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_TAGGED_USES_SIZEOF
     #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_TAGGED
     #endif
   #elif defined __clang__
- //#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
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_TAGGED_USES_DECLTYPE
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_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_EXPLICITLY_CONVERTIBLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_TAGGED_USES_SIZEOF
        #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_TAGGED
        #endif
      #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED
- //#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_DECLTYPE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_TAGGED
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_TAGGED_USES_DECLTYPE
      #endif
   #else
 #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_DECLTYPE
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_TAGGED_USES_DECLTYPE
   #endif
 #elif ! defined BOOST_NO_SFINAE_EXPR
   #if defined __clang__
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_TAGGED_USES_SIZEOF
   #elif defined __GNUC__
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_TAGGED_USES_SIZEOF
   #else
     #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_TAGGED_USES_SIZEOF
   #endif
 #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_TAGGED
 #endif
 
 #if ! defined BOOST_NO_RVALUE_REFERENCES
   #if defined _MSC_VER
   #elif defined __clang__
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_TAGGED_USES_RVALUE
   #elif defined __GNUC__
      #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 4 )
      #else
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_TAGGED_USES_RVALUE
      #endif
   #else
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_TAGGED_USES_RVALUE
   #endif
 #endif
 
@@ -129,7 +129,7 @@
>
     struct imp;
 
-#if defined BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_TAGGED_USES_DECLTYPE
+#if defined BOOST_CONVERSION_IS_EXTRINSICALLY_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_EXPLICITLY_CONVERTIBLE_TAGGED_USES_RVALUE
+ #if defined BOOST_CONVERSION_TT_IS_EXTRINSICALLY_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_EXPLICITLY_CONVERTIBLE_TAGGED_USES_SIZEOF
+#elif defined BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_TAGGED_USES_SIZEOF
 
     template <typename S, typename T>
     struct imp<S,T,false,false>

Modified: sandbox/conversion/boost/conversion/detail/is_extrinsically_try_assignable_tagged.hpp
==============================================================================
--- sandbox/conversion/boost/conversion/detail/is_extrinsically_try_assignable_tagged.hpp (original)
+++ sandbox/conversion/boost/conversion/detail/is_extrinsically_try_assignable_tagged.hpp 2011-08-17 18:02:05 EDT (Wed, 17 Aug 2011)
@@ -12,8 +12,8 @@
  * @brief Defines the type trait @c is_extrinsically_try_assignable_tagged.
  */
 
-#ifndef BOOST_CONVERSION_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED_HPP
-#define BOOST_CONVERSION_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED_HPP
+#ifndef BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED_HPP
+#define BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED_HPP
 
 #if defined(BOOST_CONVERSION_DOXYGEN_INVOKED)
 namespace boost {
@@ -34,7 +34,7 @@
     struct is_extrinsically_try_assignable_tagged {};
 
   //! Macro defined if and only if the compiler doesn't support the features needed to define the @c is_extrinsically_try_assignable type trait for classes.
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED
 
   }
 }
@@ -60,61 +60,61 @@
   #if defined _MSC_VER
     #if ! defined BOOST_NO_SFINAE_EXPR
 #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED_USES_SIZEOF
     #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED
     #endif
   #elif defined __clang__
- //#define BOOST_CONVERSION_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED_USES_SIZEOF
- //#define BOOST_CONVERSION_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED_USES_DECLTYPE
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED_USES_SIZEOF
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED_USES_DECLTYPE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED
 #elif defined __GNUC__
      #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 4 )
        #if ! defined BOOST_NO_SFINAE_EXPR
 #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED_USES_SIZEOF
        #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED
        #endif
      #else
- //#define BOOST_CONVERSION_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED_USES_SIZEOF
- //#define BOOST_CONVERSION_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED_USES_DECLTYPE
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED_USES_SIZEOF
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED_USES_DECLTYPE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED
      #endif
   #else
 #error
- //#define BOOST_CONVERSION_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED_USES_SIZEOF
- #define BOOST_CONVERSION_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED_USES_DECLTYPE
- //#define BOOST_CONVERSION_NO_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED_USES_DECLTYPE
+ //#define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED
   #endif
 #elif ! defined BOOST_NO_SFINAE_EXPR
   #if defined _MSC_VER
 #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED_USES_SIZEOF
 #elif defined __clang__
- //#define BOOST_CONVERSION_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED_USES_SIZEOF
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED
   #elif defined __GNUC__
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED
   #else
 #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED_USES_SIZEOF
   #endif
 #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED
 #endif
 
 #if ! defined BOOST_NO_RVALUE_REFERENCES
   #if defined _MSC_VER
   #elif defined __clang__
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED_USES_RVALUE
   #elif defined __GNUC__
      #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 4 )
      #else
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED_USES_RVALUE
      #endif
   #else
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED_USES_RVALUE
   #endif
 #endif
 
@@ -137,7 +137,7 @@
          || is_function<T>::value >
         struct imp;
 
-#if defined BOOST_CONVERSION_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED_USES_DECLTYPE
+#if defined BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED_USES_DECLTYPE
         template <typename T, typename S>
         struct imp<T,S,false,false>
         {
@@ -145,7 +145,7 @@
           static decltype((
               try_assign_to(declval<T1>(), declval<S1>()) // EXPR
               , true_type()))
- #if defined BOOST_CONVERSION_TT_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED_USES_RVALUE
+ #if defined BOOST_CONVERSION_TT_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED_USES_RVALUE
           selector(T1&&, S1&&);
           #else
           selector(T1&, S1&);
@@ -158,7 +158,7 @@
           typedef typename common_type<decltype(selector(declval<T>(), declval<S>()))>::type type;
         };
 
-#elif defined BOOST_CONVERSION_IS_EXTRINSIC_TRY_ASSIGNABLE_TAGGED_USES_SIZEOF
+#elif defined BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_ASSIGNABLE_TAGGED_USES_SIZEOF
 
         template <typename T, typename S>
         struct imp<T,S,false,false>

Modified: sandbox/conversion/boost/conversion/detail/is_extrinsically_try_convertible_tagged.hpp
==============================================================================
--- sandbox/conversion/boost/conversion/detail/is_extrinsically_try_convertible_tagged.hpp (original)
+++ sandbox/conversion/boost/conversion/detail/is_extrinsically_try_convertible_tagged.hpp 2011-08-17 18:02:05 EDT (Wed, 17 Aug 2011)
@@ -12,8 +12,8 @@
  * @brief Defines the type trait @c is_extrinsically_try_convertible.
  */
 
-#ifndef BOOST_CONVERSION_IS_EXTRINSIC_TRY_CONVERTIBLE_TAGGED_HPP
-#define BOOST_CONVERSION_IS_EXTRINSIC_TRY_CONVERTIBLE_TAGGED_HPP
+#ifndef BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_CONVERTIBLE_TAGGED_HPP
+#define BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_CONVERTIBLE_TAGGED_HPP
 
 
 #if defined(BOOST_CONVERSION_DOXYGEN_INVOKED)
@@ -35,7 +35,7 @@
     struct is_extrinsically_try_convertible_tagged {};
 
   //! Macro defined if and only if the compiler doesn't support the features needed to define the @c is_extrinsically_try_convertible type trait for classes.
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_TRY_CONVERTIBLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_TRY_CONVERTIBLE_TAGGED
 
   }
 }
@@ -60,54 +60,54 @@
   #if defined _MSC_VER
     #if ! defined BOOST_NO_SFINAE_EXPR
 #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_TRY_CONVERTIBLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_CONVERTIBLE_TAGGED_USES_SIZEOF
     #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_TRY_CONVERTIBLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_TRY_CONVERTIBLE_TAGGED
     #endif
   #elif defined __clang__
- //#define BOOST_CONVERSION_IS_EXTRINSIC_TRY_CONVERTIBLE_TAGGED_USES_DECLTYPE
- //#define BOOST_CONVERSION_IS_EXTRINSIC_TRY_CONVERTIBLE_TAGGED_USES_SIZEOF
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_TRY_CONVERTIBLE_TAGGED
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_CONVERTIBLE_TAGGED_USES_DECLTYPE
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_CONVERTIBLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_TRY_CONVERTIBLE_TAGGED
   #elif defined __GNUC__
      #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 7 )
        #if ! defined BOOST_NO_SFINAE_EXPR
- #define BOOST_CONVERSION_IS_EXTRINSIC_TRY_CONVERTIBLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_CONVERTIBLE_TAGGED_USES_SIZEOF
        #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_TRY_CONVERTIBLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_TRY_CONVERTIBLE_TAGGED
        #endif
      #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_TRY_CONVERTIBLE_TAGGED
- //#define BOOST_CONVERSION_IS_EXTRINSIC_TRY_CONVERTIBLE_TAGGED_USES_DECLTYPE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_TRY_CONVERTIBLE_TAGGED
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_CONVERTIBLE_TAGGED_USES_DECLTYPE
      #endif
   #else
 #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_TRY_CONVERTIBLE_TAGGED_USES_DECLTYPE
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_CONVERTIBLE_TAGGED_USES_DECLTYPE
   #endif
 #elif ! defined BOOST_NO_SFINAE_EXPR
   #if defined __clang__
-#define BOOST_CONVERSION_IS_EXTRINSIC_TRY_CONVERTIBLE_TAGGED_USES_SIZEOF
+#define BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_CONVERTIBLE_TAGGED_USES_SIZEOF
   #elif defined __GNUC__
- #define BOOST_CONVERSION_IS_EXTRINSIC_TRY_CONVERTIBLE_TAGGED_USES_SIZEOF
- //#define BOOST_CONVERSION_NO_IS_EXTRINSIC_TRY_CONVERTIBLE_TAGGED
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_CONVERTIBLE_TAGGED_USES_SIZEOF
+ //#define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_TRY_CONVERTIBLE_TAGGED
   #else
     #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_TRY_CONVERTIBLE_TAGGED_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_CONVERTIBLE_TAGGED_USES_SIZEOF
   #endif
 #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_TRY_CONVERTIBLE_TAGGED
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_TRY_CONVERTIBLE_TAGGED
 #endif
 
 #if ! defined BOOST_NO_RVALUE_REFERENCES
   #if defined _MSC_VER
   #elif defined __clang__
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_TRY_CONVERTIBLE_TAGGED_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_TRY_CONVERTIBLE_TAGGED_USES_RVALUE
   #elif defined __GNUC__
      #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 4 )
      #else
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_TRY_CONVERTIBLE_TAGGED_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_TRY_CONVERTIBLE_TAGGED_USES_RVALUE
      #endif
   #else
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_TRY_CONVERTIBLE_TAGGED_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_TRY_CONVERTIBLE_TAGGED_USES_RVALUE
   #endif
 #endif
 
@@ -131,7 +131,7 @@
>
         struct imp;
 
-#if defined BOOST_CONVERSION_IS_EXTRINSIC_TRY_CONVERTIBLE_TAGGED_USES_DECLTYPE
+#if defined BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_CONVERTIBLE_TAGGED_USES_DECLTYPE
         template <typename S, typename T>
         struct imp<S,T,false,false>
         {
@@ -139,7 +139,7 @@
           static decltype((
               try_convert_to(declval<S1>(), conversion::dummy::type_tag<T1>()) // EXPR
               , true_type()))
- #if defined BOOST_CONVERSION_TT_IS_EXTRINSIC_TRY_CONVERTIBLE_TAGGED_USES_RVALUE
+ #if defined BOOST_CONVERSION_TT_IS_EXTRINSICALLY_TRY_CONVERTIBLE_TAGGED_USES_RVALUE
           selector(S1&&, T1&&);
           #else
           selector(S1&, T1&);
@@ -152,7 +152,7 @@
           typedef typename common_type<decltype(selector(declval<S>(), declval<T>()))>::type type;
         };
 
-#elif defined BOOST_CONVERSION_IS_EXTRINSIC_TRY_CONVERTIBLE_TAGGED_USES_SIZEOF
+#elif defined BOOST_CONVERSION_IS_EXTRINSICALLY_TRY_CONVERTIBLE_TAGGED_USES_SIZEOF
 
         template <typename S, typename T>
         struct imp<S,T,false,false>

Modified: sandbox/conversion/boost/conversion/is_extrinsically_assignable.hpp
==============================================================================
--- sandbox/conversion/boost/conversion/is_extrinsically_assignable.hpp (original)
+++ sandbox/conversion/boost/conversion/is_extrinsically_assignable.hpp 2011-08-17 18:02:05 EDT (Wed, 17 Aug 2011)
@@ -12,8 +12,8 @@
  * @brief Defines the type trait @c is_extrinsically_assignable.
  */
 
-#ifndef BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_HPP
-#define BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_HPP
+#ifndef BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_HPP
+#define BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_HPP
 
 #if defined(BOOST_CONVERSION_DOXYGEN_INVOKED)
 namespace boost {
@@ -39,7 +39,7 @@
     struct is_extrinsically_assignable {};
 
     //! Macro defined if and only if the compiler doesn't support the features needed to define the @c is_extrinsically_assignable type trait.
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_ASSIGNABLE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_ASSIGNABLE
 
   }
 }
@@ -60,60 +60,60 @@
   #if defined _MSC_VER
     #if ! defined BOOST_NO_SFINAE_EXPR
 #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_USES_SIZEOF
     #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_ASSIGNABLE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_ASSIGNABLE
     #endif
   #elif defined __clang__
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_ASSIGNABLE
- //#define BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_USES_DECLTYPE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_ASSIGNABLE
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_USES_DECLTYPE
   #elif defined __GNUC__
      #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 4 )
        #if ! defined BOOST_NO_SFINAE_EXPR
 #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_USES_SIZEOF
        #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_ASSIGNABLE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_ASSIGNABLE
        #endif
      #else
- //#define BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_USES_SIZEOF
- //#define BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_USES_DECLTYPE
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_ASSIGNABLE
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_USES_SIZEOF
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_USES_DECLTYPE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_ASSIGNABLE
      #endif
   #else
 #error
- //#define BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_USES_SIZEOF
- #define BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_USES_DECLTYPE
- //#define BOOST_CONVERSION_NO_IS_EXTRINSIC_ASSIGNABLE
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_USES_DECLTYPE
+ //#define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_ASSIGNABLE
   #endif
 #elif ! defined BOOST_NO_SFINAE_EXPR
   #if defined _MSC_VER
 #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_USES_SIZEOF
 #elif defined __clang__
- //#define BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_USES_SIZEOF
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_ASSIGNABLE
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_USES_SIZEOF
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_ASSIGNABLE
   #elif defined __GNUC__
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_ASSIGNABLE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_ASSIGNABLE
   #else
 #error
- #define BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_USES_SIZEOF
   #endif
 #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_ASSIGNABLE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_ASSIGNABLE
 #endif
 
 #if ! defined BOOST_NO_RVALUE_REFERENCES
   #if defined _MSC_VER
   #elif defined __clang__
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_ASSIGNABLE_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_ASSIGNABLE_USES_RVALUE
   #elif defined __GNUC__
      #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 4 )
      #else
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_ASSIGNABLE_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_ASSIGNABLE_USES_RVALUE
      #endif
   #else
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_ASSIGNABLE_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_ASSIGNABLE_USES_RVALUE
   #endif
 #endif
 
@@ -133,7 +133,7 @@
          || is_function<T>::value >
         struct imp;
 
-#if defined BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_USES_DECLTYPE
+#if defined BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_USES_DECLTYPE
         template <typename T, typename S>
         struct imp<T,S,false,false>
         {
@@ -141,7 +141,7 @@
           static decltype((
               ::boost::conversion::assign_to(declval<T1>(), declval<S1>()) // EXPR
               , true_type()))
- #if defined BOOST_CONVERSION_TT_IS_EXTRINSIC_ASSIGNABLE_USES_RVALUE
+ #if defined BOOST_CONVERSION_TT_IS_EXTRINSICALLY_ASSIGNABLE_USES_RVALUE
           selector(T1&&, S1&&);
           #else
           selector(T1&, S1&);
@@ -154,7 +154,7 @@
           typedef typename common_type<decltype(selector(declval<T>(), declval<S>()))>::type type;
         };
 
-#elif defined BOOST_CONVERSION_IS_EXTRINSIC_ASSIGNABLE_USES_SIZEOF
+#elif defined BOOST_CONVERSION_IS_EXTRINSICALLY_ASSIGNABLE_USES_SIZEOF
 
         template <typename T, typename S>
         struct imp<T,S,false,false>

Modified: sandbox/conversion/boost/conversion/is_extrinsically_convertible.hpp
==============================================================================
--- sandbox/conversion/boost/conversion/is_extrinsically_convertible.hpp (original)
+++ sandbox/conversion/boost/conversion/is_extrinsically_convertible.hpp 2011-08-17 18:02:05 EDT (Wed, 17 Aug 2011)
@@ -12,8 +12,8 @@
  * @brief Defines the type trait @c is_extrinsically_convertible.
  */
 
-#ifndef BOOST_CONVERSION_IS_EXTRINSIC_CONVERTIBLE_HPP
-#define BOOST_CONVERSION_IS_EXTRINSIC_CONVERTIBLE_HPP
+#ifndef BOOST_CONVERSION_IS_EXTRINSICALLY_CONVERTIBLE_HPP
+#define BOOST_CONVERSION_IS_EXTRINSICALLY_CONVERTIBLE_HPP
 
 #if defined(BOOST_CONVERSION_DOXYGEN_INVOKED)
 namespace boost {
@@ -38,7 +38,7 @@
     struct is_extrinsically_convertible {};
 
   //! Macro defined if and only if the compiler doesn't support the features needed to define the @c is_extrinsically_convertible type trait for classes.
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_CONVERTIBLE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_CONVERTIBLE
 
   }
 }
@@ -61,46 +61,46 @@
 #if ! defined BOOST_NO_DECLTYPE
   #if defined _MSC_VER
     #if ! defined BOOST_NO_SFINAE_EXPR
- #define BOOST_CONVERSION_IS_EXTRINSIC_CONVERTIBLE_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_CONVERTIBLE_USES_SIZEOF
     #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_CONVERTIBLE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_CONVERTIBLE
     #endif
   #elif defined __clang__
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_CONVERTIBLE
- //#define BOOST_CONVERSION_IS_EXTRINSIC_CONVERTIBLE_USES_DECLTYPE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_CONVERTIBLE
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_CONVERTIBLE_USES_DECLTYPE
   #elif defined __GNUC__
      #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 7 )
        #if ! defined BOOST_NO_SFINAE_EXPR
- #define BOOST_CONVERSION_IS_EXTRINSIC_CONVERTIBLE_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_CONVERTIBLE_USES_SIZEOF
        #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_CONVERTIBLE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_CONVERTIBLE
        #endif
      #else
- #define BOOST_CONVERSION_IS_EXTRINSIC_CONVERTIBLE_USES_DECLTYPE
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_CONVERTIBLE_USES_DECLTYPE
      #endif
   #else
- #define BOOST_CONVERSION_IS_EXTRINSIC_CONVERTIBLE_USES_DECLTYPE
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_CONVERTIBLE_USES_DECLTYPE
   #endif
 #elif ! defined BOOST_NO_SFINAE_EXPR
- #define BOOST_CONVERSION_IS_EXTRINSIC_CONVERTIBLE_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_CONVERTIBLE_USES_SIZEOF
   #if defined __clang__
   #elif defined __GNUC__
   #endif
 #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_CONVERTIBLE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_CONVERTIBLE
 #endif
 
 #if ! defined BOOST_NO_RVALUE_REFERENCES
   #if defined _MSC_VER
   #elif defined __clang__
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_CONVERTIBLE_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_CONVERTIBLE_USES_RVALUE
   #elif defined __GNUC__
      #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 4 )
      #else
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_CONVERTIBLE_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_CONVERTIBLE_USES_RVALUE
      #endif
   #else
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_CONVERTIBLE_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_CONVERTIBLE_USES_RVALUE
   #endif
 #endif
 
@@ -122,7 +122,7 @@
>
         struct imp;
 
-#if defined BOOST_CONVERSION_IS_EXTRINSIC_CONVERTIBLE_USES_DECLTYPE
+#if defined BOOST_CONVERSION_IS_EXTRINSICALLY_CONVERTIBLE_USES_DECLTYPE
         template <typename S, typename T>
         struct imp<S,T,false,false>
         {
@@ -130,7 +130,7 @@
           static decltype((
               ::boost::conversion::implicit_convert_to<T1>(declval<S1>()) // EXPR
               , true_type()))
- #if defined BOOST_CONVERSION_TT_IS_EXTRINSIC_CONVERTIBLE_TAGGED_USES_RVALUE
+ #if defined BOOST_CONVERSION_TT_IS_EXTRINSICALLY_CONVERTIBLE_TAGGED_USES_RVALUE
           selector(S1&&, T1&&);
           #else
           selector(S1&, T1&);
@@ -142,7 +142,7 @@
 
           typedef typename common_type<decltype(selector(declval<S>(), declval<T>()))>::type type;
         };
-#elif defined BOOST_CONVERSION_IS_EXTRINSIC_CONVERTIBLE_USES_SIZEOF
+#elif defined BOOST_CONVERSION_IS_EXTRINSICALLY_CONVERTIBLE_USES_SIZEOF
 
         template <typename S, typename T>
         struct imp<S,T,false,false>

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 18:02:05 EDT (Wed, 17 Aug 2011)
@@ -12,8 +12,8 @@
  * @brief Defines the type trait @c is_extrinsically_explicit_convertible.
  */
 
-#ifndef BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_HPP
-#define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_HPP
+#ifndef BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_HPP
+#define BOOST_CONVERSION_IS_EXTRINSICALLY_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_EXPLICITLY_CONVERTIBLE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_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_EXPLICITLY_CONVERTIBLE_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_USES_SIZEOF
     #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE
     #endif
   #elif defined __clang__
- //#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
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_USES_DECLTYPE
+ //#define BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_USES_SIZEOF
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE
   #elif defined __GNUC__
      #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 7 )
        #if ! defined BOOST_NO_SFINAE_EXPR
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_USES_SIZEOF
        #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE
        #endif
      #else
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_USES_DECLTYPE
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_USES_DECLTYPE
      #endif
   #else
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_USES_DECLTYPE
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_USES_DECLTYPE
   #endif
 #elif ! defined BOOST_NO_SFINAE_EXPR
- #define BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_USES_SIZEOF
+ #define BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_USES_SIZEOF
   #if defined __clang__
   #elif defined __GNUC__
   #endif
 #else
- #define BOOST_CONVERSION_NO_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE
+ #define BOOST_CONVERSION_NO_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE
 #endif
 
 #if ! defined BOOST_NO_RVALUE_REFERENCES
   #if defined _MSC_VER
   #elif defined __clang__
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_USES_RVALUE
   #elif defined __GNUC__
      #if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 4 )
      #else
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_USES_RVALUE
      #endif
   #else
- #define BOOST_CONVERSION_TT_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_USES_RVALUE
+ #define BOOST_CONVERSION_TT_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_USES_RVALUE
   #endif
 #endif
 
@@ -125,7 +125,7 @@
             ))
>
         struct imp;
-#if defined BOOST_CONVERSION_IS_EXTRINSIC_EXPLICITLY_CONVERTIBLE_USES_DECLTYPE
+#if defined BOOST_CONVERSION_IS_EXTRINSICALLY_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_EXPLICITLY_CONVERTIBLE_TAGGED_USES_RVALUE
+ #if defined BOOST_CONVERSION_TT_IS_EXTRINSICALLY_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_EXPLICITLY_CONVERTIBLE_USES_SIZEOF
+#elif defined BOOST_CONVERSION_IS_EXTRINSICALLY_EXPLICITLY_CONVERTIBLE_USES_SIZEOF
         template <class S, class T>
         struct imp<S,T,false,false>
         {


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