[Boost-commit] svn:boost r83299 - in sandbox/contract/boost/contract/detail/preprocessor: list punctuation seq traits tuple variadic

Subject: [Boost-commit] svn:boost r83299 - in sandbox/contract/boost/contract/detail/preprocessor: list punctuation seq traits tuple variadic
From: lorcaminiti_at_[hidden]
Date: 2013-03-04 18:00:06

Author: lcaminiti
Date: 2013-03-04 18:00:03 EST (Mon, 04 Mar 2013)
New Revision: 83299
URL: http://svn.boost.org/trac/boost/changeset/83299

Log:
Moving to boost/BOOST symbols.
Text files modified: 
   sandbox/contract/boost/contract/detail/preprocessor/list/to_array.hpp          |    15 ++-                                     
   sandbox/contract/boost/contract/detail/preprocessor/punctuation/curly.hpp      |    30 ++++---                                 
   sandbox/contract/boost/contract/detail/preprocessor/punctuation/has_paren.hpp  |    22 ++--                                    
   sandbox/contract/boost/contract/detail/preprocessor/seq/to_list.hpp            |    26 +++---                                  
   sandbox/contract/boost/contract/detail/preprocessor/traits/assertion.hpp       |    62 ++++++++-------                         
   sandbox/contract/boost/contract/detail/preprocessor/traits/base.hpp            |    24 +++---                                  
   sandbox/contract/boost/contract/detail/preprocessor/traits/body.hpp            |    28 +++---                                  
   sandbox/contract/boost/contract/detail/preprocessor/traits/class.hpp           |    52 ++++++------                            
   sandbox/contract/boost/contract/detail/preprocessor/traits/class_invariant.hpp |   118 +++++++++++++++--------------           
   sandbox/contract/boost/contract/detail/preprocessor/traits/const_expr.hpp      |    65 ++++++++-------                         
   sandbox/contract/boost/contract/detail/preprocessor/traits/func.hpp            |   108 +++++++++++++-------------              
   sandbox/contract/boost/contract/detail/preprocessor/traits/func_param.hpp      |    24 +++---                                  
   sandbox/contract/boost/contract/detail/preprocessor/traits/oldof.hpp           |    10 +-                                      
   sandbox/contract/boost/contract/detail/preprocessor/traits/params.hpp          |    60 +++++++-------                          
   sandbox/contract/boost/contract/detail/preprocessor/traits/static_assert.hpp   |    15 ++-                                     
   sandbox/contract/boost/contract/detail/preprocessor/traits/template_param.hpp  |    24 +++---                                  
   sandbox/contract/boost/contract/detail/preprocessor/tuple/split.hpp            |   157 ++++++++++++++++++++------------------- 
   sandbox/contract/boost/contract/detail/preprocessor/variadic/eat.hpp           |     6                                         
   sandbox/contract/boost/contract/detail/preprocessor/variadic/is.hpp            |    67 ++++++++--------                        
   sandbox/contract/boost/contract/detail/preprocessor/variadic/rem.hpp           |     6                                         
   sandbox/contract/boost/contract/detail/preprocessor/variadic/size.hpp          |    37 ++++----                                
   sandbox/contract/boost/contract/detail/preprocessor/variadic/to_seq.hpp        |    33 ++++----                                
   22 files changed, 507 insertions(+), 482 deletions(-)

Modified: sandbox/contract/boost/contract/detail/preprocessor/list/to_array.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/list/to_array.hpp	(original)
+++ sandbox/contract/boost/contract/detail/preprocessor/list/to_array.hpp	2013-03-04 18:00:03 EST (Mon, 04 Mar 2013)
@@ -5,8 +5,8 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 // Home at http://sourceforge.net/projects/contractpp
 
-#ifndef CONTRACT_DETAIL_PP_LIST_TO_ARRAY_HPP_
-#define CONTRACT_DETAIL_PP_LIST_TO_ARRAY_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_LIST_TO_ARRAY_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_LIST_TO_ARRAY_HPP_
 
 #include <boost/preprocessor/list/fold_left.hpp>
 #include <boost/preprocessor/control/if.hpp>
@@ -17,7 +17,7 @@
 
 // PRIVATE //
 
-#define CONTRACT_DETAIL_PP_LIST_TO_ARRAY_ELEM_(d, array, elem) \
+#define BOOST_CONTRACT_DETAIL_PP_LIST_TO_ARRAY_ELEM_(d, array, elem) \
     /* don't use ARRAY_SIZE instead of TUPLE_ELEM(2, 0, ...) because when */ \
     /* size is 0 ARRAY_SIZE is undefined */ \
     BOOST_PP_IF(BOOST_PP_TUPLE_ELEM(2, 0, array), \
@@ -29,13 +29,14 @@
 // PUBLIC //
 
 // Precondition: list != NIL
-#define CONTRACT_DETAIL_PP_LIST_TO_ARRAY_D(d, list) \
-    BOOST_PP_LIST_FOLD_LEFT_ ## d(CONTRACT_DETAIL_PP_LIST_TO_ARRAY_ELEM_, \
+#define BOOST_CONTRACT_DETAIL_PP_LIST_TO_ARRAY_D(d, list) \
+    BOOST_PP_LIST_FOLD_LEFT_ ## d( \
+            BOOST_CONTRACT_DETAIL_PP_LIST_TO_ARRAY_ELEM_, \
             (0, ()), list)
 
 // Precondition: list != NIL
-#define CONTRACT_DETAIL_PP_LIST_TO_ARRAY(list) \
-    CONTRACT_DETAIL_PP_LIST_TO_ARRAY_D(1, list)
+#define BOOST_CONTRACT_DETAIL_PP_LIST_TO_ARRAY(list) \
+    BOOST_CONTRACT_DETAIL_PP_LIST_TO_ARRAY_D(1, list)
 
 #endif // #include guard
 

Modified: sandbox/contract/boost/contract/detail/preprocessor/punctuation/curly.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/punctuation/curly.hpp	(original)
+++ sandbox/contract/boost/contract/detail/preprocessor/punctuation/curly.hpp	2013-03-04 18:00:03 EST (Mon, 04 Mar 2013)
@@ -5,33 +5,35 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 // Home at http://sourceforge.net/projects/contractpp
 
-#ifndef CONTRACT_DETAIL_PP_CURLY_HPP_
-#define CONTRACT_DETAIL_PP_CURLY_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_CURLY_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_CURLY_HPP_
 
-#include <contract/detail/preprocessor/keyword/facilities/is.hpp>
+#include <boost/contract/detail/preprocessor/keyword/facilities/is.hpp>
 
 // PRIVATE //
 
-#define CONTRACT_DETAIL_PP_IS_CURLY_CONTRACT_DETAIL_PP_LCURLY (1) /* unary */
-#define CONTRACT_DETAIL_PP_IS_CURLY_CONTRACT_DETAIL_PP_RCURLY (1) /* unary */
+#define BOOST_CONTRACT_DETAIL_PP_IS_CURLY_BOOST_CONTRACT_DETAIL_PP_LCURLY \
+    (1) /* unary */
+#define BOOST_CONTRACT_DETAIL_PP_IS_CURLY_BOOST_CONTRACT_DETAIL_PP_RCURLY \
+    (1) /* unary */
 
 // PUBLIC //
 
 // Curly parenthesis macros.
 
-#define CONTRACT_DETAIL_PP_LCURLY() {
+#define BOOST_CONTRACT_DETAIL_PP_LCURLY() {
 
-#define CONTRACT_DETAIL_PP_RCURLY() }
+#define BOOST_CONTRACT_DETAIL_PP_RCURLY() }
 
 // Detect curly parenthesis macros (not curly paren but actual macro names).
 
-#define CONTRACT_DETAIL_PP_IS_LCURLY_MACRO(tokens) \
-    CONTRACT_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
-            CONTRACT_DETAIL_PP_IS_CURLY_)
-
-#define CONTRACT_DETAIL_PP_IS_RCURLY_MACRO(tokens) \
-    CONTRACT_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
-            CONTRACT_DETAIL_PP_IS_CURLY_)
+#define BOOST_CONTRACT_DETAIL_PP_IS_LCURLY_MACRO(tokens) \
+    BOOST_CONTRACT_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
+            BOOST_CONTRACT_DETAIL_PP_IS_CURLY_)
+
+#define BOOST_CONTRACT_DETAIL_PP_IS_RCURLY_MACRO(tokens) \
+    BOOST_CONTRACT_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
+            BOOST_CONTRACT_DETAIL_PP_IS_CURLY_)
 
 #endif // #include guard
 

Modified: sandbox/contract/boost/contract/detail/preprocessor/punctuation/has_paren.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/punctuation/has_paren.hpp	(original)
+++ sandbox/contract/boost/contract/detail/preprocessor/punctuation/has_paren.hpp	2013-03-04 18:00:03 EST (Mon, 04 Mar 2013)
@@ -5,8 +5,8 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 // Home at http://sourceforge.net/projects/contractpp
 
-#ifndef CONTRACT_DETAIL_PP_HAS_PAREN_HPP_
-#define CONTRACT_DETAIL_PP_HAS_PAREN_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_HAS_PAREN_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_HAS_PAREN_HPP_
 
 #include <boost/config.hpp>
 
@@ -18,17 +18,17 @@
 #   include <boost/preprocessor/detail/check.hpp>
 
 #   if ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_EDG()
-#       define CONTRACT_DETAIL_PP_HAS_PAREN(tokens) \
-            BOOST_PP_CHECK(tokens, CONTRACT_DETAIL_PP_HAS_PAREN_CHECK)
+#       define BOOST_CONTRACT_DETAIL_PP_HAS_PAREN(tokens) \
+            BOOST_PP_CHECK(tokens, BOOST_CONTRACT_DETAIL_PP_HAS_PAREN_CHECK)
 #   else
-#       define CONTRACT_DETAIL_PP_HAS_PAREN(tokens) \
-            CONTRACT_DETAIL_PP_HAS_PAREN_I(tokens)
-#       define CONTRACT_DETAIL_PP_HAS_PAREN_I(tokens) \
-            BOOST_PP_CHECK(tokens, CONTRACT_DETAIL_PP_HAS_PAREN_CHECK)
+#       define BOOST_CONTRACT_DETAIL_PP_HAS_PAREN(tokens) \
+            BOOST_CONTRACT_DETAIL_PP_HAS_PAREN_I(tokens)
+#       define BOOST_CONTRACT_DETAIL_PP_HAS_PAREN_I(tokens) \
+            BOOST_PP_CHECK(tokens, BOOST_CONTRACT_DETAIL_PP_HAS_PAREN_CHECK)
 #   endif
-#   define CONTRACT_DETAIL_PP_HAS_PAREN_CHECK(...) \
+#   define BOOST_CONTRACT_DETAIL_PP_HAS_PAREN_CHECK(...) \
         1 /* variadics handle any arity */
-#   define BOOST_PP_CHECK_RESULT_CONTRACT_DETAIL_PP_HAS_PAREN_CHECK \
+#   define BOOST_PP_CHECK_RESULT_BOOST_CONTRACT_DETAIL_PP_HAS_PAREN_CHECK \
         0, BOOST_PP_NIL
 
 #else
@@ -37,7 +37,7 @@
 
 // Expand to 1 iff tokens have parenthesis `(x)...` (only this case is handled
 // if no variadic macros), or `(x, y, ...)...`, or etc.
-#   define CONTRACT_DETAIL_PP_HAS_PAREN(tokens) \
+#   define BOOST_CONTRACT_DETAIL_PP_HAS_PAREN(tokens) \
         BOOST_PP_IS_UNARY(tokens)
 
 #endif

Modified: sandbox/contract/boost/contract/detail/preprocessor/seq/to_list.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/seq/to_list.hpp	(original)
+++ sandbox/contract/boost/contract/detail/preprocessor/seq/to_list.hpp	2013-03-04 18:00:03 EST (Mon, 04 Mar 2013)
@@ -5,8 +5,8 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 // Home at http://sourceforge.net/projects/contractpp
 
-#ifndef CONTRACT_DETAIL_PP_SEQ_TO_LIST_HPP_
-#define CONTRACT_DETAIL_PP_SEQ_TO_LIST_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_SEQ_TO_LIST_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_SEQ_TO_LIST_HPP_
 
 #include <boost/preprocessor/comparison/equal.hpp>
 #include <boost/preprocessor/control/iif.hpp>
@@ -17,33 +17,35 @@
 
 // PRIVATE //
 
-#define CONTRACT_DETAIL_PP_SEQ_TO_LIST_NOT_EMPTY_(is_head_empty_macro, seq) \
+#define BOOST_CONTRACT_DETAIL_PP_SEQ_TO_LIST_NOT_EMPTY_( \
+        is_head_empty_macro, seq) \
     BOOST_PP_TUPLE_TO_LIST(BOOST_PP_SEQ_SIZE(seq), BOOST_PP_SEQ_TO_TUPLE(seq))
 
-#define CONTRACT_DETAIL_PP_SEQ_TO_LIST_EMPTY_(is_head_empty_macro, seq) \
+#define BOOST_CONTRACT_DETAIL_PP_SEQ_TO_LIST_EMPTY_(is_head_empty_macro, seq) \
     BOOST_PP_NIL
 
 // Precondition: size(seq) == 1
-#define CONTRACT_DETAIL_PP_SEQ_TO_LIST_MAYBE_EMPTY_(is_head_empty_macro, seq) \
+#define BOOST_CONTRACT_DETAIL_PP_SEQ_TO_LIST_MAYBE_EMPTY_( \
+        is_head_empty_macro, seq) \
     BOOST_PP_IIF(is_head_empty_macro(BOOST_PP_SEQ_HEAD(seq)), \
-        CONTRACT_DETAIL_PP_SEQ_TO_LIST_EMPTY_ \
+        BOOST_CONTRACT_DETAIL_PP_SEQ_TO_LIST_EMPTY_ \
     , \
-        CONTRACT_DETAIL_PP_SEQ_TO_LIST_NOT_EMPTY_ \
+        BOOST_CONTRACT_DETAIL_PP_SEQ_TO_LIST_NOT_EMPTY_ \
     )(is_head_empty_macro, seq)
 
 // PUBLIC //
 
 // Expand to PP_NIL list if is_head_empty_macro(SEQ_HEAD(seq)).
-#define CONTRACT_DETAIL_PP_SEQ_TO_LIST(is_head_empty_macro, seq) \
+#define BOOST_CONTRACT_DETAIL_PP_SEQ_TO_LIST(is_head_empty_macro, seq) \
     BOOST_PP_IIF(BOOST_PP_EQUAL(BOOST_PP_SEQ_SIZE(seq), 1), \
-        CONTRACT_DETAIL_PP_SEQ_TO_LIST_MAYBE_EMPTY_ \
+        BOOST_CONTRACT_DETAIL_PP_SEQ_TO_LIST_MAYBE_EMPTY_ \
     , \
-        CONTRACT_DETAIL_PP_SEQ_TO_LIST_NOT_EMPTY_ \
+        BOOST_CONTRACT_DETAIL_PP_SEQ_TO_LIST_NOT_EMPTY_ \
     )(is_head_empty_macro, seq)
 
 // Never expand to PP_NIL list.
-#define CONTRACT_DETAIL_PP_SEQ_TO_LIST_NEVER_EMPTY(seq) \
-    CONTRACT_DETAIL_PP_SEQ_TO_LIST_NOT_EMPTY_(~, seq)
+#define BOOST_CONTRACT_DETAIL_PP_SEQ_TO_LIST_NEVER_EMPTY(seq) \
+    BOOST_CONTRACT_DETAIL_PP_SEQ_TO_LIST_NOT_EMPTY_(~, seq)
 
 #endif // #include guard
 

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/assertion.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/assertion.hpp	(original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/assertion.hpp	2013-03-04 18:00:03 EST (Mon, 04 Mar 2013)
@@ -5,13 +5,13 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 // Home at http://sourceforge.net/projects/contractpp
 
-#ifndef CONTRACT_DETAIL_PP_ASSERTION_TRAITS_HPP_
-#define CONTRACT_DETAIL_PP_ASSERTION_TRAITS_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_ASSERTION_TRAITS_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_ASSERTION_TRAITS_HPP_
 
-#include <contract/detail/preprocessor/traits/aux_/assertion.hpp>
-#include <contract/detail/preprocessor/traits/aux_/select_assertion_1.hpp>
-#include <contract/detail/preprocessor/keyword/contract/requires.hpp>
-#include <contract/detail/preprocessor/keyword/if.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/assertion.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/select_assertion_1.hpp>
+#include <boost/contract/detail/preprocessor/keyword/boost/contract/requires.hpp>
+#include <boost/contract/detail/preprocessor/keyword/if.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/control/iif.hpp>
 #include <boost/preprocessor/tuple/elem.hpp>
@@ -19,17 +19,19 @@
 
 // PRIVATE //
 
-#define CONTRACT_DETAIL_PP_ASSERTION_TRAITS_ELEM_( \
+#define BOOST_CONTRACT_DETAIL_PP_ASSERTION_TRAITS_ELEM_( \
         d, number_instruction_requirements_traits, assertion) \
-    BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_IF_FRONT(assertion), \
-        CONTRACT_DETAIL_PP_TRAITS_AUX_SELECT_ASSERTION_1 \
+    BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_IF_FRONT(assertion), \
+        BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_SELECT_ASSERTION_1 \
     , BOOST_PP_IIF(BOOST_PP_EXPAND( /* EXPAND needed for MSVC */ \
-            CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_IS_STATEMENT(assertion)), \
-        CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_STATEMENT \
-    , BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_REQUIRES_FRONT(assertion), \
-        CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_REQUIRES \
+            BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_IS_STATEMENT( \
+                    assertion)), \
+        BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_STATEMENT \
+    , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_REQUIRES_FRONT( \
+            assertion), \
+        BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_REQUIRES \
     , /* else: bool, const, or static assertion */ \
-        CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_CONDITION \
+        BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_CONDITION \
     )))(d, assertion \
         , BOOST_PP_TUPLE_ELEM(4, 0, number_instruction_requirements_traits) \
         , BOOST_PP_TUPLE_ELEM(4, 1, number_instruction_requirements_traits) \
@@ -39,17 +41,17 @@
 
 // PROTECTED //
 
-#define CONTRACT_DETAIL_PP_ASSERTION_TRAITS_D(d, assertions) \
+#define BOOST_CONTRACT_DETAIL_PP_ASSERTION_TRAITS_D(d, assertions) \
     BOOST_PP_TUPLE_ELEM(4, 3 /* select traits */ \
-        , CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_APPEND_TUPLE(d \
+        , BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_APPEND_TUPLE(d \
             , BOOST_PP_LIST_FOLD_LEFT_ ## d( \
-                  CONTRACT_DETAIL_PP_ASSERTION_TRAITS_ELEM_ \
+                  BOOST_CONTRACT_DETAIL_PP_ASSERTION_TRAITS_ELEM_ \
                 , ( \
                     0 /* number */ \
                   , \
-                    CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* instruction */ \
+                    BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* instruction */ \
                   , \
-                    CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* requirements */ \
+                    BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* requirements */ \
                   , \
                     BOOST_PP_NIL /* traits of all assertions */ \
                   ) \
@@ -61,31 +63,35 @@
 // PUBLIC //
 
 // Expand to a pp-list of assertion traits.
-#define CONTRACT_DETAIL_PP_ASSERTION_TRAITS(assertions) \
-    CONTRACT_DETAIL_PP_ASSERTION_TRAITS_D(1, assertions)
+#define BOOST_CONTRACT_DETAIL_PP_ASSERTION_TRAITS(assertions) \
+    BOOST_CONTRACT_DETAIL_PP_ASSERTION_TRAITS_D(1, assertions)
 
 // Expand to assertion number 1, 2, ... (for assertion statement, it is the
 // number previous assertion or 0 if no previous assertion).
-#define CONTRACT_DETAIL_PP_ASSERTION_TRAITS_NUMBER(assertion_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_ASSERTION_TRAITS_NUMBER(assertion_traits) \
     BOOST_PP_TUPLE_ELEM(3, 0, assertion_traits)
 
 // Expand to assertion instruction: bool_expr, const( vars ) const_bool_expr,
 // static_assert(static_bool_expr, string), 
 // if(bool_expr | const( vars ) const_bool_expr), else, PP_RCURLY,
 // using directive, namespace directive, typedef type new_type.
-#define CONTRACT_DETAIL_PP_ASSERTION_TRAITS_INSTRUCTION(assertion_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_ASSERTION_TRAITS_INSTRUCTION( \
+        assertion_traits) \
     BOOST_PP_TUPLE_ELEM(3, 1, assertion_traits)
 
 // Expand to 1 iff assertion is a statement (using, namespeace, typedef, etc
 // but no if, else, or } of select assertions).
-#define CONTRACT_DETAIL_PP_ASSERTION_TRAITS_IS_STATEMENT(assertion_traits) \
-    CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_IS_STATEMENT( \
-            CONTRACT_DETAIL_PP_ASSERTION_TRAITS_INSTRUCTION(assertion_traits))
+#define BOOST_CONTRACT_DETAIL_PP_ASSERTION_TRAITS_IS_STATEMENT( \
+        assertion_traits) \
+    BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_IS_STATEMENT( \
+            BOOST_CONTRACT_DETAIL_PP_ASSERTION_TRAITS_INSTRUCTION( \
+                    assertion_traits))
 
 // Expand to [boolean_integral_expr] (always EMPTY for statement). Not using
 // plural REQUIREMENTS because not a list (or sequence).
-#define CONTRACT_DETAIL_PP_ASSERTION_TRAITS_REQUIREMENT(assertion_traits) \
-    BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
+#define BOOST_CONTRACT_DETAIL_PP_ASSERTION_TRAITS_REQUIREMENT( \
+        assertion_traits) \
+    BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
             BOOST_PP_TUPLE_ELEM(3, 2, assertion_traits))
 
 #endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/base.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/base.hpp	(original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/base.hpp	2013-03-04 18:00:03 EST (Mon, 04 Mar 2013)
@@ -5,25 +5,25 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 // Home at http://sourceforge.net/projects/contractpp
 
-#ifndef CONTRACT_DETAIL_PP_BASE_TRAITS_HPP_
-#define CONTRACT_DETAIL_PP_BASE_TRAITS_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_HPP_
 
-#include <contract/detail/preprocessor/traits/base/virtual.hpp>
-#include <contract/detail/preprocessor/traits/base/access.hpp>
-#include <contract/detail/preprocessor/traits/base/type.hpp>
-#include <contract/detail/preprocessor/traits/base/type.hpp>
-#include <contract/detail/preprocessor/traits/aux_/nil.hpp>
+#include <boost/contract/detail/preprocessor/traits/base/virtual.hpp>
+#include <boost/contract/detail/preprocessor/traits/base/access.hpp>
+#include <boost/contract/detail/preprocessor/traits/base/type.hpp>
+#include <boost/contract/detail/preprocessor/traits/base/type.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/nil.hpp>
 #include <boost/preprocessor/tuple/elem.hpp>
 
 // PUBLIC //
 
-#define CONTRACT_DETAIL_PP_BASE_TRAITS(base_sign) \
+#define BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS(base_sign) \
     BOOST_PP_TUPLE_ELEM(2, 0, /* get traits from `(traits, sign)` */ \
-    CONTRACT_DETAIL_PP_BASE_TRAITS_AUX_TYPE( \
-    CONTRACT_DETAIL_PP_BASE_TRAITS_AUX_VIRTUAL( \
-    CONTRACT_DETAIL_PP_BASE_TRAITS_AUX_ACCESS( \
+    BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_AUX_TYPE( \
+    BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_AUX_VIRTUAL( \
+    BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_AUX_ACCESS( \
         ( \
-            CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* no traits to start with */ \
+            BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* no traits at start */ \
         , \
             base_sign \
             /* no trailing NIL because always type at end */ \

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/body.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/body.hpp	(original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/body.hpp	2013-03-04 18:00:03 EST (Mon, 04 Mar 2013)
@@ -5,50 +5,52 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 // Home at http://sourceforge.net/projects/contractpp
 
-#ifndef CONTRACT_DETAIL_PP_BODY_TRAITS_HPP_
-#define CONTRACT_DETAIL_PP_BODY_TRAITS_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_BODY_TRAITS_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_BODY_TRAITS_HPP_
 
 // PRIVATE //
         
 // Precondition: name_sign starts with alphanumeric token (i.e., not `~dtor`).
-#define CONTRACT_DETAIL_PP_BODY_TRAITS_MAYBE_OPERATOR_(body_name_sign) \
-    BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_OPERATOR_FRONT(body_name_sign),\
-        CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_WITH_OPERATOR \
+#define BOOST_CONTRACT_DETAIL_PP_BODY_TRAITS_MAYBE_OPERATOR_(body_name_sign) \
+    BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_OPERATOR_FRONT( \
+            body_name_sign), \
+        BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_WITH_OPERATOR \
     , \
         ( (0, ()) , body_name_sign ) BOOST_PP_TUPLE_EAT(1) \
     )( \
         body_name_sign \
         /* NIL padding for func params and expected last NIL */ \
-        (CONTRACT_DETAIL_PP_TRAITS_AUX_NIL) \
-        CONTRACT_DETAIL_PP_TRAITS_AUX_NIL \
+        (BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL) \
+        BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL \
     )
 
 // PUBLIC //
 
 // body_name_sign: ctor | ~dtor | f | operator ... (usual operator sign).
-#define CONTRACT_DETAIL_PP_BODY_TRAITS( \
+#define BOOST_CONTRACT_DETAIL_PP_BODY_TRAITS( \
         is_constructor01, is_destructor01, body_name_sign) \
     BOOST_PP_IIF(BOOST_PP_BITOR(is_constructor01, is_destructor01), \
         ( (0, ()) , body_name_sign ) BOOST_PP_TUPLE_EAT(1) \
     , \
-        CONTRACT_DETAIL_PP_BODY_TRAITS_MAYBE_OPERATOR_ \
+        BOOST_CONTRACT_DETAIL_PP_BODY_TRAITS_MAYBE_OPERATOR_ \
     )(body_name_sign)
 
 // Expand to `(n, (token1, ...))` (array to handle commas within operator
 // symbol token, 0-size if not an operator).
-#define CONTRACT_DETAIL_PP_BODY_TRAITS_OPERATOR(body_name_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_BODY_TRAITS_OPERATOR(body_name_traits) \
     BOOST_PP_TUPLE_ELEM(2, 0, body_name_traits)
 
 // Expand to alphanumeric function, constructor, operator name or to
 // (non-alphanumeric) `~name` for destructor.
-#define CONTRACT_DETAIL_PP_BODY_TRAITS_NAME(body_name_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_BODY_TRAITS_NAME(body_name_traits) \
     BOOST_PP_TUPLE_ELEM(2, 1, body_name_traits)
 
 // Input is not a trait but the class_type signature (possibly with extra
 // parenthesis to wrap commas). Expand to `(n, (token1, ...))` (array to handle
 // commas within class type for class templates, etc).
-#define CONTRACT_DETAIL_PP_BODY_TRAITS_CLASS_TYPE(class_type_sign) \
-    CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA(BOOST_PP_TUPLE_REM(1), class_type_sign)
+#define BOOST_CONTRACT_DETAIL_PP_BODY_TRAITS_CLASS_TYPE(class_type_sign) \
+    BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA(BOOST_PP_TUPLE_REM(1), \
+            class_type_sign)
 
 #endif // #include guard
 

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/class.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/class.hpp	(original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/class.hpp	2013-03-04 18:00:03 EST (Mon, 04 Mar 2013)
@@ -5,42 +5,42 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 // Home at http://sourceforge.net/projects/contractpp
 
-#ifndef CONTRACT_DETAIL_PP_CLASS_TRAITS_HPP_
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_HPP_
 
-#include <contract/detail/preprocessor/traits/class/access.hpp>
-#include <contract/detail/preprocessor/traits/class/export.hpp>
-#include <contract/detail/preprocessor/traits/class/template.hpp>
-#include <contract/detail/preprocessor/traits/class/concepts.hpp>
-#include <contract/detail/preprocessor/traits/class/kind.hpp>
-#include <contract/detail/preprocessor/traits/class/friend.hpp>
-#include <contract/detail/preprocessor/traits/class/name.hpp>
-#include <contract/detail/preprocessor/traits/class/specializations.hpp>
-#include <contract/detail/preprocessor/traits/class/final.hpp>
-#include <contract/detail/preprocessor/traits/class/bases.hpp>
-#include <contract/detail/preprocessor/traits/aux_/nil.hpp>
+#include <boost/contract/detail/preprocessor/traits/class/access.hpp>
+#include <boost/contract/detail/preprocessor/traits/class/export.hpp>
+#include <boost/contract/detail/preprocessor/traits/class/template.hpp>
+#include <boost/contract/detail/preprocessor/traits/class/concepts.hpp>
+#include <boost/contract/detail/preprocessor/traits/class/kind.hpp>
+#include <boost/contract/detail/preprocessor/traits/class/friend.hpp>
+#include <boost/contract/detail/preprocessor/traits/class/name.hpp>
+#include <boost/contract/detail/preprocessor/traits/class/specializations.hpp>
+#include <boost/contract/detail/preprocessor/traits/class/final.hpp>
+#include <boost/contract/detail/preprocessor/traits/class/bases.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/nil.hpp>
 #include <boost/preprocessor/tuple/elem.hpp>
 
 // PUBLIC //
 
 // Expand to class traits (inspect using `CLASS_TRAITS`).
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS(class_signature) \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS(class_signature) \
     BOOST_PP_TUPLE_ELEM(2, 0, /* get traits from `(traits, sign)` */ \
-    CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_BASES( \
-    CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_FINAL( \
-    CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_SPECIALIZATIONS( \
-    CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_NAME( \
-    CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_KIND( \
-    CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_FRIEND( \
-    CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_CONCEPTS( \
-    CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_TEMPLATE( \
-    CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_EXPORT( \
-    CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_ACCESS( \
+    BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_BASES( \
+    BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_FINAL( \
+    BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_SPECIALIZATIONS( \
+    BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_NAME( \
+    BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_KIND( \
+    BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_FRIEND( \
+    BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_CONCEPTS( \
+    BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_TEMPLATE( \
+    BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_EXPORT( \
+    BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_ACCESS( \
         ( \
-            CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* no traits to start with */ \
+            BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* no traits at start */ \
         , \
             class_signature \
-            CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* terminates and for empty */ \
+            BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* to end and for empty */ \
         ) \
     )))))))))))
 

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/class_invariant.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/class_invariant.hpp	(original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/class_invariant.hpp	2013-03-04 18:00:03 EST (Mon, 04 Mar 2013)
@@ -5,38 +5,39 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 // Home at http://sourceforge.net/projects/contractpp
 
-#ifndef CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_HPP_
-#define CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_HPP_
 
-#include <contract/detail/preprocessor/keyword/void.hpp>
-#include <contract/detail/preprocessor/keyword/class.hpp>
-#include <contract/detail/preprocessor/keyword/volatile.hpp>
-#include <contract/detail/preprocessor/keyword/static.hpp>
-#include <contract/detail/preprocessor/seq/to_list.hpp>
-#include <contract/detail/preprocessor/variadic/to_seq.hpp>
+#include <boost/contract/detail/preprocessor/keyword/void.hpp>
+#include <boost/contract/detail/preprocessor/keyword/class.hpp>
+#include <boost/contract/detail/preprocessor/keyword/volatile.hpp>
+#include <boost/contract/detail/preprocessor/keyword/static.hpp>
+#include <boost/contract/detail/preprocessor/seq/to_list.hpp>
+#include <boost/contract/detail/preprocessor/variadic/to_seq.hpp>
 #include <boost/config.hpp>
 
 // PRIVATE //
 
 #ifndef BOOST_NO_VARIADIC_MACROS
-#   define CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_TO_SEQ_(...) \
-        CONTRACT_DETAIL_PP_VARIADIC_TO_SEQ((void), __VA_ARGS__ )
+#   define BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_TO_SEQ_(...) \
+        BOOST_CONTRACT_DETAIL_PP_VARIADIC_TO_SEQ((void), __VA_ARGS__ )
 #else
-#   define CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_TO_SEQ_(seq) seq
+#   define BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_TO_SEQ_(seq) seq
 #endif
 
-#define CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_LIST_( \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_LIST_( \
         remove_macro, assertion) \
-    CONTRACT_DETAIL_PP_SEQ_TO_LIST(CONTRACT_DETAIL_PP_KEYWORD_IS_VOID_FRONT, \
+    BOOST_CONTRACT_DETAIL_PP_SEQ_TO_LIST( \
+            BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_VOID_FRONT, \
         /* cat TO_SEQ_ with class(...) and invoke macro above */ \
         BOOST_PP_EXPAND( \
-            CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_TO_SEQ_ \
-            CONTRACT_DETAIL_PP_KEYWORD_CLASS_REMOVE_FRONT( \
+            BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_TO_SEQ_ \
+            BOOST_CONTRACT_DETAIL_PP_KEYWORD_CLASS_REMOVE_FRONT( \
                     remove_macro(assertion)) \
         ) \
     )
 
-#define CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_STATIC_(s, \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_STATIC_(s, \
         has_const01, const_invs, has_constvolatile01, constvolatile_invs, \
         has_static01, static_invs, assertion) \
     ( \
@@ -51,12 +52,12 @@
         1 /* static class inv specified (still it could be empty) */ \
     , \
         BOOST_PP_LIST_APPEND(static_invs, \
-                CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_LIST_( \
-                        CONTRACT_DETAIL_PP_KEYWORD_STATIC_REMOVE_FRONT, \
+                BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_LIST_( \
+                        BOOST_CONTRACT_DETAIL_PP_KEYWORD_STATIC_REMOVE_FRONT, \
                         assertion)) \
     )
 
-#define CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_CONST_VOLATILE_(s, \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_CONST_VOLATILE_(s, \
         has_const01, const_invs, has_constvolatile01, constvolatile_invs, \
         has_static01, static_invs, assertion) \
     ( \
@@ -67,8 +68,8 @@
         1 /* const volatile class inv specified (still it could be empty) */ \
     , \
         BOOST_PP_LIST_APPEND(constvolatile_invs, \
-                CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_LIST_( \
-                        CONTRACT_DETAIL_PP_KEYWORD_VOLATILE_REMOVE_FRONT, \
+                BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_LIST_( \
+                        BOOST_CONTRACT_DETAIL_PP_KEYWORD_VOLATILE_REMOVE_FRONT,\
                         assertion)) \
     , \
         has_static01 \
@@ -76,7 +77,7 @@
         static_invs \
     )
 
-#define CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_CONST_(s, \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_CONST_(s, \
         has_const01, const_invs, has_constvolatile01, constvolatile_invs, \
         has_static01, static_invs, assertion) \
     ( \
@@ -93,25 +94,26 @@
         static_invs \
     )
 
-#define CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_IS_( \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_IS_( \
         is_macro, remove_macro, tokens) \
     BOOST_PP_BITAND( \
           BOOST_PP_EXPAND(is_macro(tokens)) /* EXPAND for MSVC */ \
-        , CONTRACT_DETAIL_PP_KEYWORD_IS_CLASS_FRONT(remove_macro(tokens)) \
+        , BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_CLASS_FRONT( \
+                remove_macro(tokens)) \
     )
 
-#define CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_( \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_( \
         s, const01inv_constvolatile01inv_static01inv, assertion) \
-    BOOST_PP_IIF(CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_IS_( \
-            CONTRACT_DETAIL_PP_KEYWORD_IS_VOLATILE_FRONT, \
-            CONTRACT_DETAIL_PP_KEYWORD_VOLATILE_REMOVE_FRONT, assertion), \
-        CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_CONST_VOLATILE_ \
-    , BOOST_PP_IIF(CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_IS_( \
-            CONTRACT_DETAIL_PP_KEYWORD_IS_STATIC_FRONT, \
-            CONTRACT_DETAIL_PP_KEYWORD_STATIC_REMOVE_FRONT, assertion), \
-        CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_STATIC_ \
+    BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_IS_( \
+            BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_VOLATILE_FRONT, \
+            BOOST_CONTRACT_DETAIL_PP_KEYWORD_VOLATILE_REMOVE_FRONT, assertion),\
+        BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_CONST_VOLATILE_ \
+    , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_IS_( \
+            BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_STATIC_FRONT, \
+            BOOST_CONTRACT_DETAIL_PP_KEYWORD_STATIC_REMOVE_FRONT, assertion), \
+        BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_STATIC_ \
     , \
-        CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_CONST_ \
+        BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_CONST_ \
     ))(s \
         , BOOST_PP_TUPLE_ELEM(6, 0, const01inv_constvolatile01inv_static01inv) \
         , BOOST_PP_TUPLE_ELEM(6, 1, const01inv_constvolatile01inv_static01inv) \
@@ -122,26 +124,26 @@
         , assertion \
     )
 
-#define CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_ASSERTIONS_( \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_ASSERTIONS_( \
         const01inv_constvolatile01inv_static01inv) \
     ( \
         BOOST_PP_TUPLE_ELEM(6, 0, const01inv_constvolatile01inv_static01inv) \
     , \
-        CONTRACT_DETAIL_PP_ASSERTION_TRAITS(BOOST_PP_TUPLE_ELEM(6, 1, \
+        BOOST_CONTRACT_DETAIL_PP_ASSERTION_TRAITS(BOOST_PP_TUPLE_ELEM(6, 1, \
                 const01inv_constvolatile01inv_static01inv)) \
     , \
         BOOST_PP_TUPLE_ELEM(6, 2, const01inv_constvolatile01inv_static01inv) \
     , \
-        CONTRACT_DETAIL_PP_ASSERTION_TRAITS(BOOST_PP_TUPLE_ELEM(6, 3, \
+        BOOST_CONTRACT_DETAIL_PP_ASSERTION_TRAITS(BOOST_PP_TUPLE_ELEM(6, 3, \
                 const01inv_constvolatile01inv_static01inv)) \
     , \
         BOOST_PP_TUPLE_ELEM(6, 4, const01inv_constvolatile01inv_static01inv) \
     , \
-        CONTRACT_DETAIL_PP_ASSERTION_TRAITS(BOOST_PP_TUPLE_ELEM(6, 5, \
+        BOOST_CONTRACT_DETAIL_PP_ASSERTION_TRAITS(BOOST_PP_TUPLE_ELEM(6, 5, \
                 const01inv_constvolatile01inv_static01inv)) \
     )
 
-#define CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_EMPTY_(seq) \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_EMPTY_(seq) \
     ( \
         0 /* const class inv not specified */ \
     , \
@@ -156,49 +158,51 @@
         BOOST_PP_NIL /* static class inv list */ \
     )
 
-#define CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_NOT_EMPTY_(seq) \
-    CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_ASSERTIONS_( \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_NOT_EMPTY_(seq) \
+    BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_ASSERTIONS_( \
             BOOST_PP_SEQ_FOLD_LEFT( \
-                    CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_, \
+                    BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_, \
                     /* start empty */ \
-                    CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_EMPTY_(seq), \
+                    BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_EMPTY_( \
+                            seq), \
                     seq))
 
 // Precondition: size(seq) == 1
-#define CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_MAYBE_EMPTY_(seq) \
-    BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_VOID_FRONT(BOOST_PP_SEQ_HEAD( \
-            seq)), \
-        CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_EMPTY_ \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_MAYBE_EMPTY_(seq) \
+    BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_VOID_FRONT( \
+            BOOST_PP_SEQ_HEAD(seq)), \
+        BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_EMPTY_ \
     , \
-        CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_NOT_EMPTY_ \
+        BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_NOT_EMPTY_ \
     )(seq)
 
 // PUBLIC //
 
-#define CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS(seq) \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS(seq) \
     BOOST_PP_IIF(BOOST_PP_EQUAL(BOOST_PP_SEQ_SIZE(seq), 1), \
-        CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_MAYBE_EMPTY_ \
+        BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_MAYBE_EMPTY_ \
     , \
-        CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_NOT_EMPTY_ \
+        BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_NOT_EMPTY_ \
     )(seq)
 
-#define CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_HAS_CONST(traits) \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_HAS_CONST(traits) \
     BOOST_PP_TUPLE_ELEM(6, 0, traits)
 
-#define CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_CONST(traits) \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_CONST(traits) \
     BOOST_PP_TUPLE_ELEM(6, 1, traits)
 
 // If volatile class(...) specified at all.
-#define CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_HAS_CONST_VOLATILE(traits) \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_HAS_CONST_VOLATILE( \
+        traits) \
     BOOST_PP_TUPLE_ELEM(6, 2, traits)
 
-#define CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_CONST_VOLATILE(traits) \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_CONST_VOLATILE(traits) \
     BOOST_PP_TUPLE_ELEM(6, 3, traits)
     
-#define CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_HAS_STATIC(traits) \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_HAS_STATIC(traits) \
     BOOST_PP_TUPLE_ELEM(6, 4, traits)
 
-#define CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_STATIC(traits) \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_INVARIANT_TRAITS_STATIC(traits) \
     BOOST_PP_TUPLE_ELEM(6, 5, traits)
 
 #endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/const_expr.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/const_expr.hpp	(original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/const_expr.hpp	2013-03-04 18:00:03 EST (Mon, 04 Mar 2013)
@@ -5,25 +5,25 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 // Home at http://sourceforge.net/projects/contractpp
 
-#ifndef CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_HPP_
-#define CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_HPP_
 
-#include <contract/detail/preprocessor/traits/aux_/type.hpp>
-#include <contract/detail/preprocessor/keyword/void.hpp>
-#include <contract/detail/preprocessor/keyword/const.hpp>
-#include <contract/detail/preprocessor/variadic/to_seq.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/type.hpp>
+#include <boost/contract/detail/preprocessor/keyword/void.hpp>
+#include <boost/contract/detail/preprocessor/keyword/const.hpp>
+#include <boost/contract/detail/preprocessor/variadic/to_seq.hpp>
 #include <boost/config.hpp>
 
 // PRIVATE //
 
-#define CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_VAR_(d, vars, var) \
+#define BOOST_CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_VAR_(d, vars, var) \
     BOOST_PP_LIST_APPEND(vars, \
         ( \
             ( \
-                CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* could be empty */ \
-                CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE(var) \
+                BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* could be empty */ \
+                BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE(var) \
             , \
-                CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TYPE(var) \
+                BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TYPE(var) \
             ) \
         , \
             BOOST_PP_NIL \
@@ -31,36 +31,39 @@
     )
 
 // Precondition: size(seq) == 1
-#define CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_VARS_SEQ_IS_EMPTY_HEAD_(vars_seq) \
-    CONTRACT_DETAIL_PP_KEYWORD_IS_VOID_FRONT(BOOST_PP_BOOST_PP_SEQ_HEAD(seq))
+#define BOOST_CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_VARS_SEQ_IS_EMPTY_HEAD_( \
+        vars_seq) \
+    BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_VOID_FRONT(BOOST_PP_BOOST_PP_SEQ_HEAD( \
+            seq))
 
-#define CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_VARS_SEQ_IS_EMPTY_(vars_seq) \
+#define BOOST_CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_VARS_SEQ_IS_EMPTY_( \
+        vars_seq) \
     BOOST_PP_IIF(BOOST_PP_EQUAL(1, BOOST_PP_SEQ_SIZE(vars_seq)), \
-        CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_VARS_SEQ_IS_EMPTY_HEAD_ \
+        BOOST_CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_VARS_SEQ_IS_EMPTY_HEAD_ \
     , \
         0 BOOST_PP_TUPLE_EAT(1) \
     )(vars_seq)
 
-#define CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_VARS_FROM_SEQ_(vars_seq) \
-    BOOST_PP_IIF(CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_VARS_SEQ_IS_EMPTY_( \
+#define BOOST_CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_VARS_FROM_SEQ_(vars_seq) \
+    BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_VARS_SEQ_IS_EMPTY_(\
             vars_seq), \
         BOOST_PP_NIL /* empty list */ BOOST_PP_TUPLE_EAT(3) \
     , \
         BOOST_PP_SEQ_FOLD_LEFT \
-    )(CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_VAR_, BOOST_PP_NIL, vars_seq)
+    )(BOOST_CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_VAR_, BOOST_PP_NIL, vars_seq)
 
 #ifndef BOOST_NO_VARIADIC_MACROS
-#   define CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_SPLIT_(...) \
-        CONTRACT_DETAIL_PP_VARIADIC_TO_SEQ(void, __VA_ARGS__) \
+#   define BOOST_CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_SPLIT_(...) \
+        BOOST_CONTRACT_DETAIL_PP_VARIADIC_TO_SEQ(void, __VA_ARGS__) \
         , /* comma to split */
 #else
-#   define CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_SPLIT_(seq) \
+#   define BOOST_CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_SPLIT_(seq) \
         seq, /* comma to split */
 #endif
 
-#define CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_(varseq_instruction) \
+#define BOOST_CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_(varseq_instruction) \
     ( /* const expr traits is 2-tuple `(vars, instruction)` */ \
-        CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_VARS_FROM_SEQ_( \
+        BOOST_CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_VARS_FROM_SEQ_( \
                 BOOST_PP_TUPLE_ELEM(2, 0, varseq_instruction)) \
     , \
         BOOST_PP_TUPLE_ELEM(2, 1, varseq_instruction) \
@@ -68,23 +71,23 @@
 
 // PUBLIC //
 
-#define CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS(const_expr) \
-    CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_(BOOST_PP_EXPAND( ( \
-        CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_SPLIT_ \
-        CONTRACT_DETAIL_PP_KEYWORD_CONST_REMOVE_FRONT(const_expr) \
+#define BOOST_CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS(const_expr) \
+    BOOST_CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_(BOOST_PP_EXPAND( ( \
+        BOOST_CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_SPLIT_ \
+        BOOST_CONTRACT_DETAIL_PP_KEYWORD_CONST_REMOVE_FRONT(const_expr) \
     ) ))
 
-#define CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_EXPR(traits) \
+#define BOOST_CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_EXPR(traits) \
     BOOST_PP_TUPLE_ELEM(2, 1, traits)
 
-#define CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_VARS(traits) \
+#define BOOST_CONTRACT_DETAIL_PP_CONST_EXPR_TRAITS_VARS(traits) \
     BOOST_PP_TUPLE_ELEM(2, 0, traits)
 
-#define CONTRACT_DETAIL_PP_CONST_EXPR_VAR_TRAITS_TYPE(var_traits) \
-    BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
+#define BOOST_CONTRACT_DETAIL_PP_CONST_EXPR_VAR_TRAITS_TYPE(var_traits) \
+    BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
             BOOST_PP_TUPLE_ELEM(2, 0, var_traits))
 
-#define CONTRACT_DETAIL_PP_CONST_EXPR_VAR_TRAITS_NAME(var_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_CONST_EXPR_VAR_TRAITS_NAME(var_traits) \
     BOOST_PP_TUPLE_ELEM(2, 1, var_traits)
 
 #endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func.hpp	(original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func.hpp	2013-03-04 18:00:03 EST (Mon, 04 Mar 2013)
@@ -5,69 +5,69 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 // Home at http://sourceforge.net/projects/contractpp
 
-#ifndef CONTRACT_DETAIL_PP_FUNC_TRAITS_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_HPP_
 
-#include <contract/detail/preprocessor/traits/func/access.hpp>
-#include <contract/detail/preprocessor/traits/func/export.hpp>
-#include <contract/detail/preprocessor/traits/func/template.hpp>
-#include <contract/detail/preprocessor/traits/func/concepts.hpp>
-#include <contract/detail/preprocessor/traits/func/explicit.hpp>
-#include <contract/detail/preprocessor/traits/func/inline.hpp>
-#include <contract/detail/preprocessor/traits/func/extern.hpp>
-#include <contract/detail/preprocessor/traits/func/static.hpp>
-#include <contract/detail/preprocessor/traits/func/virtual.hpp>
-#include <contract/detail/preprocessor/traits/func/friend.hpp>
-#include <contract/detail/preprocessor/traits/func/result_type.hpp>
-#include <contract/detail/preprocessor/traits/func/name.hpp>
-#include <contract/detail/preprocessor/traits/func/params.hpp>
-#include <contract/detail/preprocessor/traits/func/param_concepts.hpp>
-#include <contract/detail/preprocessor/traits/func/const.hpp>
-#include <contract/detail/preprocessor/traits/func/volatile.hpp>
-#include <contract/detail/preprocessor/traits/func/override.hpp>
-#include <contract/detail/preprocessor/traits/func/new.hpp>
-#include <contract/detail/preprocessor/traits/func/final.hpp>
-#include <contract/detail/preprocessor/traits/func/exceptions.hpp>
-#include <contract/detail/preprocessor/traits/func/preconditions.hpp>
-#include <contract/detail/preprocessor/traits/func/postconditions.hpp>
-#include <contract/detail/preprocessor/traits/func/initializers.hpp>
-#include <contract/detail/preprocessor/traits/func/catches.hpp>
-#include <contract/detail/preprocessor/traits/aux_/nil.hpp>
+#include <boost/contract/detail/preprocessor/traits/func/access.hpp>
+#include <boost/contract/detail/preprocessor/traits/func/export.hpp>
+#include <boost/contract/detail/preprocessor/traits/func/template.hpp>
+#include <boost/contract/detail/preprocessor/traits/func/concepts.hpp>
+#include <boost/contract/detail/preprocessor/traits/func/explicit.hpp>
+#include <boost/contract/detail/preprocessor/traits/func/inline.hpp>
+#include <boost/contract/detail/preprocessor/traits/func/extern.hpp>
+#include <boost/contract/detail/preprocessor/traits/func/static.hpp>
+#include <boost/contract/detail/preprocessor/traits/func/virtual.hpp>
+#include <boost/contract/detail/preprocessor/traits/func/friend.hpp>
+#include <boost/contract/detail/preprocessor/traits/func/result_type.hpp>
+#include <boost/contract/detail/preprocessor/traits/func/name.hpp>
+#include <boost/contract/detail/preprocessor/traits/func/params.hpp>
+#include <boost/contract/detail/preprocessor/traits/func/param_concepts.hpp>
+#include <boost/contract/detail/preprocessor/traits/func/const.hpp>
+#include <boost/contract/detail/preprocessor/traits/func/volatile.hpp>
+#include <boost/contract/detail/preprocessor/traits/func/override.hpp>
+#include <boost/contract/detail/preprocessor/traits/func/new.hpp>
+#include <boost/contract/detail/preprocessor/traits/func/final.hpp>
+#include <boost/contract/detail/preprocessor/traits/func/exceptions.hpp>
+#include <boost/contract/detail/preprocessor/traits/func/preconditions.hpp>
+#include <boost/contract/detail/preprocessor/traits/func/postconditions.hpp>
+#include <boost/contract/detail/preprocessor/traits/func/initializers.hpp>
+#include <boost/contract/detail/preprocessor/traits/func/catches.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/nil.hpp>
 #include <boost/preprocessor/tuple/elem.hpp>
 
 // PUBLIC //
 
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS(function_signature) \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS(function_signature) \
     BOOST_PP_TUPLE_ELEM(2, 0, \
-    CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_CATCHES( \
-    CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_INITIALIZERS( \
-    CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_POSTCONDITIONS( \
-    CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_PRECONDITIONS( \
-    CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_EXCEPTIONS( \
-    CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_FINAL( \
-    CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_NEW( \
-    CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_OVERRIDE( \
-    CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_VOLATILE( \
-    CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_CONST( \
-    CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_PARAM_CONCEPTS( \
-    CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_PARAMS( \
-    CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_NAME( \
-    CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_RESULT_TYPE( \
-    CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_FRIEND( \
-    CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_VIRTUAL( \
-    CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_STATIC( \
-    CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_EXTERN( \
-    CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_INLINE( \
-    CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_EXPLICIT( \
-    CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_CONCEPTS( \
-    CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_TEMPLATE( \
-    CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_EXPORT( \
-    CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_ACCESS( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_CATCHES( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_INITIALIZERS( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_POSTCONDITIONS( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_PRECONDITIONS( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_EXCEPTIONS( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_FINAL( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_NEW( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_OVERRIDE( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_VOLATILE( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_CONST( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_PARAM_CONCEPTS( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_PARAMS( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_NAME( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_RESULT_TYPE( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_FRIEND( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_VIRTUAL( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_STATIC( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_EXTERN( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_INLINE( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_EXPLICIT( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_CONCEPTS( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_TEMPLATE( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_EXPORT( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_ACCESS( \
         ( \
-            CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* no traits to start wtih */ \
+            BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* no traits at start */ \
         , \
             function_signature \
-            CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* terminates and for empty */ \
+            BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* to end and for empty */ \
         ) \
     )))))))))))))))))))))))))
 

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func_param.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func_param.hpp	(original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func_param.hpp	2013-03-04 18:00:03 EST (Mon, 04 Mar 2013)
@@ -5,28 +5,28 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 // Home at http://sourceforge.net/projects/contractpp
 
-#ifndef CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_HPP_
 
 // Default value already processed, header included for user to access traits.
-#include <contract/detail/preprocessor/traits/func_param/default.hpp>
+#include <boost/contract/detail/preprocessor/traits/func_param/default.hpp>
 
-#include <contract/detail/preprocessor/traits/func_param/classifier.hpp>
-#include <contract/detail/preprocessor/traits/func_param/type.hpp>
-#include <contract/detail/preprocessor/traits/func_param/name.hpp>
-#include <contract/detail/preprocessor/traits/aux_/nil.hpp>
+#include <boost/contract/detail/preprocessor/traits/func_param/classifier.hpp>
+#include <boost/contract/detail/preprocessor/traits/func_param/type.hpp>
+#include <boost/contract/detail/preprocessor/traits/func_param/name.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/nil.hpp>
 #include <boost/preprocessor/tuple/elem.hpp>
 
 // PUBLIC //
 
 // Expand to template parameter traits (inspect with FUNC_PARAM_TRAITS).
-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS(fparam_sign) \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS(fparam_sign) \
     BOOST_PP_TUPLE_ELEM(2, 0, \
-    CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_AUX_NAME( \
-    CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_AUX_TYPE( \
-    CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_AUX_CLASSIFIER( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_AUX_NAME( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_AUX_TYPE( \
+    BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_AUX_CLASSIFIER( \
         ( \
-            CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* no traits to start with */ \
+            BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* no traits at start */ \
         , \
             fparam_sign \
             /* no trailing NIL because always name at end */ \

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/oldof.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/oldof.hpp	(original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/oldof.hpp	2013-03-04 18:00:03 EST (Mon, 04 Mar 2013)
@@ -5,13 +5,13 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 // Home at http://sourceforge.net/projects/contractpp
 
-#ifndef CONTRACT_DETAIL_PP_OLDOF_TRAITS_HPP_
-#define CONTRACT_DETAIL_PP_OLDOF_TRAITS_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_OLDOF_TRAITS_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_OLDOF_TRAITS_HPP_
 
 // Old-of already parsed but headers included for user to access these traits.
-#include <contract/detail/preprocessor/traits/oldof/type.hpp>
-#include <contract/detail/preprocessor/traits/oldof/assignment.hpp>
-#include <contract/detail/preprocessor/traits/oldof/expr.hpp>
+#include <boost/contract/detail/preprocessor/traits/oldof/type.hpp>
+#include <boost/contract/detail/preprocessor/traits/oldof/assignment.hpp>
+#include <boost/contract/detail/preprocessor/traits/oldof/expr.hpp>
 
 #endif // #include guard
 

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/params.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/params.hpp	(original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/params.hpp	2013-03-04 18:00:03 EST (Mon, 04 Mar 2013)
@@ -5,17 +5,17 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 // Home at http://sourceforge.net/projects/contractpp
 
-#ifndef CONTRACT_DETAIL_PP_PARAMS_TRAITS_HPP_
-#define CONTRACT_DETAIL_PP_PARAMS_TRAITS_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_HPP_
 
-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/list.hpp>
-#include <contract/detail/preprocessor/traits/aux_/nil.hpp>
-#include <contract/detail/preprocessor/traits/params/void.hpp>
-#include <contract/detail/preprocessor/traits/params/namespace.hpp>
-#include <contract/detail/preprocessor/traits/params/group.hpp>
-#include <contract/detail/preprocessor/traits/func_param.hpp>
-#include <contract/detail/preprocessor/keyword/template.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/list.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/nil.hpp>
+#include <boost/contract/detail/preprocessor/traits/params/void.hpp>
+#include <boost/contract/detail/preprocessor/traits/params/namespace.hpp>
+#include <boost/contract/detail/preprocessor/traits/params/group.hpp>
+#include <boost/contract/detail/preprocessor/traits/func_param.hpp>
+#include <boost/contract/detail/preprocessor/keyword/template.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/control/iif.hpp>
 #include <boost/preprocessor/facilities/expand.hpp>
@@ -34,42 +34,42 @@
 
 // Expand to 4-tuple `(NIL tag_namespace, positional_params, named_params,
 // deduced_params)` (params are all pp-list and they are NIL is no params).
-#define CONTRACT_DETAIL_PP_TEMPLATE_PARAMS_TRAITS(sign) \
-    CONTRACT_DETAIL_PP_PARAMS_TRAITS_AUX_GROUP( \
-          CONTRACT_DETAIL_PP_PARAMS_TRAITS_AUX_NAMESPACE( \
-              CONTRACT_DETAIL_PP_PARAMS_TRAITS_AUX_VOID( \
-                  CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST( \
+#define BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAMS_TRAITS(sign) \
+    BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_AUX_GROUP( \
+          BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_AUX_NAMESPACE( \
+              BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_AUX_VOID( \
+                  BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST( \
                       sign \
                     , 1 /* might be empty (for tpl specializations) */ \
                     , 1 /* might have defaults */ \
-                    , CONTRACT_DETAIL_PP_KEYWORD_IS_TEMPLATE_FRONT \
-                    , CONTRACT_DETAIL_PP_KEYWORD_TEMPLATE_REMOVE_FRONT \
-                    , CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS \
+                    , BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_TEMPLATE_FRONT \
+                    , BOOST_CONTRACT_DETAIL_PP_KEYWORD_TEMPLATE_REMOVE_FRONT \
+                    , BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS \
                   ) \
-                , CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_NAME \
+                , BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_NAME \
               ) \
-            , CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_NAME \
+            , BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_NAME \
           ) \
-        , CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND \
+        , BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND \
     )
 
 // Expand to 4-tuple `(NIL tag_namespace, positional_params, named_params,
 // deduced_params)` (params are all pp-list and they are NIL is no params).
-#define CONTRACT_DETAIL_PP_FUNC_PARAMS_TRAITS(sign) \
-    CONTRACT_DETAIL_PP_PARAMS_TRAITS_AUX_GROUP( \
-          CONTRACT_DETAIL_PP_PARAMS_TRAITS_AUX_NAMESPACE( \
-              CONTRACT_DETAIL_PP_PARAMS_TRAITS_AUX_VOID( \
-                  CONTRACT_DETAIL_PP_TRAITS_AUX_LIST( \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAMS_TRAITS(sign) \
+    BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_AUX_GROUP( \
+          BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_AUX_NAMESPACE( \
+              BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_AUX_VOID( \
+                  BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_LIST( \
                       sign \
                     , 1 /* might be empty */ \
                     , 1 /* might have defaults */ \
-                    , CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS \
+                    , BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS \
                   ) \
-                  , CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_NAME \
+                  , BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_NAME \
               ) \
-            , CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_NAME \
+            , BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_NAME \
           ) \
-        , CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER \
+        , BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER \
     )
 
 #endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/static_assert.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/static_assert.hpp	(original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/static_assert.hpp	2013-03-04 18:00:03 EST (Mon, 04 Mar 2013)
@@ -5,24 +5,25 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 // Home at http://sourceforge.net/projects/contractpp
 
-#ifndef CONTRACT_DETAIL_PP_STATIC_ASSERT_TRAITS_HPP_
-#define CONTRACT_DETAIL_PP_STATIC_ASSERT_TRAITS_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_STATIC_ASSERT_TRAITS_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_STATIC_ASSERT_TRAITS_HPP_
 
-#include <contract/detail/preprocessor/keyword/cxx11/static_assert.hpp>
+#include <boost/contract/detail/preprocessor/keyword/cxx11/static_assert.hpp>
 #include <boost/preprocessor/tuple/elem.hpp>
 
 // PUBLIC //
 
 // Where static_assert_instruction is `static_assert(condition, error)`.
-#define CONTRACT_DETAIL_PP_STATIC_ASSERT_TRAITS(static_assert_instruction) \
-    CONTRACT_DETAIL_PP_KEYWORD_STATIC_ASSERT_REMOVE_FRONT( \
+#define BOOST_CONTRACT_DETAIL_PP_STATIC_ASSERT_TRAITS( \
+        static_assert_instruction) \
+    BOOST_CONTRACT_DETAIL_PP_KEYWORD_STATIC_ASSERT_REMOVE_FRONT( \
             static_assert_instruction)
 
-#define CONTRACT_DETAIL_PP_STATIC_ASSERT_TRAITS_CONDITION( \
+#define BOOST_CONTRACT_DETAIL_PP_STATIC_ASSERT_TRAITS_CONDITION( \
         static_assert_traits) \
     BOOST_PP_TUPLE_ELEM(2, 0, static_assert_traits)
     
-#define CONTRACT_DETAIL_PP_STATIC_ASSERT_TRAITS_ERROR( \
+#define BOOST_CONTRACT_DETAIL_PP_STATIC_ASSERT_TRAITS_ERROR( \
         static_assert_traits) \
     BOOST_PP_TUPLE_ELEM(2, 1, static_assert_traits)
 

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/template_param.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/template_param.hpp	(original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/template_param.hpp	2013-03-04 18:00:03 EST (Mon, 04 Mar 2013)
@@ -5,28 +5,28 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 // Home at http://sourceforge.net/projects/contractpp
 
-#ifndef CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_HPP_
-#define CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_HPP_
 
 // Default value already processed, header included for user to access traits.
-#include <contract/detail/preprocessor/traits/template_param/default.hpp>
+#include <boost/contract/detail/preprocessor/traits/template_param/default.hpp>
 
-#include <contract/detail/preprocessor/traits/template_param/kind.hpp>
-#include <contract/detail/preprocessor/traits/template_param/requirement.hpp>
-#include <contract/detail/preprocessor/traits/template_param/name.hpp>
-#include <contract/detail/preprocessor/traits/aux_/nil.hpp>
+#include <boost/contract/detail/preprocessor/traits/template_param/kind.hpp>
+#include <boost/contract/detail/preprocessor/traits/template_param/requirement.hpp>
+#include <boost/contract/detail/preprocessor/traits/template_param/name.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/nil.hpp>
 #include <boost/preprocessor/tuple/elem.hpp>
 
 // PUBLIC //
 
 // Expand to template parameter traits (inspect with TEMPLATE_PARAM_TRAITS).
-#define CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS(tparam_sign) \
+#define BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS(tparam_sign) \
     BOOST_PP_TUPLE_ELEM(2, 0, \
-    CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_AUX_NAME( \
-    CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_AUX_REQUIREMENT( \
-    CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_AUX_KIND( \
+    BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_AUX_NAME( \
+    BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_AUX_REQUIREMENT( \
+    BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_AUX_KIND( \
         ( \
-            CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* no traits to start with */ \
+            BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* no traits at start */ \
         , \
             tparam_sign \
             /* no trailing NIL because always name at end */ \

Modified: sandbox/contract/boost/contract/detail/preprocessor/tuple/split.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/tuple/split.hpp	(original)
+++ sandbox/contract/boost/contract/detail/preprocessor/tuple/split.hpp	2013-03-04 18:00:03 EST (Mon, 04 Mar 2013)
@@ -5,8 +5,8 @@
 /*************************************************************/
 // Used: #define BOOST_PP_LIMIT_TUPLE 64
 
-#ifndef CONTRACT_DETAIL_PP_TUPLE_SPLIT_HPP_
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_HPP_
 
 #include <boost/preprocessor/limits.hpp>
 #if BOOST_PP_LIMIT_TUPLE != 64
@@ -17,158 +17,159 @@
 
 // Own version of PP_CAT for reentrancy.
 #if ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MWCC()
-#   define CONTRACT_DETAIL_PP_TUPLE_SPLIT_CAT_(a, b) \
-        CONTRACT_DETAIL_PP_TUPLE_SPLIT_CAT_I_(a, b)
+#   define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_CAT_(a, b) \
+        BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_CAT_I_(a, b)
 #else
-#   define CONTRACT_DETAIL_PP_TUPLE_SPLIT_CAT_(a, b) \
-        CONTRACT_DETAIL_PP_TUPLE_SPLIT_CAT_OO_((a, b))
-#   define CONTRACT_DETAIL_PP_TUPLE_SPLIT_CAT_OO_(par) \
-        CONTRACT_DETAIL_PP_TUPLE_SPLIT_CAT_I_ ## par
+#   define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_CAT_(a, b) \
+        BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_CAT_OO_((a, b))
+#   define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_CAT_OO_(par) \
+        BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_CAT_I_ ## par
 #endif
 #if ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MSVC()
-#   define CONTRACT_DETAIL_PP_TUPLE_SPLIT_CAT_I_(a, b) \
+#   define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_CAT_I_(a, b) \
         a ## b
 #else
-#   define CONTRACT_DETAIL_PP_TUPLE_SPLIT_CAT_I_(a, b) \
-        CONTRACT_DETAIL_PP_TUPLE_SPLIT_CAT_II_(~, a ## b)
-#   define CONTRACT_DETAIL_PP_TUPLE_SPLIT_CAT_II_(p, res) \
+#   define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_CAT_I_(a, b) \
+        BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_CAT_II_(~, a ## b)
+#   define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_CAT_II_(p, res) \
         res
 #endif
 
 // PUBLIC //
 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT(size) \
-    CONTRACT_DETAIL_PP_TUPLE_SPLIT_CAT_(CONTRACT_DETAIL_PP_TUPLE_SPLIT_, size)
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT(size) \
+    BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_CAT_( \
+            BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_, size)
 
 // DATA //
 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_1(_1) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_1(_1) \
     (_1) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_2(_1, _2) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_2(_1, _2) \
     (_1, _2) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_3(_1, _2, _3) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_3(_1, _2, _3) \
     (_1, _2, _3) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_4(_1, _2, _3, _4) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_4(_1, _2, _3, _4) \
     (_1, _2, _3, _4) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_5(_1, _2, _3, _4, _5) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_5(_1, _2, _3, _4, _5) \
     (_1, _2, _3, _4, _5) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_6(_1, _2, _3, _4, _5, _6) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_6(_1, _2, _3, _4, _5, _6) \
     (_1, _2, _3, _4, _5, _6) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_7(_1, _2, _3, _4, _5, _6, _7) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_7(_1, _2, _3, _4, _5, _6, _7) \
     (_1, _2, _3, _4, _5, _6, _7) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_8(_1, _2, _3, _4, _5, _6, _7, _8) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_8(_1, _2, _3, _4, _5, _6, _7, _8) \
     (_1, _2, _3, _4, _5, _6, _7, _8) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_9(_1, _2, _3, _4, _5, _6, _7, _8, _9) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_9(_1, _2, _3, _4, _5, _6, _7, _8, _9) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_10(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_10(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_11(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_11(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_12(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_12(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_13(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_13(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_14(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_14(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_15(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_15(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_16(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_16(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_17(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_17(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_18(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_18(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_19(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_19(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_20(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_20(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_21(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_21(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_22(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_22(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_23(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_23(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_24(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_24(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_25(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_25(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_26(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_26(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_27(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_27(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_28(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_28(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_29(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_29(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_30(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_30(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_31(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_31(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_32(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_32(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_33(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_33(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_34(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_34(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_35(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_35(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_36(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_36(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_37(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_37(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_38(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_38(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_39(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_39(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_40(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_40(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_41(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_41(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_42(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_42(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_43(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_43(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_44(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_44(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_45(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_45(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_46(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_46(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_47(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_47(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_48(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_48(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_49(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_49(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_50(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_50(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_51(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_51(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_52(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_52(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_53(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_53(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_54(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_54(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_55(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_55(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_56(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_56(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_57(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_57(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_58(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_58(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_59(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_59(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_60(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_60(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_61(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_61(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_62(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_62(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_63(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_63(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63) , /* comma splits */ 
-#define CONTRACT_DETAIL_PP_TUPLE_SPLIT_64(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64) \
+#define BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT_64(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64) \
     (_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64) , /* comma splits */ 
 
 #endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/variadic/eat.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/variadic/eat.hpp	(original)
+++ sandbox/contract/boost/contract/detail/preprocessor/variadic/eat.hpp	2013-03-04 18:00:03 EST (Mon, 04 Mar 2013)
@@ -5,8 +5,8 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 // Home at http://sourceforge.net/projects/contractpp
 
-#ifndef CONTRACT_DETAIL_PP_VARIADIC_EAT_HPP_
-#define CONTRACT_DETAIL_PP_VARIADIC_EAT_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_VARIADIC_EAT_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_VARIADIC_EAT_HPP_
 
 // Do not use Boost.PP variadic because they use a different config macro.
 #include <boost/config.hpp>
@@ -14,7 +14,7 @@
 
 // PUBLIC //
 
-#define CONTRACT_DETAIL_PP_VARIADIC_EAT(...) /* must expand to nothing */
+#define BOOST_CONTRACT_DETAIL_PP_VARIADIC_EAT(...) /* must expand to nothing */
 
 #endif
 

Modified: sandbox/contract/boost/contract/detail/preprocessor/variadic/is.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/variadic/is.hpp	(original)
+++ sandbox/contract/boost/contract/detail/preprocessor/variadic/is.hpp	2013-03-04 18:00:03 EST (Mon, 04 Mar 2013)
@@ -5,15 +5,15 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 // Home at http://sourceforge.net/projects/contractpp
 
-#ifndef CONTRACT_DETAIL_PP_IS_VARIADIC_HPP_
-#define CONTRACT_DETAIL_PP_IS_VARIADIC_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_HPP_
 
 // Do not use Boost.PP variadic because they use a different config macro.
 #include <boost/config.hpp>
 #ifndef BOOST_NO_VARIADIC_MACROS
 
-#include <contract/detail/preprocessor/variadic/size.hpp>
-#include <contract/detail/preprocessor/variadic/eat.hpp>
+#include <boost/contract/detail/preprocessor/variadic/size.hpp>
+#include <boost/contract/detail/preprocessor/variadic/eat.hpp>
 #include <boost/preprocessor/logical/compl.hpp>
 #include <boost/preprocessor/control/iif.hpp>
 #include <boost/preprocessor/comparison/equal.hpp>
@@ -26,65 +26,66 @@
 // Define own version of EXPAND for reentrancy.
 #if ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MWCC() && \
         ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_DMC()
-#   define CONTRACT_DETAIL_PP_IS_VARIADIC_EXPAND_(x) \
-        CONTRACT_DETAIL_PP_IS_VARIADIC_EXPAND_I_(x)
+#   define BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_EXPAND_(x) \
+        BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_EXPAND_I_(x)
 #else
-#   define CONTRACT_DETAIL_PP_IS_VARIADIC_EXPAND_(x) \
-        CONTRACT_DETAIL_PP_IS_VARIADIC_EXPAND_OO_((x))
-#   define CONTRACT_DETAIL_PP_IS_VARIADIC_EXPAND_OO_(par) \
-        CONTRACT_DETAIL_PP_IS_VARIADIC_EXPAND_I_ ## par
+#   define BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_EXPAND_(x) \
+        BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_EXPAND_OO_((x))
+#   define BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_EXPAND_OO_(par) \
+        BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_EXPAND_I_ ## par
 #endif
-#define CONTRACT_DETAIL_PP_IS_VARIADIC_EXPAND_I_(x) x
+#define BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_EXPAND_I_(x) x
         
-#define CONTRACT_DETAIL_PP_IS_VARIADIC_UNARY_SINGLE_TOKEN_(tokens) \
-    BOOST_PP_EQUAL(1, CONTRACT_DETAIL_PP_VARIADIC_SIZE tokens)
+#define BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_UNARY_SINGLE_TOKEN_(tokens) \
+    BOOST_PP_EQUAL(1, BOOST_CONTRACT_DETAIL_PP_VARIADIC_SIZE tokens)
     
-#define CONTRACT_DETAIL_PP_IS_VARIADIC_UNARY_SIGNLE_SPLIT_(...) \
+#define BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_UNARY_SIGNLE_SPLIT_(...) \
     (__VA_ARGS__),
 
 // Precondition: tokens = `(...) ...`.
-#define CONTRACT_DETAIL_PP_IS_VARIADIC_UNARY_SIGNLE_(tokens) \
-    CONTRACT_DETAIL_PP_IS_VARIADIC_UNARY_SINGLE_TOKEN_( \
+#define BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_UNARY_SIGNLE_(tokens) \
+    BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_UNARY_SINGLE_TOKEN_( \
         BOOST_PP_TUPLE_ELEM(2, 0, \
-                (CONTRACT_DETAIL_PP_IS_VARIADIC_UNARY_SIGNLE_SPLIT_ tokens)) \
+            (BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_UNARY_SIGNLE_SPLIT_ tokens) \
+        ) \
     )
 
-#define CONTRACT_DETAIL_PP_IS_VARIADIC_UNARY_(tokens) \
-    CONTRACT_DETAIL_PP_IS_VARIADIC_EXPAND_( /* EXPAND for MSVC */ \
-        BOOST_PP_IIF(CONTRACT_DETAIL_PP_HAS_PAREN(tokens), \
-            CONTRACT_DETAIL_PP_IS_VARIADIC_UNARY_SIGNLE_ \
+#define BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_UNARY_(tokens) \
+    BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_EXPAND_( /* EXPAND for MSVC */ \
+        BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_HAS_PAREN(tokens), \
+            BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_UNARY_SIGNLE_ \
         , \
             0 BOOST_PP_TUPLE_EAT(1) \
         )(tokens) \
     )
 
 // Precondition: size == 1 AND 1st token is unary.
-#define CONTRACT_DETAIL_PP_IS_VARIADIC_NOT_UNARY_2ND_(tokens) \
-    BOOST_PP_COMPL(CONTRACT_DETAIL_PP_IS_VARIADIC_UNARY_( \
-        CONTRACT_DETAIL_PP_VARIADIC_EAT tokens \
+#define BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_NOT_UNARY_2ND_(tokens) \
+    BOOST_PP_COMPL(BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_UNARY_( \
+        BOOST_CONTRACT_DETAIL_PP_VARIADIC_EAT tokens \
         (1) /* handle empty (1st is unary so all unary) */ \
     ))
 
 // Precondition: size == 1.
-#define CONTRACT_DETAIL_PP_IS_VARIADIC_NOT_UNARY_1ST_(tokens) \
-    BOOST_PP_IIF(CONTRACT_DETAIL_PP_IS_VARIADIC_UNARY_(tokens), \
-        CONTRACT_DETAIL_PP_IS_VARIADIC_NOT_UNARY_2ND_ \
+#define BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_NOT_UNARY_1ST_(tokens) \
+    BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_UNARY_(tokens), \
+        BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_NOT_UNARY_2ND_ \
     , \
         1 BOOST_PP_TUPLE_EAT(1) /* 1st not unary thus not seq and variadic */ \
     )(tokens)
 
-#define CONTRACT_DETAIL_PP_IS_VARIADIC_(size, ...) \
+#define BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_(size, ...) \
     BOOST_PP_IIF(BOOST_PP_EQUAL(size, 1), \
-        CONTRACT_DETAIL_PP_IS_VARIADIC_NOT_UNARY_1ST_ \
+        BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_NOT_UNARY_1ST_ \
     , /* size == 0 or size > 1 */ \
-        1 CONTRACT_DETAIL_PP_VARIADIC_EAT \
+        1 BOOST_CONTRACT_DETAIL_PP_VARIADIC_EAT \
     )(__VA_ARGS__)
 
 // PUBLIC //
 
-#define CONTRACT_DETAIL_PP_IS_VARIADIC(...) \
-    CONTRACT_DETAIL_PP_IS_VARIADIC_( \
-            CONTRACT_DETAIL_PP_VARIADIC_SIZE_MAYBE_EMPTY(__VA_ARGS__), \
+#define BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC(...) \
+    BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC_( \
+            BOOST_CONTRACT_DETAIL_PP_VARIADIC_SIZE_MAYBE_EMPTY(__VA_ARGS__), \
             __VA_ARGS__)
 
 #endif

Modified: sandbox/contract/boost/contract/detail/preprocessor/variadic/rem.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/variadic/rem.hpp	(original)
+++ sandbox/contract/boost/contract/detail/preprocessor/variadic/rem.hpp	2013-03-04 18:00:03 EST (Mon, 04 Mar 2013)
@@ -5,8 +5,8 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 // Home at http://sourceforge.net/projects/contractpp
 
-#ifndef CONTRACT_DETAIL_PP_VARIADIC_REM_HPP_
-#define CONTRACT_DETAIL_PP_VARIADIC_REM_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_VARIADIC_REM_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_VARIADIC_REM_HPP_
 
 // Do not use Boost.PP variadic because they use a different config macro.
 #include <boost/config.hpp>
@@ -14,7 +14,7 @@
 
 // PUBLIC //
 
-#define CONTRACT_DETAIL_PP_VARIADIC_REM(...) __VA_ARGS__
+#define BOOST_CONTRACT_DETAIL_PP_VARIADIC_REM(...) __VA_ARGS__
 
 #endif
 

Modified: sandbox/contract/boost/contract/detail/preprocessor/variadic/size.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/variadic/size.hpp	(original)
+++ sandbox/contract/boost/contract/detail/preprocessor/variadic/size.hpp	2013-03-04 18:00:03 EST (Mon, 04 Mar 2013)
@@ -5,14 +5,14 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 // Home at http://sourceforge.net/projects/contractpp
 
-#ifndef CONTRACT_DETAIL_PP_VARIADIC_SIZE_HPP_
-#define CONTRACT_DETAIL_PP_VARIADIC_SIZE_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_VARIADIC_SIZE_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_VARIADIC_SIZE_HPP_
 
 // Do not use Boost.PP variadic because they use a different config macro.
 #include <boost/config.hpp>
 #ifndef BOOST_NO_VARIADIC_MACROS
 
-#include <contract/detail/preprocessor/variadic/eat.hpp>
+#include <boost/contract/detail/preprocessor/variadic/eat.hpp>
 #include <boost/preprocessor/facilities/empty.hpp>
 #include <boost/preprocessor/facilities/is_empty.hpp>
 #include <boost/preprocessor/comparison/equal.hpp>
@@ -24,38 +24,39 @@
 
 // PRIVATE //
 
-#define CONTRACT_DETAIL_PP_VARIADIC_SIZE_1OR0_TOKEN_(maybe_empty) \
+#define BOOST_CONTRACT_DETAIL_PP_VARIADIC_SIZE_1OR0_TOKEN_(maybe_empty) \
     BOOST_PP_IIF(BOOST_PP_IS_EMPTY(maybe_empty (/*expand empty */) ), 0, 1)
 
-#define CONTRACT_DETAIL_PP_VARIADIC_SIZE_1OR0_(maybe_empty) \
-    BOOST_PP_IIF(CONTRACT_DETAIL_PP_HAS_PAREN(maybe_empty(/*exapnd empty */)), \
+#define BOOST_CONTRACT_DETAIL_PP_VARIADIC_SIZE_1OR0_(maybe_empty) \
+    BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_HAS_PAREN( \
+            maybe_empty(/*exapnd empty */)), \
         1 BOOST_PP_TUPLE_EAT(1) \
     , \
-        CONTRACT_DETAIL_PP_VARIADIC_SIZE_1OR0_TOKEN_ \
+        BOOST_CONTRACT_DETAIL_PP_VARIADIC_SIZE_1OR0_TOKEN_ \
     )(maybe_empty)
 
-#define CONTRACT_DETAIL_PP_VARIADIC_SIZE_HANDLE_EMPTY_(size, ...) \
+#define BOOST_CONTRACT_DETAIL_PP_VARIADIC_SIZE_HANDLE_EMPTY_(size, ...) \
     BOOST_PP_IIF(BOOST_PP_EQUAL(size, 1), \
-        CONTRACT_DETAIL_PP_VARIADIC_SIZE_1OR0_ \
+        BOOST_CONTRACT_DETAIL_PP_VARIADIC_SIZE_1OR0_ \
     , \
         size \
-        CONTRACT_DETAIL_PP_VARIADIC_EAT \
+        BOOST_CONTRACT_DETAIL_PP_VARIADIC_EAT \
     )(__VA_ARGS__ BOOST_PP_EMPTY)
 
 // PUBLIC //
 
 #if BOOST_MSVC
-#   define CONTRACT_DETAIL_PP_VARIADIC_SIZE(...) \
-        BOOST_PP_CAT(CONTRACT_DETAIL_PP_VARIADIC_SIZE_I_(__VA_ARGS__, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1,),)
+#   define BOOST_CONTRACT_DETAIL_PP_VARIADIC_SIZE(...) \
+        BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_VARIADIC_SIZE_I_(__VA_ARGS__, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1,),)
 #else // MSVC
-#   define CONTRACT_DETAIL_PP_VARIADIC_SIZE(...) \
-        CONTRACT_DETAIL_PP_VARIADIC_SIZE_I_(__VA_ARGS__, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1,)
+#   define BOOST_CONTRACT_DETAIL_PP_VARIADIC_SIZE(...) \
+        BOOST_CONTRACT_DETAIL_PP_VARIADIC_SIZE_I_(__VA_ARGS__, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1,)
 #endif // MSVC
-#define CONTRACT_DETAIL_PP_VARIADIC_SIZE_I_(e0, e1, e2, e3, e4, e5, e6, e7, e8, e9, e10, e11, e12, e13, e14, e15, e16, e17, e18, e19, e20, e21, e22, e23, e24, e25, e26, e27, e28, e29, e30, e31, e32, e33, e34, e35, e36, e37, e38, e39, e40, e41, e42, e43, e44, e45, e46, e47, e48, e49, e50, e51, e52, e53, e54, e55, e56, e57, e58, e59, e60, e61, e62, e63, size, ...) size
+#define BOOST_CONTRACT_DETAIL_PP_VARIADIC_SIZE_I_(e0, e1, e2, e3, e4, e5, e6, e7, e8, e9, e10, e11, e12, e13, e14, e15, e16, e17, e18, e19, e20, e21, e22, e23, e24, e25, e26, e27, e28, e29, e30, e31, e32, e33, e34, e35, e36, e37, e38, e39, e40, e41, e42, e43, e44, e45, e46, e47, e48, e49, e50, e51, e52, e53, e54, e55, e56, e57, e58, e59, e60, e61, e62, e63, size, ...) size
 
-#define CONTRACT_DETAIL_PP_VARIADIC_SIZE_MAYBE_EMPTY(...) \
-    CONTRACT_DETAIL_PP_VARIADIC_SIZE_HANDLE_EMPTY_( \
-            CONTRACT_DETAIL_PP_VARIADIC_SIZE(__VA_ARGS__), __VA_ARGS__)
+#define BOOST_CONTRACT_DETAIL_PP_VARIADIC_SIZE_MAYBE_EMPTY(...) \
+    BOOST_CONTRACT_DETAIL_PP_VARIADIC_SIZE_HANDLE_EMPTY_( \
+            BOOST_CONTRACT_DETAIL_PP_VARIADIC_SIZE(__VA_ARGS__), __VA_ARGS__)
 
 #endif
 

Modified: sandbox/contract/boost/contract/detail/preprocessor/variadic/to_seq.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/variadic/to_seq.hpp	(original)
+++ sandbox/contract/boost/contract/detail/preprocessor/variadic/to_seq.hpp	2013-03-04 18:00:03 EST (Mon, 04 Mar 2013)
@@ -5,43 +5,44 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 // Home at http://sourceforge.net/projects/contractpp
 
-#ifndef CONTRACT_DETAIL_PP_VARIADIC_TO_SEQ_HPP_
-#define CONTRACT_DETAIL_PP_VARIADIC_TO_SEQ_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_VARIADIC_TO_SEQ_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_VARIADIC_TO_SEQ_HPP_
 
 // Do not use Boost.PP variadic because they use a different config macro.
 #include <boost/config.hpp>
 #ifndef BOOST_NO_VARIADIC_MACROS
 
-#include <contract/detail/preprocessor/variadic/is.hpp>
-#include <contract/detail/preprocessor/variadic/size.hpp>
-#include <contract/detail/preprocessor/variadic/rem.hpp>
-#include <contract/detail/preprocessor/variadic/eat.hpp>
+#include <boost/contract/detail/preprocessor/variadic/is.hpp>
+#include <boost/contract/detail/preprocessor/variadic/size.hpp>
+#include <boost/contract/detail/preprocessor/variadic/rem.hpp>
+#include <boost/contract/detail/preprocessor/variadic/eat.hpp>
 #include <boost/preprocessor/tuple/to_seq.hpp>
 #include <boost/preprocessor/control/iif.hpp>
 #include <boost/preprocessor/control/if.hpp>
 
 // PRIVATE //
 
-#define CONTRACT_DETAIL_PP_VARIADIC_TO_SEQ_(...) \
-    BOOST_PP_TUPLE_TO_SEQ(CONTRACT_DETAIL_PP_VARIADIC_SIZE(__VA_ARGS__), \
+#define BOOST_CONTRACT_DETAIL_PP_VARIADIC_TO_SEQ_(...) \
+    BOOST_PP_TUPLE_TO_SEQ(BOOST_CONTRACT_DETAIL_PP_VARIADIC_SIZE(__VA_ARGS__), \
             (__VA_ARGS__))
 
-#define CONTRACT_DETAIL_PP_VARIADIC_TO_SEQ_NOT_EMPTY_(...) \
-    BOOST_PP_IIF(CONTRACT_DETAIL_PP_IS_VARIADIC(__VA_ARGS__), \
-        CONTRACT_DETAIL_PP_VARIADIC_TO_SEQ_ \
+#define BOOST_CONTRACT_DETAIL_PP_VARIADIC_TO_SEQ_NOT_EMPTY_(...) \
+    BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_IS_VARIADIC(__VA_ARGS__), \
+        BOOST_CONTRACT_DETAIL_PP_VARIADIC_TO_SEQ_ \
     , \
-        CONTRACT_DETAIL_PP_VARIADIC_REM \
+        BOOST_CONTRACT_DETAIL_PP_VARIADIC_REM \
     )(__VA_ARGS__)
 
 // PUBLIC //
 
 // Expand to `(arg0)(arg1)...` is __VA_ARGS__ is `arg0, arg1, ...` or already
 // `(arg0)(arg1)...`, if __VA_ARGS__ is empty `` expand to `empty_seq`.
-#define CONTRACT_DETAIL_PP_VARIADIC_TO_SEQ(empty_seq, ...) \
-    BOOST_PP_IF(CONTRACT_DETAIL_PP_VARIADIC_SIZE_MAYBE_EMPTY(__VA_ARGS__), \
-        CONTRACT_DETAIL_PP_VARIADIC_TO_SEQ_NOT_EMPTY_ \
+#define BOOST_CONTRACT_DETAIL_PP_VARIADIC_TO_SEQ(empty_seq, ...) \
+    BOOST_PP_IF(BOOST_CONTRACT_DETAIL_PP_VARIADIC_SIZE_MAYBE_EMPTY( \
+            __VA_ARGS__), \
+        BOOST_CONTRACT_DETAIL_PP_VARIADIC_TO_SEQ_NOT_EMPTY_ \
     , \
-        empty_seq CONTRACT_DETAIL_PP_VARIADIC_EAT \
+        empty_seq BOOST_CONTRACT_DETAIL_PP_VARIADIC_EAT \
     )(__VA_ARGS__)
 
 #endif