Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r83300 - in sandbox/contract/boost/contract/detail/preprocessor/traits: aux_ base class func func_param oldof params template_param
From: lorcaminiti_at_[hidden]
Date: 2013-03-04 18:43:04

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

Log:
boost/BOOST symbols.
Text files modified:
   sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/assertion.hpp | 63 ++++----
   sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/comma.hpp | 74 +++++-----
   sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/keyword.hpp | 16 +-
   sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/name.hpp | 160 +++++++++++----------
   sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/nil.hpp | 87 ++++++------
   sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/oldof.hpp | 35 ++--
   sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/type.hpp | 284 ++++++++++++++++++++-------------------
   sandbox/contract/boost/contract/detail/preprocessor/traits/base/access.hpp | 58 ++++----
   sandbox/contract/boost/contract/detail/preprocessor/traits/base/type.hpp | 16 +-
   sandbox/contract/boost/contract/detail/preprocessor/traits/base/virtual.hpp | 40 ++--
   sandbox/contract/boost/contract/detail/preprocessor/traits/class/access.hpp | 58 ++++----
   sandbox/contract/boost/contract/detail/preprocessor/traits/class/bases.hpp | 48 +++---
   sandbox/contract/boost/contract/detail/preprocessor/traits/class/concepts.hpp | 50 +++---
   sandbox/contract/boost/contract/detail/preprocessor/traits/class/export.hpp | 40 ++--
   sandbox/contract/boost/contract/detail/preprocessor/traits/class/final.hpp | 40 ++--
   sandbox/contract/boost/contract/detail/preprocessor/traits/class/friend.hpp | 38 ++--
   sandbox/contract/boost/contract/detail/preprocessor/traits/class/kind.hpp | 44 +++---
   sandbox/contract/boost/contract/detail/preprocessor/traits/class/name.hpp | 18 +-
   sandbox/contract/boost/contract/detail/preprocessor/traits/class/specializations.hpp | 27 +-
   sandbox/contract/boost/contract/detail/preprocessor/traits/class/template.hpp | 63 ++++----
   sandbox/contract/boost/contract/detail/preprocessor/traits/func/access.hpp | 58 ++++----
   sandbox/contract/boost/contract/detail/preprocessor/traits/func/concepts.hpp | 67 ++++----
   sandbox/contract/boost/contract/detail/preprocessor/traits/func/const.hpp | 40 ++--
   sandbox/contract/boost/contract/detail/preprocessor/traits/func/exceptions.hpp | 50 +++---
   sandbox/contract/boost/contract/detail/preprocessor/traits/func/explicit.hpp | 38 ++--
   sandbox/contract/boost/contract/detail/preprocessor/traits/func/export.hpp | 40 ++--
   sandbox/contract/boost/contract/detail/preprocessor/traits/func/extern.hpp | 38 ++--
   sandbox/contract/boost/contract/detail/preprocessor/traits/func/final.hpp | 40 ++--
   sandbox/contract/boost/contract/detail/preprocessor/traits/func/friend.hpp | 38 ++--
   sandbox/contract/boost/contract/detail/preprocessor/traits/func/initializers.hpp | 60 ++++----
   sandbox/contract/boost/contract/detail/preprocessor/traits/func/inline.hpp | 38 ++--
   sandbox/contract/boost/contract/detail/preprocessor/traits/func/name.hpp | 47 +++---
   sandbox/contract/boost/contract/detail/preprocessor/traits/func/new.hpp | 40 ++--
   sandbox/contract/boost/contract/detail/preprocessor/traits/func/override.hpp | 40 ++--
   sandbox/contract/boost/contract/detail/preprocessor/traits/func/param_concepts.hpp | 48 +++---
   sandbox/contract/boost/contract/detail/preprocessor/traits/func/params.hpp | 42 +++--
   sandbox/contract/boost/contract/detail/preprocessor/traits/func/preconditions.hpp | 52 +++---
   sandbox/contract/boost/contract/detail/preprocessor/traits/func/result_type.hpp | 141 ++++++++++---------
   sandbox/contract/boost/contract/detail/preprocessor/traits/func/static.hpp | 38 ++--
   sandbox/contract/boost/contract/detail/preprocessor/traits/func/template.hpp | 74 +++++-----
   sandbox/contract/boost/contract/detail/preprocessor/traits/func/virtual.hpp | 38 ++--
   sandbox/contract/boost/contract/detail/preprocessor/traits/func/volatile.hpp | 40 ++--
   sandbox/contract/boost/contract/detail/preprocessor/traits/func_param/classifier.hpp | 138 +++++++++---------
   sandbox/contract/boost/contract/detail/preprocessor/traits/func_param/default.hpp | 6
   sandbox/contract/boost/contract/detail/preprocessor/traits/func_param/name.hpp | 12
   sandbox/contract/boost/contract/detail/preprocessor/traits/func_param/type.hpp | 67 ++++----
   sandbox/contract/boost/contract/detail/preprocessor/traits/oldof/assignment.hpp | 6
   sandbox/contract/boost/contract/detail/preprocessor/traits/oldof/expr.hpp | 6
   sandbox/contract/boost/contract/detail/preprocessor/traits/oldof/type.hpp | 6
   sandbox/contract/boost/contract/detail/preprocessor/traits/params/group.hpp | 49 +++---
   sandbox/contract/boost/contract/detail/preprocessor/traits/params/namespace.hpp | 34 ++--
   sandbox/contract/boost/contract/detail/preprocessor/traits/params/void.hpp | 15 +
   sandbox/contract/boost/contract/detail/preprocessor/traits/template_param/default.hpp | 6
   sandbox/contract/boost/contract/detail/preprocessor/traits/template_param/kind.hpp | 139 +++++++++---------
   sandbox/contract/boost/contract/detail/preprocessor/traits/template_param/name.hpp | 12
   sandbox/contract/boost/contract/detail/preprocessor/traits/template_param/requirement.hpp | 16 +
   56 files changed, 1464 insertions(+), 1414 deletions(-)

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/assertion.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/assertion.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/assertion.hpp 2013-03-04 18:42:59 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_TRAITS_AUX_ASSERTION_HPP_
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_HPP_

-#include <contract/detail/preprocessor/traits/aux_/nil.hpp>
-#include <contract/detail/preprocessor/keyword/contract/requires.hpp>
-#include <contract/detail/preprocessor/keyword/using.hpp>
-#include <contract/detail/preprocessor/keyword/namespace.hpp>
-#include <contract/detail/preprocessor/keyword/typedef.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/nil.hpp>
+#include <boost/contract/detail/preprocessor/keyword/boost/contract/requires.hpp>
+#include <boost/contract/detail/preprocessor/keyword/using.hpp>
+#include <boost/contract/detail/preprocessor/keyword/namespace.hpp>
+#include <boost/contract/detail/preprocessor/keyword/typedef.hpp>
#include <boost/preprocessor/control/iif.hpp>
#include <boost/preprocessor/arithmetic/inc.hpp>
#include <boost/preprocessor/tuple/elem.hpp>
@@ -22,37 +22,40 @@
// PROTECTED //

// Expand to 1 iff it is an assertion statement.
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_IS_STATEMENT(assertion) \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_USING_FRONT(assertion), \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_IS_STATEMENT(assertion) \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_USING_FRONT(assertion), \
         1 \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_NAMESPACE_FRONT(assertion), \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_NAMESPACE_FRONT( \
+ assertion), \
         1 \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_TYPEDEF_FRONT(assertion), \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_TYPEDEF_FRONT( \
+ assertion), \
         1 \
     , \
         0 \
     )))

// Append specified assertion traits to trait list.
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_APPEND( \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_APPEND( \
         d, traits, number, instruction, requirements) \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_FRONT(instruction), \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_FRONT( \
+ instruction), \
         traits BOOST_PP_TUPLE_EAT(2) \
     , \
         BOOST_PP_LIST_APPEND \
     )(traits, ((number, instruction, requirements), BOOST_PP_NIL))

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_APPEND_TUPLE( \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_APPEND_TUPLE( \
         d, number_instruction_requirements_traits) \
     ( \
         BOOST_PP_TUPLE_ELEM(4, 0, number_instruction_requirements_traits) \
     , \
- 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 */ \
     , \
         /* append very last trait */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_APPEND(d \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_APPEND(d \
             , BOOST_PP_TUPLE_ELEM(4, 3, number_instruction_requirements_traits)\
             , BOOST_PP_TUPLE_ELEM(4, 0, number_instruction_requirements_traits)\
             , BOOST_PP_TUPLE_ELEM(4, 1, number_instruction_requirements_traits)\
@@ -61,46 +64,48 @@
     )

// To be used for assertion statements using, namespace, and typedef.
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_STATEMENT(d, statement, \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_STATEMENT(d, statement, \
         prev_number, prev_instruction, prev_requirements, traits) \
     ( \
         prev_number /* statement is not an assertion so don't inc number */ \
     , \
         statement /* statement instruction */ \
     , \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* statement has no requirement */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* stmnt has no requirement */ \
     , \
- CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_APPEND(d, traits, prev_number, \
- prev_instruction, prev_requirements) /* append prev traits */ \
+ /* append prev traits */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_APPEND(d, traits, \
+ prev_number, prev_instruction, prev_requirements) \
     )

// To be used for assertion requirements.
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_REQUIRES(d, requirements, \
- prev_number, prev_instruction, prev_requirements, traits) \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_REQUIRES(d, \
+ requirements, prev_number, prev_instruction, prev_requirements, traits)\
     ( \
         prev_number \
     , \
         prev_instruction \
     , \
         /* only update requirements for prev assertion */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL \
- CONTRACT_DETAIL_PP_KEYWORD_REQUIRES_REMOVE_FRONT(requirements) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_REQUIRES_REMOVE_FRONT(requirements) \
     , \
         traits /* don't append, will append at next iteration */ \
     )

// To be used for boolean, const, and static assertions.
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_CONDITION(d, assertion, \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_CONDITION(d, assertion, \
         prev_number, prev_instruction, prev_requirements, traits) \
     ( \
         BOOST_PP_INC(prev_number) /* new actual assertion, inc number */ \
     , \
         assertion /* assertion instruction */ \
     , \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* no requirements (maybe next) */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* no rqrmnts (maybe next) */ \
     , \
- CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_APPEND(d, traits, prev_number, \
- prev_instruction, prev_requirements) /* append prev traits */ \
+ /* append prev traits */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_ASSERTION_APPEND(d, traits, \
+ prev_number, prev_instruction, prev_requirements) \
     )

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/comma.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/comma.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/comma.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,57 +5,58 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_HPP_
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_HPP_

-#include <contract/detail/preprocessor/tuple/split.hpp>
+#include <boost/contract/detail/preprocessor/tuple/split.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_ARRAY_(size_tuple_rest) \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_ARRAY_(size_tuple_rest) \
     (BOOST_PP_TUPLE_ELEM(3, 0, size_tuple_rest), \
             BOOST_PP_TUPLE_ELEM(3, 1, size_tuple_rest))

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_AFTER_(size_tuple_rest) \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_AFTER_(size_tuple_rest) \
     BOOST_PP_TUPLE_ELEM(3, 2, size_tuple_rest)

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_SPLIT_(size) \
- size, CONTRACT_DETAIL_PP_TUPLE_SPLIT(size) /* split */
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_SPLIT_(size) \
+ size, BOOST_CONTRACT_DETAIL_PP_TUPLE_SPLIT(size) /* split */

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_comma(comma_count) \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_comma(comma_count) \
     /* tuple size is number of commas + 1 */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_SPLIT_(BOOST_PP_INC(comma_count))
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_SPLIT_(BOOST_PP_INC(comma_count))

// tokens: `comma(n) (token0, ..., token_n) ...`
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_( \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_( \
         after01, no_comma_macro, tokens) \
     BOOST_PP_IIF(after01, \
- CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_AFTER_ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_AFTER_ \
     , \
- CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_ARRAY_ \
- )((BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_, tokens)))
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_ARRAY_ \
+ )((BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_, tokens)))

#ifndef BOOST_NO_VARIADIC_MACROS
-# define CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_PAREN_SPLIT_(...) \
- CONTRACT_DETAIL_PP_VARIADIC_SIZE(__VA_ARGS__), (__VA_ARGS__), /*split*/
+# define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_PAREN_SPLIT_(...) \
+ BOOST_CONTRACT_DETAIL_PP_VARIADIC_SIZE(__VA_ARGS__), (__VA_ARGS__) \
+ , /* comma splits */
#else
-# define CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_PAREN_SPLIT_(token) \
- 1, (token), /* split */
+# define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_PAREN_SPLIT_(token) \
+ 1, (token), /* comma splits */
#endif

// tokens: `(token0, ...) ...`
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_PAREN_( \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_PAREN_( \
         after01, no_comma_macro, tokens) \
     BOOST_PP_IIF(after01, \
- CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_AFTER_ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_AFTER_ \
     , \
- CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_ARRAY_ \
- )((CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_PAREN_SPLIT_ tokens))
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_ARRAY_ \
+ )((BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_PAREN_SPLIT_ tokens))

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_NOT_AFTER_(rest) \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_NOT_AFTER_(rest) \
     rest

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_NOT_ARRAY_(token) \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_NOT_ARRAY_(token) \
     /* training EMPTY() so MSVC properly handle when token is empty */ \
     BOOST_PP_IIF(BOOST_PP_IS_EMPTY(token BOOST_PP_EMPTY()), \
         (0, ()) /* 0-size array for empty */ \
@@ -63,32 +64,33 @@
         (1, (token)) \
     )

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_NOT_( \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_NOT_( \
         after01, no_comma_macro, tokens) \
     BOOST_PP_IIF(after01, \
- CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_NOT_AFTER_ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_NOT_AFTER_ \
     , \
- CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_NOT_ARRAY_ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_NOT_ARRAY_ \
     )(no_comma_macro(tokens))

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_DISPATCH_( \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_DISPATCH_( \
         after01, no_comma_macro, tokens) \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_COMMA_FRONT(tokens), \
- CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_ \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_HAS_PAREN(tokens), \
- CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_PAREN_ \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_COMMA_FRONT(tokens), \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_ \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_HAS_PAREN(tokens), \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_PAREN_ \
     , \
- CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_NOT_ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_NOT_ \
     ))(after01, no_comma_macro, tokens)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA(no_comma_macro, tokens) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_DISPATCH_( \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA(no_comma_macro, tokens) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_DISPATCH_( \
             0 /* array, not after */, no_comma_macro, tokens)

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_COMMA(no_comma_macro, tokens) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_DISPATCH_( \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_COMMA( \
+ no_comma_macro, tokens) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA_DISPATCH_( \
             1 /* after */, no_comma_macro, tokens)

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/keyword.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/keyword.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/keyword.hpp 2013-03-04 18:42:59 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_TRAITS_AUX_KEYWORD_HPP_
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD_HPP_

#include <boost/preprocessor/control/expr_iif.hpp>
#include <boost/preprocessor/control/iif.hpp>
@@ -18,16 +18,16 @@

// A keyword.

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(tokens, is_macro, keyword) \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(tokens, is_macro, keyword) \
     BOOST_PP_EXPR_IIF(BOOST_PP_EXPAND(is_macro(tokens)), /* expand for MSVC */ \
             keyword)

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(tokens, after_macro) \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(tokens, after_macro) \
     after_macro(tokens)

// A keyword among 2 possible ones.

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD2(tokens, \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD2(tokens, \
         is_macro1, keyword1, is_macro2, keyword2) \
     BOOST_PP_IIF(is_macro1(tokens), \
         keyword1 BOOST_PP_EMPTY \
@@ -37,7 +37,7 @@
         BOOST_PP_EMPTY /* expand to nothing */ \
     ))(/* expand empty */)

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD2(tokens, \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD2(tokens, \
         is_macro1, after_macro1, is_macro2, after_macro2) \
     BOOST_PP_IIF(is_macro1(tokens), \
         after_macro1 \
@@ -49,7 +49,7 @@

// A keyword among 3 possible ones.

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD3(tokens, \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD3(tokens, \
         is_macro1, keyword1, is_macro2, keyword2, is_macro3, keyword3) \
     BOOST_PP_IIF(is_macro1(tokens), \
         keyword1 BOOST_PP_EMPTY \
@@ -61,7 +61,7 @@
         BOOST_PP_EMPTY /* expand to nothing */ \
     )))(/* expand empty */)

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD3(tokens, \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD3(tokens, \
         is_macro1, after_macro1, is_macro2, after_macro2, \
         is_macro3, after_macro3) \
     BOOST_PP_IIF(is_macro1(tokens), \

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/name.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/name.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/name.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,16 +5,16 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_HPP_
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_HPP_

-#include <contract/detail/preprocessor/traits/aux_/type.hpp>
-#include <contract/detail/preprocessor/traits/aux_/nil.hpp>
-#include <contract/detail/preprocessor/facilities/is_digit.hpp>
-#include <contract/detail/preprocessor/keyword/contract/comma.hpp>
-#include <contract/detail/preprocessor/keyword/new.hpp>
-#include <contract/detail/preprocessor/keyword/delete.hpp>
-#include <contract/detail/preprocessor/keyword/operator.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/type.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/nil.hpp>
+#include <boost/contract/detail/preprocessor/facilities/is_digit.hpp>
+#include <boost/contract/detail/preprocessor/keyword/boost/contract/comma.hpp>
+#include <boost/contract/detail/preprocessor/keyword/new.hpp>
+#include <boost/contract/detail/preprocessor/keyword/delete.hpp>
+#include <boost/contract/detail/preprocessor/keyword/operator.hpp>
#include <boost/preprocessor/tuple/elem.hpp>
#include <boost/preprocessor/control/iif.hpp>
#include <boost/preprocessor/seq/cat.hpp>
@@ -23,19 +23,22 @@
// PRIVATE //

#ifndef BOOST_NO_VARIADIC_MACROS
-# define CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_IS_COMMA_OPERATOR_SPLIT_(...) \
- BOOST_PP_TUPLE_ELEM(CONTRACT_DETAIL_PP_VARIADIC_SIZE(__VA_ARGS__), 0, \
+# define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_IS_COMMA_OPERATOR_SPLIT_( \
+ ...) \
+ BOOST_PP_TUPLE_ELEM( \
+ BOOST_CONTRACT_DETAIL_PP_VARIADIC_SIZE(__VA_ARGS__), 0, \
                 (__VA_ARGS__)) , /* split */
#else
-# define CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_IS_COMMA_OPERATOR_SPLIT_(seq) \
+# define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_IS_COMMA_OPERATOR_SPLIT_( \
+ seq) \
         seq , /* split */
#endif

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_IS_COMMA_OPERATOR_2ND_(tokens) \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_IS_DIGIT(BOOST_PP_TUPLE_ELEM(2, 0, \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_IS_COMMA_OPERATOR_2ND_(tokens)\
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_IS_DIGIT(BOOST_PP_TUPLE_ELEM(2, 0, \
             BOOST_PP_EXPAND(( \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_IS_COMMA_OPERATOR_SPLIT_ \
- CONTRACT_DETAIL_PP_KEYWORD_COMMA_REMOVE_FRONT(tokens) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_IS_COMMA_OPERATOR_SPLIT_ \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_COMMA_REMOVE_FRONT(tokens) \
             )))), \
         0 /* e.g., `operator comam(1)(std::map<int, char>)` */ \
     , \
@@ -44,142 +47,147 @@

// Is comma operator `operator comma ( int i, int j )` (and not comma in macro
// `operator comma(1)(std::map<int, char>) ( void )`).
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_IS_COMMA_OPERATOR_(tokens) \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_IS_COMMA_OPERATOR_(tokens) \
     BOOST_PP_EXPAND( /* EXPAND for MSVC */ \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_COMMA_FRONT(tokens), \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_IS_COMMA_OPERATOR_2ND_ \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_COMMA_FRONT(tokens), \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_IS_COMMA_OPERATOR_2ND_ \
         , \
             0 BOOST_PP_TUPLE_EAT(1) /* not `operator comma ...` */ \
         )(tokens) \
     )

// Function name (not an operator): `(f) ( int i, int j)`.
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_(tokens) \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_(tokens) \
     ( /* operator tokens (0-size array if not an operator) */ \
         (0, ()) \
     , /* alphanumeric name */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NAME(tokens) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME(tokens) \
     )

// Symbolic operator: `operator(==)(equal)` and also commas in macros
// `operator comma(1)(std::map<int, char>)(std_map)`.
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_OPERATOR_SYMBOL_(tokens) \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_OPERATOR_SYMBOL_(tokens) \
     ( /* operator tokens (0-size array if not an operator) */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA(BOOST_PP_TUPLE_REM(1), tokens) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA(BOOST_PP_TUPLE_REM(1), \
+ tokens) \
     , /* alphanumeric name */ \
- BOOST_PP_SEQ_HEAD(CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_COMMA( \
+ BOOST_PP_SEQ_HEAD(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_COMMA( \
                 BOOST_PP_TUPLE_REM(1), tokens)) \
     )

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME_OPERATOR_SYMBOL_OP_(tokens) \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME_OPERATOR_SYMBOL_OP_( \
+ tokens) \
     /* skips after symbol and eats name `(symbol)(name)` */\
     BOOST_PP_TUPLE_EAT(1) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_COMMA(BOOST_PP_TUPLE_REM(1), tokens) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_COMMA(BOOST_PP_TUPLE_REM(1), \
+ tokens)

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME_OPERATOR_SYMBOL_(tokens) \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME_OPERATOR_SYMBOL_(tokens)\
     BOOST_PP_EXPAND( /* extra OP and EXPAND macros needed for MSVC */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME_OPERATOR_SYMBOL_OP_( \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME_OPERATOR_SYMBOL_OP_(\
                     tokens))

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_OPERATOR_KEYWORD_SEQ_UNWRAP_( \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_OPERATOR_KEYWORD_SEQ_UNWRAP_( \
         r, unused, type_bit) \
     type_bit /* remove seq paren */

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_OPERATOR_KEYWORD_SEQ_(seq) \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_OPERATOR_KEYWORD_SEQ_(seq) \
     ( /* operator tokens (0-size array if not an operator) */ \
         (1, (BOOST_PP_SEQ_FOR_EACH( \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_OPERATOR_KEYWORD_SEQ_UNWRAP_, \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_OPERATOR_KEYWORD_SEQ_UNWRAP_, \
                 ~, seq))) \
     , /* alphanumeric name */ \
         BOOST_PP_SEQ_CAT(seq) \
     )

// Keyword operator: `operator int const ( vooid )`, `operator new`.
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_OPERATOR_KEYWORD_(tokens) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_OPERATOR_KEYWORD_SEQ_( \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_NEW_FRONT(tokens), \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_OPERATOR_KEYWORD_(tokens) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_OPERATOR_KEYWORD_SEQ_( \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_NEW_FRONT(tokens), \
             (new) BOOST_PP_TUPLE_EAT(1) \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_DELETE_FRONT(tokens), \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_DELETE_FRONT( \
+ tokens), \
             (delete) BOOST_PP_TUPLE_EAT(1) \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_COMMA_FRONT(tokens), \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_COMMA_FRONT(tokens),\
             (comma) BOOST_PP_TUPLE_EAT(1) \
         , \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_SEQ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_SEQ \
         )))(tokens) \
     )

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME_OPERATOR_KEYWORD_(tokens) \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_NEW_FRONT(tokens), \
- CONTRACT_DETAIL_PP_KEYWORD_NEW_REMOVE_FRONT \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_DELETE_FRONT(tokens), \
- CONTRACT_DETAIL_PP_KEYWORD_DELETE_REMOVE_FRONT \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_COMMA_FRONT(tokens), \
- CONTRACT_DETAIL_PP_KEYWORD_COMMA_REMOVE_FRONT \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME_OPERATOR_KEYWORD_( \
+ tokens) \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_NEW_FRONT(tokens), \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_NEW_REMOVE_FRONT \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_DELETE_FRONT(tokens), \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_DELETE_REMOVE_FRONT \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_COMMA_FRONT(tokens), \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_COMMA_REMOVE_FRONT \
     , /* operator type */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TYPE \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TYPE \
     )))(tokens)

// Dispatch operator parsing.
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_OPERATOR_(tokens) \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_OPERATOR_(tokens) \
     /* the order of these if-statements matter */ \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_IS_COMMA_OPERATOR_( \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_IS_COMMA_OPERATOR_( \
             tokens), \
         /* comma operator `operator comma ( int i, int j )` */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_OPERATOR_KEYWORD_ \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_COMMA_FRONT(tokens), \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_OPERATOR_KEYWORD_ \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_COMMA_FRONT(tokens), \
         /* comma in macors `operator comma(1)(map<int, char)(map) ( void )` */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_OPERATOR_SYMBOL_ \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_HAS_PAREN(tokens), \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_OPERATOR_SYMBOL_ \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_HAS_PAREN(tokens), \
         /* symbolic operator `operator(==)(equal)` */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_OPERATOR_SYMBOL_ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_OPERATOR_SYMBOL_ \
     , \
         /* keyword operator `operator new`, `operator int const` */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_OPERATOR_KEYWORD_ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_OPERATOR_KEYWORD_ \
     )))(tokens)

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME_OPERATOR_(tokens) \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME_OPERATOR_(tokens) \
     /* the order of these if-statements matter */ \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_IS_COMMA_OPERATOR_( \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_IS_COMMA_OPERATOR_( \
             tokens), \
         /* comma operator `operator comma ( int i, int j )` */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME_OPERATOR_KEYWORD_ \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_COMMA_FRONT(tokens), \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME_OPERATOR_KEYWORD_ \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_COMMA_FRONT(tokens), \
         /* comma in macors `operator comma(1)(map<int, char)(map) ( void )` */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME_OPERATOR_SYMBOL_ \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_HAS_PAREN(tokens), \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME_OPERATOR_SYMBOL_ \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_HAS_PAREN(tokens), \
         /* symbolic operator `operator(==)(equal)` */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME_OPERATOR_SYMBOL_ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME_OPERATOR_SYMBOL_ \
     , \
         /* keyword operator `operator new`, `operator int const` */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME_OPERATOR_KEYWORD_ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME_OPERATOR_KEYWORD_ \
     )))(tokens)

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_SPLIT_(tokens) \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_SPLIT_(tokens) \
     tokens , /* slits into 2-tuple `(tokens, following_tokens)` */

// PROTECTED //

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_NAME(tokens) \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME(tokens) \
     BOOST_PP_TUPLE_ELEM(2, 0, \
- (CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_SPLIT_ tokens) )
+ (BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_SPLIT_ tokens) )

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME(tokens) \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME(tokens) \
     BOOST_PP_TUPLE_ELEM(2, 1, \
- (CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_SPLIT_ tokens) )
+ (BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_SPLIT_ tokens) )

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_WITH_OPERATOR(tokens) \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_OPERATOR_FRONT(tokens), \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_OPERATOR_ \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_WITH_OPERATOR(tokens) \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_OPERATOR_FRONT(tokens), \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_OPERATOR_ \
     , \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_ \
- )(CONTRACT_DETAIL_PP_KEYWORD_OPERATOR_REMOVE_FRONT(tokens))
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_ \
+ )(BOOST_CONTRACT_DETAIL_PP_KEYWORD_OPERATOR_REMOVE_FRONT(tokens))

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME_WITH_OPERATOR(tokens) \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_OPERATOR_FRONT(tokens), \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME_OPERATOR_ \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME_WITH_OPERATOR(tokens) \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_OPERATOR_FRONT(tokens), \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME_OPERATOR_ \
     , \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME \
- )(CONTRACT_DETAIL_PP_KEYWORD_OPERATOR_REMOVE_FRONT(tokens))
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME \
+ )(BOOST_CONTRACT_DETAIL_PP_KEYWORD_OPERATOR_REMOVE_FRONT(tokens))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/nil.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/nil.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/nil.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,83 +5,84 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_HPP_
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_HPP_

-#include <contract/detail/preprocessor/variadic/size.hpp>
-#include <contract/detail/preprocessor/variadic/eat.hpp>
-#include <contract/detail/preprocessor/keyword/facilities/is.hpp>
-#include <contract/detail/preprocessor/keyword/facilities/remove.hpp>
+#include <boost/contract/detail/preprocessor/variadic/size.hpp>
+#include <boost/contract/detail/preprocessor/variadic/eat.hpp>
+#include <boost/contract/detail/preprocessor/keyword/facilities/is.hpp>
+#include <boost/contract/detail/preprocessor/keyword/facilities/remove.hpp>
#include <boost/preprocessor/tuple/elem.hpp>
#include <boost/config.hpp>

// PROTECTED //

// Make sure NIL symbGl is not defined by users.
-#ifdef CONTRACT_DETAIL_PP_TRAITS_AUX_NIL
-# error "internal macro CONTRACT_DETAIL_PP_TRAITS_AUX_NIL must be undefined"
+#ifdef BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL
+# error "internal macro BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL must be undefined"
#endif

// These are not local macros -- DO NOT #UNDEF.
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_IS_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_IS_BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL \
     (1) /* unary */
-#define \
-CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL \
     /* nothing */

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_FRONT(tokens) \
- CONTRACT_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_IS_)
-
-// Or directly PP_CAT with CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_ (faster).
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_FRONT(tokens) \
- CONTRACT_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT(tokens, \
- CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_FRONT, \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_)
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_FRONT(tokens) \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_IS_)
+
+// Or directly PP_CAT with BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_
+// (faster).
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_FRONT(tokens) \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT(tokens, \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_)

#ifndef BOOST_NO_VARIADIC_MACROS
-# define CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_(...) \
+# define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_(...) \
         BOOST_PP_IIF(BOOST_PP_EQUAL( \
- CONTRACT_DETAIL_PP_VARIADIC_SIZE(__VA_ARGS__), 1), \
- CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_FRONT \
+ BOOST_CONTRACT_DETAIL_PP_VARIADIC_SIZE(__VA_ARGS__), 1), \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_FRONT \
         , \
- 0 CONTRACT_DETAIL_PP_VARIADIC_EAT \
+ 0 BOOST_CONTRACT_DETAIL_PP_VARIADIC_EAT \
         )(__VA_ARGS__)
-# define CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_SPLIT_(...) \
+# define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_SPLIT_(...) \
         (__VA_ARGS__), /* comma split remaining tokens */
-# define CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_PAREN_(paren_tokens) \
+# define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_PAREN_(paren_tokens) \
         BOOST_PP_EXPAND( \
- CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_ \
             BOOST_PP_TUPLE_ELEM(2, 0, BOOST_PP_EXPAND( \
- (CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_SPLIT_ paren_tokens) \
+ (BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_SPLIT_ \
+ paren_tokens) \
             )) \
         )
// Expand to 1 iff `(nil)...`.
-# define CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_PAREN(...) \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_HAS_PAREN(__VA_ARGS__), \
- CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_PAREN_ \
+# define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_PAREN(...) \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_HAS_PAREN(__VA_ARGS__), \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_PAREN_ \
         , \
- CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_FRONT \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_FRONT \
         )(__VA_ARGS__)
// Expand to 1 iff `nil, ...`.
-# define CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL(...) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_FRONT( \
- BOOST_PP_TUPLE_ELEM(CONTRACT_DETAIL_PP_VARIADIC_SIZE( \
+# define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL(...) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_FRONT( \
+ BOOST_PP_TUPLE_ELEM(BOOST_CONTRACT_DETAIL_PP_VARIADIC_SIZE( \
                     __VA_ARGS__), 0 /* first variadic elem */, (__VA_ARGS__)))
#else
-# define CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_PAREN_(tokens) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_FRONT(tokens)
-# define CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_(paren_tokens) \
+# define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_PAREN_(tokens) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_FRONT(tokens)
+# define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_(paren_tokens) \
         BOOST_PP_EXPAND( \
- CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_PAREN_ paren_tokens)
-# define CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_PAREN(tokens) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_PAREN_ paren_tokens)
+# define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_PAREN(tokens) \
         BOOST_PP_IIF(BOOST_PP_IS_UNARY(tokens), \
- CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_ \
         , \
             0 BOOST_PP_TUPLE_EAT(1) \
         )(tokens)
-# define CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL(tokens) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_FRONT(tokens)
+# define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL(tokens) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_FRONT(tokens)
#endif

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/oldof.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/oldof.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/oldof.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,35 +5,34 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_TRAITS_AUX_OLDOF_HPP_
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_OLDOF_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_OLDOF_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_OLDOF_HPP_

-#include <contract/aux_/config.hpp>
-#include <contract/detail/preprocessor/keyword/facilities/is.hpp>
-#include <contract/detail/preprocessor/keyword/facilities/remove.hpp>
+#include <boost/contract/aux_/config.hpp>
+#include <boost/contract/detail/preprocessor/keyword/facilities/is.hpp>
+#include <boost/contract/detail/preprocessor/keyword/facilities/remove.hpp>

// PROTECTED //

// Make sure OLDOF symbol is not defined by users.
-#ifdef CONTRACT_DETAIL_PP_TRAITS_OLDOF
-#error ERROR_internal_macro_CONTRACT_DETTAIL_PP_TRAITS_OLDOF_must_be_undefined
+#ifdef BOOST_CONTRACT_DETAIL_PP_TRAITS_OLDOF
+# error ERROR_internal_macro_BOOST_CONTRACT_DETTAIL_PP_TRAITS_OLDOF_must_be_undefined
#endif

// These are not local macros -- DO NOT #UNDEF.
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_OLDOF_IS_CONTRACT_DETAIL_PP_TRAITS_OLDOF \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_OLDOF_IS_BOOST_CONTRACT_DETAIL_PP_TRAITS_OLDOF \
(1) /* unary */
-#define \
-CONTRACT_DETAIL_PP_TRAITS_AUX_OLDOF_REMOVE_CONTRACT_DETAIL_PP_TRAITS_OLDOF \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_OLDOF_REMOVE_BOOST_CONTRACT_DETAIL_PP_TRAITS_OLDOF \
/* nothing */

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_IS_OLDOF_FRONT(tokens) \
- CONTRACT_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
- CONTRACT_DETAIL_PP_TRAITS_AUX_OLDOF_IS_)
-
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_OLDOF_REMOVE_FRONT(tokens) \
- CONTRACT_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT(tokens, \
- CONTRACT_DETAIL_PP_TRAITS_AUX_IS_OLDOF_FRONT, \
- CONTRACT_DETAIL_PP_TRAITS_AUX_OLDOF_REMOVE_)
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_OLDOF_FRONT(tokens) \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_OLDOF_IS_)
+
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_OLDOF_REMOVE_FRONT(tokens) \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT(tokens, \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_OLDOF_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_OLDOF_REMOVE_)

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/type.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/type.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/aux_/type.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,27 +5,27 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_HPP_
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_HPP_

-#include <contract/detail/preprocessor/traits/aux_/comma.hpp>
-#include <contract/detail/preprocessor/punctuation/has_paren.hpp>
-#include <contract/detail/preprocessor/keyword/void.hpp>
-#include <contract/detail/preprocessor/keyword/bool.hpp>
-#include <contract/detail/preprocessor/keyword/char.hpp>
-#include <contract/detail/preprocessor/keyword/double.hpp>
-#include <contract/detail/preprocessor/keyword/float.hpp>
-#include <contract/detail/preprocessor/keyword/int.hpp>
-#include <contract/detail/preprocessor/keyword/wchar_t.hpp>
-#include <contract/detail/preprocessor/keyword/cstddef/size_t.hpp>
-#include <contract/detail/preprocessor/keyword/cstddef/ptrdiff_t.hpp>
-#include <contract/detail/preprocessor/keyword/const.hpp>
-#include <contract/detail/preprocessor/keyword/volatile.hpp>
-#include <contract/detail/preprocessor/keyword/long.hpp>
-#include <contract/detail/preprocessor/keyword/short.hpp>
-#include <contract/detail/preprocessor/keyword/signed.hpp>
-#include <contract/detail/preprocessor/keyword/unsigned.hpp>
-#include <contract/detail/preprocessor/keyword/int.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/comma.hpp>
+#include <boost/contract/detail/preprocessor/punctuation/has_paren.hpp>
+#include <boost/contract/detail/preprocessor/keyword/void.hpp>
+#include <boost/contract/detail/preprocessor/keyword/bool.hpp>
+#include <boost/contract/detail/preprocessor/keyword/char.hpp>
+#include <boost/contract/detail/preprocessor/keyword/double.hpp>
+#include <boost/contract/detail/preprocessor/keyword/float.hpp>
+#include <boost/contract/detail/preprocessor/keyword/int.hpp>
+#include <boost/contract/detail/preprocessor/keyword/wchar_t.hpp>
+#include <boost/contract/detail/preprocessor/keyword/cstddef/size_t.hpp>
+#include <boost/contract/detail/preprocessor/keyword/cstddef/ptrdiff_t.hpp>
+#include <boost/contract/detail/preprocessor/keyword/const.hpp>
+#include <boost/contract/detail/preprocessor/keyword/volatile.hpp>
+#include <boost/contract/detail/preprocessor/keyword/long.hpp>
+#include <boost/contract/detail/preprocessor/keyword/short.hpp>
+#include <boost/contract/detail/preprocessor/keyword/signed.hpp>
+#include <boost/contract/detail/preprocessor/keyword/unsigned.hpp>
+#include <boost/contract/detail/preprocessor/keyword/int.hpp>
#include <boost/preprocessor/control/iif.hpp>
#include <boost/preprocessor/control/while.hpp>
#include <boost/preprocessor/tuple/elem.hpp>
@@ -35,7 +35,7 @@

// PRIVATE //

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_(type_tokens, \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_(type_tokens, \
         type_elem, next_macro) \
     ( \
         BOOST_PP_TUPLE_ELEM(2, 0, type_tokens) (type_elem) /* make a seq */ \
@@ -43,164 +43,170 @@
         next_macro(BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)) \
     )

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_SKIP_(type_tokens, \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_SKIP_(type_tokens, \
         unused0, unused1) \
     type_tokens

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_APPLY3_(macro, \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_APPLY3_(macro, \
         arg0, arg1, arg2) \
     macro(arg0, arg1, arg2)

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_(is_macro, tokens) \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_(is_macro, tokens) \
     /* allows any paren (), (a), (a, b), etc to be within tokens (variadics) */\
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_HAS_PAREN(tokens), \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_HAS_PAREN(tokens), \
         0 BOOST_PP_TUPLE_EAT(1) \
     , \
         is_macro \
     )(tokens)

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_FUNDAMENTAL_TYPE_( \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_FUNDAMENTAL_TYPE_( \
         type_tokens) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_APPLY3_ \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_VOID_FRONT, \
- BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
- (CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
- void, CONTRACT_DETAIL_PP_KEYWORD_VOID_REMOVE_FRONT) \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_BOOL_FRONT, \
- BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
- (CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
- bool, CONTRACT_DETAIL_PP_KEYWORD_BOOL_REMOVE_FRONT) \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_CHAR_FRONT, \
- BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
- (CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
- char, CONTRACT_DETAIL_PP_KEYWORD_CHAR_REMOVE_FRONT) \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_DOUBLE_FRONT, \
- BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
- (CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
- double, CONTRACT_DETAIL_PP_KEYWORD_DOUBLE_REMOVE_FRONT) \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_FLOAT_FRONT, \
- BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
- (CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
- float, CONTRACT_DETAIL_PP_KEYWORD_FLOAT_REMOVE_FRONT) \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_INT_FRONT, \
- BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
- (CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
- int, CONTRACT_DETAIL_PP_KEYWORD_INT_REMOVE_FRONT) \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_WCHAR_T_FRONT, \
- BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
- (CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
- wchar_t, CONTRACT_DETAIL_PP_KEYWORD_WCHAR_T_REMOVE_FRONT) \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_SIZE_T_FRONT, \
- BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
- (CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
- size_t, CONTRACT_DETAIL_PP_KEYWORD_SIZE_T_REMOVE_FRONT) \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_PTRDIFF_T_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_APPLY3_ \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_VOID_FRONT, \
+ BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
+ (BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
+ void, BOOST_CONTRACT_DETAIL_PP_KEYWORD_VOID_REMOVE_FRONT) \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_BOOL_FRONT, \
+ BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
+ (BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
+ bool, BOOST_CONTRACT_DETAIL_PP_KEYWORD_BOOL_REMOVE_FRONT) \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_CHAR_FRONT, \
+ BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
+ (BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
+ char, BOOST_CONTRACT_DETAIL_PP_KEYWORD_CHAR_REMOVE_FRONT) \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_DOUBLE_FRONT, \
+ BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
+ (BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
+ double, BOOST_CONTRACT_DETAIL_PP_KEYWORD_DOUBLE_REMOVE_FRONT) \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_FLOAT_FRONT, \
+ BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
+ (BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
+ float, BOOST_CONTRACT_DETAIL_PP_KEYWORD_FLOAT_REMOVE_FRONT) \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_INT_FRONT, \
+ BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
+ (BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
+ int, BOOST_CONTRACT_DETAIL_PP_KEYWORD_INT_REMOVE_FRONT) \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_WCHAR_T_FRONT, \
+ BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
+ (BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
+ wchar_t, BOOST_CONTRACT_DETAIL_PP_KEYWORD_WCHAR_T_REMOVE_FRONT) \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_SIZE_T_FRONT, \
+ BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
+ (BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
+ size_t, BOOST_CONTRACT_DETAIL_PP_KEYWORD_SIZE_T_REMOVE_FRONT) \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_PTRDIFF_T_FRONT, \
             BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
- (CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
- ptrdiff_t, CONTRACT_DETAIL_PP_KEYWORD_PTRDIFF_T_REMOVE_FRONT) \
+ (BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
+ ptrdiff_t, BOOST_CONTRACT_DETAIL_PP_KEYWORD_PTRDIFF_T_REMOVE_FRONT) \
     , \
- (CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_SKIP_, type_tokens, ~, ~) \
+ (BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_SKIP_, type_tokens, \
+ ~, ~) \
     )))))))))

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_QUALIFIER_OP_( \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_QUALIFIER_OP_( \
         d, type_tokens) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_APPLY3_ \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_CONST_FRONT, \
- BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
- (CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
- const, CONTRACT_DETAIL_PP_KEYWORD_CONST_REMOVE_FRONT) \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_VOLATILE_FRONT, \
- BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
- (CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
- volatile, CONTRACT_DETAIL_PP_KEYWORD_VOLATILE_REMOVE_FRONT) \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_LONG_FRONT, \
- BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
- (CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
- long, CONTRACT_DETAIL_PP_KEYWORD_LONG_REMOVE_FRONT) \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_SHORT_FRONT, \
- BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
- (CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
- short, CONTRACT_DETAIL_PP_KEYWORD_SHORT_REMOVE_FRONT) \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_SIGNED_FRONT, \
- BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
- (CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
- signed, CONTRACT_DETAIL_PP_KEYWORD_SIGNED_REMOVE_FRONT) \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_UNSIGNED_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_APPLY3_ \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_CONST_FRONT, \
+ BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
+ (BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
+ const, BOOST_CONTRACT_DETAIL_PP_KEYWORD_CONST_REMOVE_FRONT) \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_VOLATILE_FRONT, \
+ BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
+ (BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
+ volatile, BOOST_CONTRACT_DETAIL_PP_KEYWORD_VOLATILE_REMOVE_FRONT) \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_LONG_FRONT, \
+ BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
+ (BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
+ long, BOOST_CONTRACT_DETAIL_PP_KEYWORD_LONG_REMOVE_FRONT) \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_SHORT_FRONT, \
+ BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
+ (BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
+ short, BOOST_CONTRACT_DETAIL_PP_KEYWORD_SHORT_REMOVE_FRONT) \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_SIGNED_FRONT, \
+ BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
+ (BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
+ signed, BOOST_CONTRACT_DETAIL_PP_KEYWORD_SIGNED_REMOVE_FRONT) \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_UNSIGNED_FRONT, \
             BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
- (CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
- unsigned, CONTRACT_DETAIL_PP_KEYWORD_UNSIGNED_REMOVE_FRONT) \
+ (BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_NEXT_, type_tokens, \
+ unsigned, BOOST_CONTRACT_DETAIL_PP_KEYWORD_UNSIGNED_REMOVE_FRONT) \
     , \
- (CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_SKIP_, type_tokens, ~, ~) \
+ (BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_SKIP_, type_tokens, \
+ ~, ~) \
     ))))))

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_QUALIFIER_PRED_( \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_QUALIFIER_PRED_( \
         d, type_tokens) \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_CONST_FRONT, \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_CONST_FRONT, \
             BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
         1 \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_VOLATILE_FRONT, \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_VOLATILE_FRONT, \
             BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
         1 \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_LONG_FRONT, \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_LONG_FRONT, \
             BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
         1 \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_SHORT_FRONT, \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_SHORT_FRONT, \
             BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
         1 \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_SIGNED_FRONT, \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_SIGNED_FRONT, \
             BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
         1 \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_UNSIGNED_FRONT, \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_IS_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_UNSIGNED_FRONT, \
             BOOST_PP_TUPLE_ELEM(2, 1, type_tokens)), \
         1 \
     , \
         0 \
     ))))))

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_QUALIFIER_(type_tokens) \
- BOOST_PP_WHILE(CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_QUALIFIER_PRED_, \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_QUALIFIER_OP_, \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_QUALIFIER_( \
+ type_tokens) \
+ BOOST_PP_WHILE( \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_QUALIFIER_PRED_, \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_QUALIFIER_OP_, \
             type_tokens)

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_(tokens, after01) \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_(tokens, after01) \
     BOOST_PP_TUPLE_ELEM(2, after01, \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_QUALIFIER_( \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_FUNDAMENTAL_TYPE_( \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_QUALIFIER_( \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_QUALIFIER_( \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_FUNDAMENTAL_TYPE_( \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_QUALIFIER_( \
         (BOOST_PP_EMPTY(), tokens) \
     ))))

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_SEQ_UNWRAP_(r, unused, type_bit) \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_SEQ_UNWRAP_( \
+ r, unused, type_bit) \
     type_bit /* remove seq paren */

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_(tokens) \
- BOOST_PP_SEQ_FOR_EACH(CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_SEQ_UNWRAP_, ~, \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_SEQ(tokens))
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_(tokens) \
+ BOOST_PP_SEQ_FOR_EACH( \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_SEQ_UNWRAP_, ~, \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_SEQ(tokens))

// Expand `(type) ...` or `keyword_type ...` to their remaining tokens `...`.
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TYPE_(tokens) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_( \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TYPE_(tokens) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_( \
             tokens, 1 /* after, not current */)

// PROTECTED //
@@ -214,17 +220,17 @@
// keyword_type_:
// qualifiers_ fundamental_type_ qualifiers_
// (Note that both `(void)` and `void` are also allowed.)
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_SEQ(tokens) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_( \
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_SEQ(tokens) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_KEYWORD_( \
             tokens, 0 /* current, not after */)

-#define CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE(tokens) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA( \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_, tokens)
-
-#define CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TYPE(tokens) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_COMMA( \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TYPE_, tokens)
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE(tokens) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA( \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE_, tokens)
+
+#define BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TYPE(tokens) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_COMMA( \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TYPE_, tokens)

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/base/access.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/base/access.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/base/access.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,48 +5,48 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_BASE_TRAITS_ACCESS_HPP_
-#define CONTRACT_DETAIL_PP_BASE_TRAITS_ACCESS_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_ACCESS_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_ACCESS_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply_1.hpp>
-#include <contract/detail/preprocessor/traits/aux_/keyword.hpp>
-#include <contract/detail/preprocessor/traits/aux_/nil.hpp>
-#include <contract/detail/preprocessor/keyword/public.hpp>
-#include <contract/detail/preprocessor/keyword/protected.hpp>
-#include <contract/detail/preprocessor/keyword/private.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply_1.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/keyword.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/nil.hpp>
+#include <boost/contract/detail/preprocessor/keyword/public.hpp>
+#include <boost/contract/detail/preprocessor/keyword/protected.hpp>
+#include <boost/contract/detail/preprocessor/keyword/private.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_BASE_TRAITS_ACCESS_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL \
- CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD3(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_PUBLIC_FRONT, public, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_PROTECTED_FRONT, protected, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_PRIVATE_FRONT, private)
-
-#define CONTRACT_DETAIL_PP_BASE_TRAITS_ACCESS_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD3(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_PUBLIC_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_PUBLIC_REMOVE_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_PROTECTED_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_PROTECTED_REMOVE_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_PRIVATE_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_PRIVATE_REMOVE_FRONT)
+#define BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_ACCESS_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD3(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_PUBLIC_FRONT, public, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_PROTECTED_FRONT, protected, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_PRIVATE_FRONT, private)
+
+#define BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_ACCESS_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD3(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_PUBLIC_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_PUBLIC_REMOVE_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_PROTECTED_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_PROTECTED_REMOVE_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_PRIVATE_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_PRIVATE_REMOVE_FRONT)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_BASE_TRAITS_AUX_ACCESS(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY_INIT_1(traits_sign, \
- CONTRACT_DETAIL_PP_BASE_TRAITS_ACCESS_TRAIT_, \
- CONTRACT_DETAIL_PP_BASE_TRAITS_ACCESS_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_AUX_ACCESS(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY_INIT_1(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_ACCESS_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_ACCESS_SIGN_)

// PUBLIC //

// Expand to `[public | protected | private]`.
-#define CONTRACT_DETAIL_PP_BASE_TRAITS_ACCESS(base_traits) \
- BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
+#define BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_ACCESS(base_traits) \
+ BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
BOOST_PP_ARRAY_ELEM(0, base_traits))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/base/type.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/base/type.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/base/type.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,29 +5,29 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_BASE_TRAITS_TYPE_HPP_
-#define CONTRACT_DETAIL_PP_BASE_TRAITS_TYPE_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_TYPE_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_TYPE_HPP_

#include <boost/preprocessor/tuple/rem.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_BASE_TRAITS_AUX_TYPE_(sign) \
+#define BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_AUX_TYPE_(sign) \
     /* PP_REM because only type left in sign */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA(BOOST_PP_TUPLE_REM(1), sign)
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA(BOOST_PP_TUPLE_REM(1), sign)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_BASE_TRAITS_AUX_TYPE(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY_1(traits_sign, \
- CONTRACT_DETAIL_PP_BASE_TRAITS_AUX_TYPE_, \
+#define BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_AUX_TYPE(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY_1(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_AUX_TYPE_, \
             BOOST_PP_TUPLE_REM(1)) /* nothing left in sign */

// PUBLIC //

// Expand to `(n, (base_token0, ...))` (array for unwrapped commas).
-#define CONTRACT_DETAIL_PP_BASE_TRAITS_TYPE(base_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_TYPE(base_traits) \
     BOOST_PP_ARRAY_ELEM(2, base_traits)

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/base/virtual.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/base/virtual.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/base/virtual.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,39 +5,39 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_BASE_TRAITS_VIRTUAL_HPP_
-#define CONTRACT_DETAIL_PP_BASE_TRAITS_VIRTUAL_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_VIRTUAL_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_VIRTUAL_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply_1.hpp>
-#include <contract/detail/preprocessor/traits/aux_/keyword.hpp>
-#include <contract/detail/preprocessor/traits/aux_/nil.hpp>
-#include <contract/detail/preprocessor/keyword/virtual.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply_1.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/keyword.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/nil.hpp>
+#include <boost/contract/detail/preprocessor/keyword/virtual.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_BASE_TRAITS_VIRTUAL_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_VIRTUAL_FRONT, virtual) \
-
-#define CONTRACT_DETAIL_PP_BASE_TRAITS_VIRTUAL_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_VIRTUAL_REMOVE_FRONT)
+#define BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_VIRTUAL_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_VIRTUAL_FRONT, virtual) \
+
+#define BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_VIRTUAL_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_VIRTUAL_REMOVE_FRONT)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_BASE_TRAITS_AUX_VIRTUAL(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY_1(traits_sign, \
- CONTRACT_DETAIL_PP_BASE_TRAITS_VIRTUAL_TRAIT_, \
- CONTRACT_DETAIL_PP_BASE_TRAITS_VIRTUAL_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_AUX_VIRTUAL(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY_1(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_VIRTUAL_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_VIRTUAL_SIGN_)

// PUBLIC //

// Expand to `[virtual]`.
-#define CONTRACT_DETAIL_PP_BASE_TRAITS_VIRTUAL(base_traits) \
- BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
+#define BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS_VIRTUAL(base_traits) \
+ BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
BOOST_PP_ARRAY_ELEM(1, base_traits))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/class/access.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/class/access.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/class/access.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,48 +5,48 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_CLASS_TRAITS_ACCESS_HPP_
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_ACCESS_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_ACCESS_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_ACCESS_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/keyword.hpp>
-#include <contract/detail/preprocessor/traits/aux_/nil.hpp>
-#include <contract/detail/preprocessor/keyword/public.hpp>
-#include <contract/detail/preprocessor/keyword/protected.hpp>
-#include <contract/detail/preprocessor/keyword/private.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/keyword.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/nil.hpp>
+#include <boost/contract/detail/preprocessor/keyword/public.hpp>
+#include <boost/contract/detail/preprocessor/keyword/protected.hpp>
+#include <boost/contract/detail/preprocessor/keyword/private.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_ACCESS_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD3(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_PUBLIC_FRONT, public, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_PROTECTED_FRONT, protected, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_PRIVATE_FRONT, private)
-
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_ACCESS_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD3(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_PUBLIC_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_PUBLIC_REMOVE_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_PROTECTED_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_PROTECTED_REMOVE_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_PRIVATE_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_PRIVATE_REMOVE_FRONT)
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_ACCESS_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD3(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_PUBLIC_FRONT, public, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_PROTECTED_FRONT, protected, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_PRIVATE_FRONT, private)
+
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_ACCESS_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD3(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_PUBLIC_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_PUBLIC_REMOVE_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_PROTECTED_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_PROTECTED_REMOVE_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_PRIVATE_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_PRIVATE_REMOVE_FRONT)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_ACCESS(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY_INIT(traits_sign, \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_ACCESS_TRAIT_, \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_ACCESS_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_ACCESS(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY_INIT(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_ACCESS_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_ACCESS_SIGN_)

// PUBLIC //

// Expand to `[public | protected | private]`.
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_ACCESS(class_traits) \
- BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_ACCESS(class_traits) \
+ BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
BOOST_PP_ARRAY_ELEM(0, class_traits))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/class/bases.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/class/bases.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/class/bases.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,44 +5,44 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_CLASS_TRAITS_BASES_HPP_
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_BASES_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_BASES_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_BASES_HPP_

-#include <contract/detail/preprocessor/traits/base.hpp>
-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/list.hpp>
-#include <contract/detail/preprocessor/keyword/contract/extends.hpp>
+#include <boost/contract/detail/preprocessor/traits/base.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/list.hpp>
+#include <boost/contract/detail/preprocessor/keyword/boost/contract/extends.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_BASES_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST(sign, \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_BASES_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST(sign, \
             0, /* might not be empty */ \
             0, /* might not have defaults */ \
- CONTRACT_DETAIL_PP_KEYWORD_IS_EXTENDS_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_EXTENDS_REMOVE_FRONT, \
- CONTRACT_DETAIL_PP_BASE_TRAITS)
-
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_BASES_REMOVE_extends \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST_REMOVE
-
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_BASES_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TAGGED_LIST(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_EXTENDS_FRONT, \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_BASES_REMOVE_)
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_EXTENDS_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_EXTENDS_REMOVE_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_BASE_TRAITS)
+
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_BASES_REMOVE_extends \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST_REMOVE
+
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_BASES_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TAGGED_LIST(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_EXTENDS_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_BASES_REMOVE_)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_BASES(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_BASES_TRAIT_, \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_BASES_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_BASES(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_BASES_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_BASES_SIGN_)

// PUBLIC //

// Expand to pp-list of base classes (see `BASE_CLASS_TRAITS` macros).
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_BASES(class_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_BASES(class_traits) \
     BOOST_PP_ARRAY_ELEM(9, class_traits)

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/class/concepts.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/class/concepts.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/class/concepts.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,48 +5,48 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_CLASS_TRAITS_CONCEPTS_HPP_
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_CONCEPTS_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_CONCEPTS_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_CONCEPTS_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/list.hpp>
-#include <contract/detail/preprocessor/keyword/contract/requires.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/list.hpp>
+#include <boost/contract/detail/preprocessor/keyword/boost/contract/requires.hpp>
#include <boost/preprocessor/tuple/rem.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_CONCEPTS_TRAIT_COMMA_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA(BOOST_PP_TUPLE_REM(1), sign)
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_CONCEPTS_TRAIT_COMMA_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA(BOOST_PP_TUPLE_REM(1), sign)

-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_CONCEPTS_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST(sign, \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_CONCEPTS_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST(sign, \
             0, /* might not be empty */ \
             0, /* might not have defaults */ \
- CONTRACT_DETAIL_PP_KEYWORD_IS_REQUIRES_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_REQUIRES_REMOVE_FRONT, \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_CONCEPTS_TRAIT_COMMA_)
-
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_CONCEPTS_REMOVE_requires \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST_REMOVE
-
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_CONCEPTS_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TAGGED_LIST(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_REQUIRES_FRONT, \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_CONCEPTS_REMOVE_)
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_REQUIRES_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_REQUIRES_REMOVE_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_CONCEPTS_TRAIT_COMMA_)
+
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_CONCEPTS_REMOVE_requires \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST_REMOVE
+
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_CONCEPTS_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TAGGED_LIST(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_REQUIRES_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_CONCEPTS_REMOVE_)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_CONCEPTS(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_CONCEPTS_TRAIT_, \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_CONCEPTS_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_CONCEPTS(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_CONCEPTS_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_CONCEPTS_SIGN_)

// PUBLIC //

// Expand to pp-list of concept types `(n, (concept_token0, ...))` (array for
// unwrapped commas).
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_CONCEPTS(class_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_CONCEPTS(class_traits) \
     BOOST_PP_ARRAY_ELEM(3, class_traits)

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/class/export.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/class/export.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/class/export.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,39 +5,39 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_CLASS_TRAITS_EXPORT_HPP_
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_EXPORT_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_EXPORT_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_EXPORT_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/keyword.hpp>
-#include <contract/detail/preprocessor/traits/aux_/nil.hpp>
-#include <contract/detail/preprocessor/keyword/export.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/keyword.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/nil.hpp>
+#include <boost/contract/detail/preprocessor/keyword/export.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_EXPORT_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_EXPORT_FRONT, export)
-
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_EXPORT_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_EXPORT_REMOVE_FRONT)
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_EXPORT_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_EXPORT_FRONT, export)
+
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_EXPORT_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_EXPORT_REMOVE_FRONT)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_EXPORT(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_EXPORT_TRAIT_, \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_EXPORT_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_EXPORT(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_EXPORT_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_EXPORT_SIGN_)

// PUBLIC //

// Expand to `[export]`.
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_EXPORT(class_traits) \
- BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_EXPORT(class_traits) \
+ BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
BOOST_PP_ARRAY_ELEM(1, class_traits))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/class/final.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/class/final.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/class/final.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,39 +5,39 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_CLASS_TRAITS_FINAL_HPP_
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_FINAL_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_FINAL_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_FINAL_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/keyword.hpp>
-#include <contract/detail/preprocessor/traits/aux_/nil.hpp>
-#include <contract/detail/preprocessor/keyword/cxx11/final.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/keyword.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/nil.hpp>
+#include <boost/contract/detail/preprocessor/keyword/cxx11/final.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_FINAL_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_FINAL_FRONT, final)
-
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_FINAL_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_FINAL_REMOVE_FRONT)
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_FINAL_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_FINAL_FRONT, final)
+
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_FINAL_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_FINAL_REMOVE_FRONT)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_FINAL(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_FINAL_TRAIT_, \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_FINAL_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_FINAL(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_FINAL_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_FINAL_SIGN_)

// PUBLIC //

// Expand to `[final]`.
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_FINAL(class_traits) \
- BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_FINAL(class_traits) \
+ BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
BOOST_PP_ARRAY_ELEM(8, class_traits))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/class/friend.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/class/friend.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/class/friend.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,38 +5,38 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_CLASS_TRAITS_FRIEND_HPP_
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_FRIEND_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_FRIEND_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_FRIEND_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/keyword.hpp>
-#include <contract/detail/preprocessor/keyword/friend.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/keyword.hpp>
+#include <boost/contract/detail/preprocessor/keyword/friend.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_FRIEND_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_FRIEND_FRONT, friend)
-
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_FRIEND_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_FRIEND_REMOVE_FRONT)
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_FRIEND_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_FRIEND_FRONT, friend)
+
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_FRIEND_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_FRIEND_REMOVE_FRONT)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_FRIEND(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_FRIEND_TRAIT_, \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_FRIEND_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_FRIEND(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_FRIEND_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_FRIEND_SIGN_)

// PUBLIC //

// Expand to `[friend]`.
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_FRIEND(func_traits) \
- BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_FRIEND(func_traits) \
+ BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
BOOST_PP_ARRAY_ELEM(4, func_traits))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/class/kind.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/class/kind.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/class/kind.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,40 +5,40 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_CLASS_TRAITS_KIND_HPP_
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_KIND_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_KIND_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_KIND_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/keyword.hpp>
-#include <contract/detail/preprocessor/keyword/class.hpp>
-#include <contract/detail/preprocessor/keyword/struct.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/keyword.hpp>
+#include <boost/contract/detail/preprocessor/keyword/class.hpp>
+#include <boost/contract/detail/preprocessor/keyword/struct.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_KIND_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD2(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_CLASS_FRONT, class, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_STRUCT_FRONT, struct)
-
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_KIND_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD2(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_CLASS_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_CLASS_REMOVE_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_STRUCT_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_STRUCT_REMOVE_FRONT)
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_KIND_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD2(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_CLASS_FRONT, class, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_STRUCT_FRONT, struct)
+
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_KIND_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD2(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_CLASS_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_CLASS_REMOVE_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_STRUCT_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_STRUCT_REMOVE_FRONT)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_KIND(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_KIND_TRAIT_, \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_KIND_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_KIND(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_KIND_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_KIND_SIGN_)

// PUBLIC //

// Expand to `class | struct`.
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_KIND(class_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_KIND(class_traits) \
BOOST_PP_ARRAY_ELEM(5, class_traits)

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/class/name.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/class/name.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/class/name.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,24 +5,24 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_CLASS_TRAITS_NAME_HPP_
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_NAME_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_NAME_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_NAME_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/name.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/name.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PROTECTED //

-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_NAME(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NAME, \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME)
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_NAME(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME, \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME)

// PUBLIC //

// Expand to `class_name`.
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_NAME(class_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_NAME(class_traits) \
BOOST_PP_ARRAY_ELEM(6, class_traits)

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/class/specializations.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/class/specializations.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/class/specializations.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,37 +5,38 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_CLASS_TRAITS_SPECIALIZATIONS_HPP_
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_SPECIALIZATIONS_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_SPECIALIZATIONS_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_SPECIALIZATIONS_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/list.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/list.hpp>
#include <boost/preprocessor/tuple/rem.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

// For reentrancy on GCC with C++0x.
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_SPECIALIZATIONS_REM_(tokens) tokens
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_SPECIALIZATIONS_REM_(tokens) \
+ tokens

-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_SPECIALIZATIONS_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_OPTIONAL_LIST(sign, \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_SPECIALIZATIONS_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_OPTIONAL_LIST(sign, \
             0, /* might not be empty (when present) */ \
             0, /* might not have defaults */ \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_SPECIALIZATIONS_REM_)
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_SPECIALIZATIONS_REM_)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_SPECIALIZATIONS(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_SPECIALIZATIONS_TRAIT_, \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_OPTIONAL_LIST)
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_SPECIALIZATIONS(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_SPECIALIZATIONS_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_OPTIONAL_LIST)

// PUBLIC //

// Expand to pp-list of template specialization types (empty iff the class is
// not a template specialization).
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_SPECIALIZATIONS(class_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_SPECIALIZATIONS(class_traits) \
     BOOST_PP_ARRAY_ELEM(7, class_traits)

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/class/template.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/class/template.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/class/template.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,68 +5,69 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_HPP_
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_HPP_

-#include <contract/detail/preprocessor/traits/params.hpp>
-#include <contract/detail/preprocessor/traits/template_param.hpp>
-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/list.hpp>
-#include <contract/detail/preprocessor/keyword/template.hpp>
+#include <boost/contract/detail/preprocessor/traits/params.hpp>
+#include <boost/contract/detail/preprocessor/traits/template_param.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/list.hpp>
+#include <boost/contract/detail/preprocessor/keyword/template.hpp>
#include <boost/preprocessor/tuple/rem.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_TRAIT_(sign) \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_TRAIT_(sign) \
     ( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_TEMPLATE_FRONT(sign) \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_TEMPLATE_FRONT(sign) \
     , \
- CONTRACT_DETAIL_PP_TEMPLATE_PARAMS_TRAITS(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAMS_TRAITS(sign) \
     )

-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_REMOVE_template \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST_REMOVE
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_REMOVE_template \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST_REMOVE

-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TAGGED_LIST(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_TEMPLATE_FRONT, \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_REMOVE_)
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TAGGED_LIST(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_TEMPLATE_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_REMOVE_)

-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_INDEX_ 2
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_INDEX_ 2

// PROTECTED //

-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_TEMPLATE(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_TRAIT_, \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_AUX_TEMPLATE(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_SIGN_)

// PUBLIC //

// Expand to 1 iff it is a template (even if no params `template<>`).
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_IS_TEMPLATE(class_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_IS_TEMPLATE(class_traits) \
     BOOST_PP_TUPLE_ELEM(2, 0, BOOST_PP_ARRAY_ELEM( \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_INDEX_, class_traits))
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_INDEX_, \
+ class_traits))

// Expand to tparams traits (see `TEMPLATE_PARAM_TRAITS` macros).
-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_PARAMS(class_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_PARAMS(class_traits) \
     BOOST_PP_TUPLE_ELEM(2, 1, BOOST_PP_ARRAY_ELEM( \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_INDEX_, \
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_INDEX_, \
             class_traits))

-#define CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_REPLACE( \
+#define BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_REPLACE( \
         class_traits, template_sign) \
     /* can't use ARRAY_REPLACE here because it has reentrancy _D */ \
     ( BOOST_PP_ARRAY_SIZE(class_traits), \
     ( \
- CONTRACT_DETAIL_PP_ARRAY_REM(CONTRACT_DETAIL_PP_ARRAY_FIRST_N( \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_INDEX_, \
+ BOOST_CONTRACT_DETAIL_PP_ARRAY_REM(BOOST_CONTRACT_DETAIL_PP_ARRAY_FIRST_N( \
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_INDEX_, \
                 class_traits)) \
- , CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_TRAIT_(template_sign) \
- , CONTRACT_DETAIL_PP_ARRAY_REM(CONTRACT_DETAIL_PP_ARRAY_REST_N( \
+ , BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_TRAIT_(template_sign) \
+ , BOOST_CONTRACT_DETAIL_PP_ARRAY_REM(BOOST_CONTRACT_DETAIL_PP_ARRAY_REST_N( \
                 BOOST_PP_INC( \
- CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_INDEX_), \
+ BOOST_CONTRACT_DETAIL_PP_CLASS_TRAITS_TEMPLATE_INDEX_),\
                 class_traits)) \
     ) )

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func/access.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func/access.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func/access.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,48 +5,48 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_FUNC_TRAITS_ACCESS_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_ACCESS_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_ACCESS_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_ACCESS_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/keyword.hpp>
-#include <contract/detail/preprocessor/traits/aux_/nil.hpp>
-#include <contract/detail/preprocessor/keyword/public.hpp>
-#include <contract/detail/preprocessor/keyword/protected.hpp>
-#include <contract/detail/preprocessor/keyword/private.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/keyword.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/nil.hpp>
+#include <boost/contract/detail/preprocessor/keyword/public.hpp>
+#include <boost/contract/detail/preprocessor/keyword/protected.hpp>
+#include <boost/contract/detail/preprocessor/keyword/private.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_ACCESS_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD3(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_PUBLIC_FRONT, public, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_PROTECTED_FRONT, protected, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_PRIVATE_FRONT, private)
-
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_ACCESS_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD3(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_PUBLIC_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_PUBLIC_REMOVE_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_PROTECTED_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_PROTECTED_REMOVE_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_PRIVATE_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_PRIVATE_REMOVE_FRONT)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_ACCESS_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD3(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_PUBLIC_FRONT, public, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_PROTECTED_FRONT, protected, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_PRIVATE_FRONT, private)
+
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_ACCESS_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD3(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_PUBLIC_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_PUBLIC_REMOVE_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_PROTECTED_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_PROTECTED_REMOVE_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_PRIVATE_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_PRIVATE_REMOVE_FRONT)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_ACCESS(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY_INIT(traits_sign, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_ACCESS_TRAIT_, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_ACCESS_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_ACCESS(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY_INIT(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_ACCESS_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_ACCESS_SIGN_)

// PUBLIC //

// Expand to `[public | protected | private]`.
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_ACCESS(func_traits) \
- BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_ACCESS(func_traits) \
+ BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
BOOST_PP_ARRAY_ELEM(0, func_traits))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func/concepts.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func/concepts.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func/concepts.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,63 +5,64 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/list.hpp>
-#include <contract/detail/preprocessor/keyword/contract/requires.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/list.hpp>
+#include <boost/contract/detail/preprocessor/keyword/boost/contract/requires.hpp>
#include <boost/preprocessor/tuple/rem.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_TRAIT_COMMA_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA(BOOST_PP_TUPLE_REM(1), sign)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_TRAIT_COMMA_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA(BOOST_PP_TUPLE_REM(1), sign)

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST(sign, \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST(sign, \
             0, /* might not be empty */ \
             0, /* might not have defaults */ \
- CONTRACT_DETAIL_PP_KEYWORD_IS_REQUIRES_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_REQUIRES_REMOVE_FRONT, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_TRAIT_COMMA_)
-
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_REMOVE_requires \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST_REMOVE
-
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TAGGED_LIST(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_REQUIRES_FRONT, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_REMOVE_)
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_REQUIRES_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_REQUIRES_REMOVE_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_TRAIT_COMMA_)
+
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_REMOVE_requires \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST_REMOVE
+
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TAGGED_LIST(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_REQUIRES_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_REMOVE_)

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_INDEX_ 3
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_INDEX_ 3

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_CONCEPTS(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_TRAIT_, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_CONCEPTS(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_SIGN_)

// PUBLIC //

// Expand to pp-list of concept types.
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS(func_traits) \
- BOOST_PP_ARRAY_ELEM(CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_INDEX_, \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS(func_traits) \
+ BOOST_PP_ARRAY_ELEM(BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_INDEX_, \
             func_traits)

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_REPLACE( \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_REPLACE( \
         func_traits, concepts_sign) \
     /* can't use ARRAY_REPLACE because it has reentrancy _D */ \
     ( BOOST_PP_ARRAY_SIZE(func_traits), \
     ( \
- CONTRACT_DETAIL_PP_ARRAY_REM(CONTRACT_DETAIL_PP_ARRAY_FIRST_N( \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_INDEX_, \
+ BOOST_CONTRACT_DETAIL_PP_ARRAY_REM(BOOST_CONTRACT_DETAIL_PP_ARRAY_FIRST_N( \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_INDEX_, \
                 func_traits)) \
- , CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_TRAIT_(concepts_sign) \
- , CONTRACT_DETAIL_PP_ARRAY_REM(CONTRACT_DETAIL_PP_ARRAY_REST_N( \
- BOOST_PP_INC(CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_INDEX_), \
+ , BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_TRAIT_(concepts_sign) \
+ , BOOST_CONTRACT_DETAIL_PP_ARRAY_REM(BOOST_CONTRACT_DETAIL_PP_ARRAY_REST_N( \
+ BOOST_PP_INC( \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_INDEX_), \
                 func_traits)) \
     ) )

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func/const.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func/const.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func/const.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,39 +5,39 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_FUNC_TRAITS_CONST_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_CONST_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONST_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONST_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/keyword.hpp>
-#include <contract/detail/preprocessor/traits/aux_/nil.hpp>
-#include <contract/detail/preprocessor/keyword/const.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/keyword.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/nil.hpp>
+#include <boost/contract/detail/preprocessor/keyword/const.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_CONST_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_CONST_FRONT, const)
-
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_CONST_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_CONST_REMOVE_FRONT)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONST_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_CONST_FRONT, const)
+
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONST_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_CONST_REMOVE_FRONT)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_CONST(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_CONST_TRAIT_, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_CONST_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_CONST(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONST_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONST_SIGN_)

// PUBLIC //

// Expand to `[const]`.
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_CONST(func_traits) \
- BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONST(func_traits) \
+ BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
BOOST_PP_ARRAY_ELEM(14, func_traits))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func/exceptions.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func/exceptions.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func/exceptions.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,58 +5,58 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_FUNC_TRAITS_EXCEPTIONS_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_EXCEPTIONS_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXCEPTIONS_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXCEPTIONS_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/list.hpp>
-#include <contract/detail/preprocessor/keyword/throw.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/list.hpp>
+#include <boost/contract/detail/preprocessor/keyword/throw.hpp>
#include <boost/preprocessor/tuple/rem.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_EXCEPTIONS_TRAIT_COMMA_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA(BOOST_PP_TUPLE_REM(1), sign)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXCEPTIONS_TRAIT_COMMA_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA(BOOST_PP_TUPLE_REM(1), sign)

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_EXCEPTIONS_TRAIT_(sign) \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXCEPTIONS_TRAIT_(sign) \
     ( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_THROW_FRONT(sign) \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_THROW_FRONT(sign) \
     , \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST(sign, \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST(sign, \
                 /* empty list from both `throw( )` and `throw( void )` */ \
                 1, /* might be empty (for non-throw specification) */ \
                 0, /* might not have defaults */ \
- CONTRACT_DETAIL_PP_KEYWORD_IS_THROW_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_THROW_REMOVE_FRONT, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_EXCEPTIONS_TRAIT_COMMA_) \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_THROW_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_THROW_REMOVE_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXCEPTIONS_TRAIT_COMMA_) \
     )

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_EXCEPTIONS_REMOVE_throw \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST_REMOVE
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXCEPTIONS_REMOVE_throw \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST_REMOVE

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_EXCEPTIONS_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TAGGED_LIST(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_THROW_FRONT, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_EXCEPTIONS_REMOVE_)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXCEPTIONS_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TAGGED_LIST(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_THROW_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXCEPTIONS_REMOVE_)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_EXCEPTIONS(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_EXCEPTIONS_TRAIT_, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_EXCEPTIONS_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_EXCEPTIONS(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXCEPTIONS_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXCEPTIONS_SIGN_)

// PUBLIC //

// Expand to 1 iff it has exception specifications (even if no exceptions
// `throw()` for no-throw)
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_HAS_EXCEPTION_SPEC(func_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_HAS_EXCEPTION_SPEC(func_traits) \
     BOOST_PP_TUPLE_ELEM(2, 0, BOOST_PP_ARRAY_ELEM(19, func_traits))

// Expand to pp-list of exception specification types
// `(n, (exception_token0, ...))` (array to handle unwrapped commas).
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_EXCEPTIONS(func_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXCEPTIONS(func_traits) \
     BOOST_PP_TUPLE_ELEM(2, 1, BOOST_PP_ARRAY_ELEM(19, func_traits))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func/explicit.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func/explicit.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func/explicit.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,38 +5,38 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPLICIT_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPLICIT_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPLICIT_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPLICIT_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/keyword.hpp>
-#include <contract/detail/preprocessor/keyword/explicit.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/keyword.hpp>
+#include <boost/contract/detail/preprocessor/keyword/explicit.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPLICIT_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_EXPLICIT_FRONT, explicit)
-
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPLICIT_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_EXPLICIT_REMOVE_FRONT)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPLICIT_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_EXPLICIT_FRONT, explicit)
+
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPLICIT_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_EXPLICIT_REMOVE_FRONT)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_EXPLICIT(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPLICIT_TRAIT_, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPLICIT_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_EXPLICIT(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPLICIT_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPLICIT_SIGN_)

// PUBLIC //

// Expand to `[explicit]`.
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPLICIT(func_traits) \
- BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPLICIT(func_traits) \
+ BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
BOOST_PP_ARRAY_ELEM(4, func_traits))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func/export.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func/export.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func/export.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,39 +5,39 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPORT_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPORT_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPORT_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPORT_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/keyword.hpp>
-#include <contract/detail/preprocessor/traits/aux_/nil.hpp>
-#include <contract/detail/preprocessor/keyword/export.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/keyword.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/nil.hpp>
+#include <boost/contract/detail/preprocessor/keyword/export.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPORT_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_EXPORT_FRONT, export)
-
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPORT_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_EXPORT_REMOVE_FRONT)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPORT_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_EXPORT_FRONT, export)
+
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPORT_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_EXPORT_REMOVE_FRONT)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_EXPORT(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPORT_TRAIT_, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPORT_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_EXPORT(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPORT_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPORT_SIGN_)

// PUBLIC //

// Expand to `[export]`.
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPORT(func_traits) \
- BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXPORT(func_traits) \
+ BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
BOOST_PP_ARRAY_ELEM(1, func_traits))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func/extern.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func/extern.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func/extern.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,38 +5,38 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_FUNC_TRAITS_EXTERN_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_EXTERN_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXTERN_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXTERN_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/keyword.hpp>
-#include <contract/detail/preprocessor/keyword/extern.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/keyword.hpp>
+#include <boost/contract/detail/preprocessor/keyword/extern.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_EXTERN_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_EXTERN_FRONT, extern)
-
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_EXTERN_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_EXTERN_REMOVE_FRONT)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXTERN_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_EXTERN_FRONT, extern)
+
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXTERN_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_EXTERN_REMOVE_FRONT)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_EXTERN(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_EXTERN_TRAIT_, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_EXTERN_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_EXTERN(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXTERN_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXTERN_SIGN_)

// PUBLIC //

// Expand to `[extern]`.
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_EXTERN(func_traits) \
- BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_EXTERN(func_traits) \
+ BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
BOOST_PP_ARRAY_ELEM(6, func_traits))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func/final.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func/final.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func/final.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,39 +5,39 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_FUNC_TRAITS_FINAL_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_FINAL_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_FINAL_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_FINAL_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/keyword.hpp>
-#include <contract/detail/preprocessor/traits/aux_/nil.hpp>
-#include <contract/detail/preprocessor/keyword/cxx11/override.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/keyword.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/nil.hpp>
+#include <boost/contract/detail/preprocessor/keyword/cxx11/override.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_FINAL_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_FINAL_FRONT, override)
-
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_FINAL_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_FINAL_REMOVE_FRONT)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_FINAL_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_FINAL_FRONT, override)
+
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_FINAL_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_FINAL_REMOVE_FRONT)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_FINAL(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_FINAL_TRAIT_, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_FINAL_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_FINAL(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_FINAL_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_FINAL_SIGN_)

// PUBLIC //

// Expand to `[override]`.
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_FINAL(func_traits) \
- BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_FINAL(func_traits) \
+ BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
BOOST_PP_ARRAY_ELEM(18, func_traits))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func/friend.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func/friend.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func/friend.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,38 +5,38 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_FUNC_TRAITS_FRIEND_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_FRIEND_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_FRIEND_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_FRIEND_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/keyword.hpp>
-#include <contract/detail/preprocessor/keyword/friend.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/keyword.hpp>
+#include <boost/contract/detail/preprocessor/keyword/friend.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_FRIEND_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_FRIEND_FRONT, friend)
-
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_FRIEND_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_FRIEND_REMOVE_FRONT)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_FRIEND_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_FRIEND_FRONT, friend)
+
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_FRIEND_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_FRIEND_REMOVE_FRONT)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_FRIEND(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_FRIEND_TRAIT_, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_FRIEND_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_FRIEND(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_FRIEND_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_FRIEND_SIGN_)

// PUBLIC //

// Expand to `[friend]`.
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_FRIEND(func_traits) \
- BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_FRIEND(func_traits) \
+ BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
BOOST_PP_ARRAY_ELEM(9, func_traits))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func/initializers.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func/initializers.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func/initializers.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,62 +5,62 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_FUNC_TRAITS_INITIALIZERS_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_INITIALIZERS_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_INITIALIZERS_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_INITIALIZERS_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/list.hpp>
-#include <contract/detail/preprocessor/keyword/contract/initialize.hpp>
-#include <contract/detail/preprocessor/keyword/try.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/list.hpp>
+#include <boost/contract/detail/preprocessor/keyword/boost/contract/initialize.hpp>
+#include <boost/contract/detail/preprocessor/keyword/try.hpp>
#include <boost/preprocessor/tuple/rem.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_INITIALIZERS_TRAIT_COMMA_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA(BOOST_PP_TUPLE_REM(1), sign)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_INITIALIZERS_TRAIT_COMMA_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_COMMA(BOOST_PP_TUPLE_REM(1), sign)

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_INITIALIZERS_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST(sign, \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_INITIALIZERS_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST(sign, \
             0, /* might not be empty */ \
             0, /* might not have defaults */ \
- CONTRACT_DETAIL_PP_KEYWORD_IS_INITIALIZE_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_INITIALIZE_REMOVE_FRONT, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_INITIALIZERS_TRAIT_COMMA_)\
-
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_INITIALIZERS_REMOVE_initialize \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST_REMOVE
-
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_INITIALIZERS_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TAGGED_LIST(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_INITIALIZE_FRONT, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_INITIALIZERS_REMOVE_)
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_INITIALIZE_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_INITIALIZE_REMOVE_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_INITIALIZERS_TRAIT_COMMA_)\
+
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_INITIALIZERS_REMOVE_initialize \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST_REMOVE
+
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_INITIALIZERS_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TAGGED_LIST(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_INITIALIZE_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_INITIALIZERS_REMOVE_)

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_INITIALIZERS_REMOVE_TRY_( \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_INITIALIZERS_REMOVE_TRY_( \
         traits_sign) \
     ( \
         BOOST_PP_TUPLE_ELEM(2, 0, traits_sign) \
     , \
- CONTRACT_DETAIL_PP_KEYWORD_TRY_REMOVE_FRONT(BOOST_PP_TUPLE_ELEM(2, 1, \
- traits_sign)) \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_TRY_REMOVE_FRONT( \
+ BOOST_PP_TUPLE_ELEM(2, 1, traits_sign)) \
     )

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_INITIALIZERS(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY( \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_INITIALIZERS(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY( \
             /* always remove eventual leading `try` to handle */ \
             /* function-try-blocks around initializers */ \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_INITIALIZERS_REMOVE_TRY_( \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_INITIALIZERS_REMOVE_TRY_( \
                     traits_sign), \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_INITIALIZERS_TRAIT_, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_INITIALIZERS_SIGN_)
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_INITIALIZERS_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_INITIALIZERS_SIGN_)

// PUBLIC //

// Expand to pp-list of member initializers `(n, (init_token0, ...))` (array
// for possible unwrapped commas).
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_INITIALIZERS(func_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_INITIALIZERS(func_traits) \
     BOOST_PP_ARRAY_ELEM(22, func_traits)

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func/inline.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func/inline.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func/inline.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,38 +5,38 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_FUNC_TRAITS_INLINE_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_INLINE_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_INLINE_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_INLINE_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/keyword.hpp>
-#include <contract/detail/preprocessor/keyword/inline.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/keyword.hpp>
+#include <boost/contract/detail/preprocessor/keyword/inline.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_INLINE_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_INLINE_FRONT, inline)
-
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_INLINE_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_INLINE_REMOVE_FRONT)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_INLINE_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_INLINE_FRONT, inline)
+
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_INLINE_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_INLINE_REMOVE_FRONT)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_INLINE(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_INLINE_TRAIT_, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_INLINE_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_INLINE(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_INLINE_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_INLINE_SIGN_)

// PUBLIC //

// Expand to `[inline]`.
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_INLINE(func_traits) \
- BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_INLINE(func_traits) \
+ BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
BOOST_PP_ARRAY_ELEM(5, func_traits))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func/name.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func/name.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func/name.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,51 +5,54 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_FUNC_TRAITS_NAME_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_NAME_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_NAME_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_NAME_HPP_

-#include <contract/detail/preprocessor/traits/aux_/name.hpp>
-#include <contract/detail/preprocessor/array/first_n.hpp>
-#include <contract/detail/preprocessor/array/rest_n.hpp>
-#include <contract/detail/preprocessor/array/rem.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/name.hpp>
+#include <boost/contract/detail/preprocessor/array/first_n.hpp>
+#include <boost/contract/detail/preprocessor/array/rest_n.hpp>
+#include <boost/contract/detail/preprocessor/array/rem.hpp>
#include <boost/preprocessor/tuple/elem.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_NAME_INDEX_ 11
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_NAME_INDEX_ 11

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_NAME(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_WITH_OPERATOR, \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME_WITH_OPERATOR)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_NAME(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_WITH_OPERATOR, \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME_WITH_OPERATOR)

// PUBLIC //

// Expand to `name` (this is always alphanumeric even for operators).
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_NAME(func_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_NAME(func_traits) \
     BOOST_PP_TUPLE_ELEM(2, 1, BOOST_PP_ARRAY_ELEM( \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_NAME_INDEX_, func_traits))
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_NAME_INDEX_, func_traits))

// Expand to `(n, (token1, ...))` (array to handle commas in operator tokens,
// 0-size if not an operator, tokens do not include the `operator` keyword).
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_OPERATOR(func_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_OPERATOR(func_traits) \
     BOOST_PP_TUPLE_ELEM(2, 0, BOOST_PP_ARRAY_ELEM( \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_NAME_INDEX_, func_traits))
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_NAME_INDEX_, func_traits))

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_NAME_REPLACE(func_traits, name_sign) \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_NAME_REPLACE( \
+ func_traits, name_sign) \
     /* cannot use ARRAY_REPLACE because it has reentrancy _D */ \
     ( BOOST_PP_ARRAY_SIZE(func_traits), \
     ( \
- CONTRACT_DETAIL_PP_ARRAY_REM(CONTRACT_DETAIL_PP_ARRAY_FIRST_N( \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_NAME_INDEX_, \
- func_traits)) \
- , CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_WITH_OPERATOR(name_sign) \
- , CONTRACT_DETAIL_PP_ARRAY_REM(CONTRACT_DETAIL_PP_ARRAY_REST_N( \
- BOOST_PP_INC(CONTRACT_DETAIL_PP_FUNC_TRAITS_NAME_INDEX_), \
+ BOOST_CONTRACT_DETAIL_PP_ARRAY_REM( \
+ BOOST_CONTRACT_DETAIL_PP_ARRAY_FIRST_N( \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_NAME_INDEX_, \
                 func_traits)) \
+ , BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NAME_WITH_OPERATOR(name_sign) \
+ , BOOST_CONTRACT_DETAIL_PP_ARRAY_REM( \
+ BOOST_CONTRACT_DETAIL_PP_ARRAY_REST_N(BOOST_PP_INC( \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_NAME_INDEX_), \
+ func_traits)) \
     ) )

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func/new.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func/new.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func/new.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,39 +5,39 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_FUNC_TRAITS_NEW_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_NEW_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_NEW_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_NEW_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/keyword.hpp>
-#include <contract/detail/preprocessor/traits/aux_/nil.hpp>
-#include <contract/detail/preprocessor/keyword/new.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/keyword.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/nil.hpp>
+#include <boost/contract/detail/preprocessor/keyword/new.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_NEW_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_NEW_FRONT, new)
-
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_NEW_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_NEW_REMOVE_FRONT)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_NEW_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_NEW_FRONT, new)
+
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_NEW_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_NEW_REMOVE_FRONT)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_NEW(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_NEW_TRAIT_, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_NEW_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_NEW(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_NEW_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_NEW_SIGN_)

// PUBLIC //

// Expand to `[new]`.
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_NEW(func_traits) \
- BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_NEW(func_traits) \
+ BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
BOOST_PP_ARRAY_ELEM(17, func_traits))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func/override.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func/override.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func/override.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,39 +5,39 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_FUNC_TRAITS_OVERRIDE_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_OVERRIDE_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_OVERRIDE_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_OVERRIDE_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/keyword.hpp>
-#include <contract/detail/preprocessor/traits/aux_/nil.hpp>
-#include <contract/detail/preprocessor/keyword/cxx11/override.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/keyword.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/nil.hpp>
+#include <boost/contract/detail/preprocessor/keyword/cxx11/override.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_OVERRIDE_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_OVERRIDE_FRONT, override)
-
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_OVERRIDE_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_OVERRIDE_REMOVE_FRONT)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_OVERRIDE_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_OVERRIDE_FRONT, override)
+
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_OVERRIDE_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_OVERRIDE_REMOVE_FRONT)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_OVERRIDE(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_OVERRIDE_TRAIT_, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_OVERRIDE_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_OVERRIDE(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_OVERRIDE_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_OVERRIDE_SIGN_)

// PUBLIC //

// Expand to `[override]`.
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_OVERRIDE(func_traits) \
- BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_OVERRIDE(func_traits) \
+ BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
BOOST_PP_ARRAY_ELEM(16, func_traits))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func/param_concepts.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func/param_concepts.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func/param_concepts.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,47 +5,47 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAM_CONCEPTS_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAM_CONCEPTS_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAM_CONCEPTS_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAM_CONCEPTS_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/list.hpp>
-#include <contract/detail/preprocessor/keyword/contract/requires.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/list.hpp>
+#include <boost/contract/detail/preprocessor/keyword/boost/contract/requires.hpp>
#include <boost/preprocessor/tuple/rem.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

// For reentrancy on GCC++0x, PP_TUPLE_REM(1) doesn't work.
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAM_CONCEPTS_REM_(tokens) tokens
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAM_CONCEPTS_REM_(tokens) tokens

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAM_CONCEPTS_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST(sign, \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAM_CONCEPTS_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST(sign, \
             0, /* might not be empty */ \
             0, /* might not have defaults */ \
- CONTRACT_DETAIL_PP_KEYWORD_IS_REQUIRES_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_REQUIRES_REMOVE_FRONT, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAM_CONCEPTS_REM_)
-
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAM_CONCEPTS_REMOVE_requires \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST_REMOVE
-
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAM_CONCEPTS_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TAGGED_LIST(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_REQUIRES_FRONT, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_REMOVE_)
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_REQUIRES_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_REQUIRES_REMOVE_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAM_CONCEPTS_REM_)
+
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAM_CONCEPTS_REMOVE_requires \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST_REMOVE
+
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAM_CONCEPTS_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TAGGED_LIST(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_REQUIRES_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_CONCEPTS_REMOVE_)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_PARAM_CONCEPTS(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAM_CONCEPTS_TRAIT_, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAM_CONCEPTS_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_PARAM_CONCEPTS(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAM_CONCEPTS_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAM_CONCEPTS_SIGN_)

// PUBLIC //

// Expand to pp-list of function parameter (not template param) concept types.
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAM_CONCEPTS(func_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAM_CONCEPTS(func_traits) \
     BOOST_PP_ARRAY_ELEM(13, func_traits)

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func/params.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func/params.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func/params.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,45 +5,47 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAMS_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAMS_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAMS_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAMS_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/list.hpp>
-#include <contract/detail/preprocessor/traits/params.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/params.hpp>
#include <boost/preprocessor/arithmetic/inc.hpp>
#include <boost/preprocessor/array/size.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAMS_INDEX_ 12
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAMS_INDEX_ 12

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_PARAMS(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_FUNC_PARAMS_TRAITS, \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_LIST)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_PARAMS(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_PARAMS_TRAITS, \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_LIST)

// PUBLIC //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAMS(func_traits) \
- BOOST_PP_ARRAY_ELEM(CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAMS_INDEX_, \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAMS(func_traits) \
+ BOOST_PP_ARRAY_ELEM(BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAMS_INDEX_, \
             func_traits)

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAMS_REPLACE( \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAMS_REPLACE( \
         func_traits, fparams_sign) \
     /* can't use ARRAY_REPLACE because it has reentrancy _D */ \
     ( BOOST_PP_ARRAY_SIZE(func_traits), \
     ( \
- CONTRACT_DETAIL_PP_ARRAY_REM(CONTRACT_DETAIL_PP_ARRAY_FIRST_N( \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAMS_INDEX_, \
- func_traits)) \
- , CONTRACT_DETAIL_PP_FUNC_PARAMS_TRAITS(fparams_sign) \
- , CONTRACT_DETAIL_PP_ARRAY_REM(CONTRACT_DETAIL_PP_ARRAY_REST_N( \
- BOOST_PP_INC(CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAMS_INDEX_), \
- func_traits)) \
+ BOOST_CONTRACT_DETAIL_PP_ARRAY_REM( \
+ BOOST_CONTRACT_DETAIL_PP_ARRAY_FIRST_N( \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAMS_INDEX_, \
+ func_traits)) \
+ , BOOST_CONTRACT_DETAIL_PP_FUNC_PARAMS_TRAITS(fparams_sign) \
+ , BOOST_CONTRACT_DETAIL_PP_ARRAY_REM( \
+ BOOST_CONTRACT_DETAIL_PP_ARRAY_REST_N(BOOST_PP_INC( \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PARAMS_INDEX_), \
+ func_traits)) \
     ) )

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func/preconditions.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func/preconditions.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func/preconditions.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,49 +5,49 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_FUNC_TRAITS_PRECONDITIONS_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_PRECONDITIONS_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PRECONDITIONS_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PRECONDITIONS_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/list.hpp>
-#include <contract/detail/preprocessor/traits/assertion.hpp>
-#include <contract/detail/preprocessor/keyword/contract/precondition.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/assertion.hpp>
+#include <boost/contract/detail/preprocessor/keyword/boost/contract/precondition.hpp>
#include <boost/preprocessor/tuple/rem.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

// For reentrancy on GCC with C++0x.
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_PRECONDITIONS_REM_(tokens) tokens
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PRECONDITIONS_REM_(tokens) tokens

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_PRECONDITIONS_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_ASSERTION_TRAITS( \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST(sign, \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PRECONDITIONS_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_ASSERTION_TRAITS( \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST(sign, \
                     0, /* might not be empty */ \
                     0, /* might not have defaults */ \
- CONTRACT_DETAIL_PP_KEYWORD_IS_PRECONDITION_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_PRECONDITION_REMOVE_FRONT, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_PRECONDITIONS_REM_))
-
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_PRECONDITIONS_REMOVE_precondition \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST_REMOVE
-
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_PRECONDITIONS_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TAGGED_LIST(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_PRECONDITION_FRONT, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_PRECONDITIONS_REMOVE_)
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_PRECONDITION_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_PRECONDITION_REMOVE_FRONT,\
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PRECONDITIONS_REM_))
+
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PRECONDITIONS_REMOVE_precondition \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST_REMOVE
+
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PRECONDITIONS_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TAGGED_LIST(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_PRECONDITION_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PRECONDITIONS_REMOVE_)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_PRECONDITIONS(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_PRECONDITIONS_TRAIT_, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_PRECONDITIONS_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_PRECONDITIONS(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PRECONDITIONS_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PRECONDITIONS_SIGN_)

// PUBLIC //

// Expand to pp-list of precondition assertions.
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_PRECONDITIONS(func_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_PRECONDITIONS(func_traits) \
     BOOST_PP_ARRAY_ELEM(20, func_traits)

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func/result_type.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func/result_type.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func/result_type.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,19 +5,19 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/type.hpp>
-#include <contract/detail/preprocessor/traits/aux_/nil.hpp>
-#include <contract/detail/preprocessor/traits/aux_/list.hpp>
-#include <contract/detail/preprocessor/traits/aux_/name.hpp>
-#include <contract/detail/preprocessor/punctuation/has_paren.hpp>
-#include <contract/detail/preprocessor/keyword/contract/comma.hpp>
-#include <contract/detail/preprocessor/keyword/operator.hpp>
-#include <contract/detail/preprocessor/keyword/new.hpp>
-#include <contract/detail/preprocessor/keyword/delete.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/type.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/nil.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/list.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/name.hpp>
+#include <boost/contract/detail/preprocessor/punctuation/has_paren.hpp>
+#include <boost/contract/detail/preprocessor/keyword/boost/contract/comma.hpp>
+#include <boost/contract/detail/preprocessor/keyword/operator.hpp>
+#include <boost/contract/detail/preprocessor/keyword/new.hpp>
+#include <boost/contract/detail/preprocessor/keyword/delete.hpp>
#include <boost/preprocessor/tuple/eat.hpp>
#include <boost/preprocessor/logical/bitand.hpp>
#include <boost/preprocessor/logical/bitor.hpp>
@@ -28,142 +28,151 @@

// PRIVATE //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_NOT_PAREN_(tokens) \
- BOOST_PP_COMPL(CONTRACT_DETAIL_PP_HAS_PAREN(tokens))
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_NOT_PAREN_(tokens) \
+ BOOST_PP_COMPL(BOOST_CONTRACT_DETAIL_PP_HAS_PAREN(tokens))

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_NOT_OPERATOR_PAREN_(tokens) \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_NOT_OPERATOR_PAREN_( \
+ tokens) \
     BOOST_PP_COMPL(BOOST_PP_BITAND( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_OPERATOR_FRONT(tokens) \
- , CONTRACT_DETAIL_PP_HAS_PAREN( \
- CONTRACT_DETAIL_PP_KEYWORD_OPERATOR_REMOVE_FRONT(tokens)) \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_OPERATOR_FRONT(tokens) \
+ , BOOST_CONTRACT_DETAIL_PP_HAS_PAREN( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_OPERATOR_REMOVE_FRONT(tokens))\
     ))

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_NOT_OPERATOR_NEW_(tokens) \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_NOT_OPERATOR_NEW_( \
+ tokens) \
     BOOST_PP_COMPL(BOOST_PP_BITAND( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_OPERATOR_FRONT(tokens) \
- , CONTRACT_DETAIL_PP_KEYWORD_IS_NEW_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_OPERATOR_REMOVE_FRONT(tokens)) \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_OPERATOR_FRONT(tokens) \
+ , BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_NEW_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_OPERATOR_REMOVE_FRONT(tokens))\
     ))

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_NOT_OPERATOR_DELETE_( \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_NOT_OPERATOR_DELETE_( \
         tokens) \
     BOOST_PP_COMPL(BOOST_PP_BITAND( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_OPERATOR_FRONT(tokens) \
- , CONTRACT_DETAIL_PP_KEYWORD_IS_DELETE_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_OPERATOR_REMOVE_FRONT(tokens)) \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_OPERATOR_FRONT(tokens) \
+ , BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_DELETE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_OPERATOR_REMOVE_FRONT(tokens))\
     ))

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_NOT_OPERATOR_COMMA_( \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_NOT_OPERATOR_COMMA_( \
         tokens) \
     BOOST_PP_COMPL(BOOST_PP_BITAND( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_OPERATOR_FRONT(tokens) \
- , CONTRACT_DETAIL_PP_KEYWORD_IS_COMMA_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_OPERATOR_REMOVE_FRONT(tokens)) \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_OPERATOR_FRONT(tokens) \
+ , BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_COMMA_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_OPERATOR_REMOVE_FRONT(tokens))\
     ))

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_IS_EMPTY_CHECK_OPERATOR_( \
+#define \
+BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_IS_EMPTY_CHECK_OPERATOR_( \
         next_next_sign) \
     BOOST_PP_BITAND( \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_NOT_OPERATOR_PAREN_( \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_NOT_OPERATOR_PAREN_( \
                 next_next_sign) \
     , BOOST_PP_BITAND( \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_NOT_OPERATOR_NEW_( \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_NOT_OPERATOR_NEW_( \
                 next_next_sign) \
     , BOOST_PP_BITAND( \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_NOT_OPERATOR_DELETE_( \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_NOT_OPERATOR_DELETE_( \
                 next_next_sign) \
- , CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_NOT_OPERATOR_COMMA_( \
+ , BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_NOT_OPERATOR_COMMA_( \
                 next_next_sign) \
     )))

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_IS_EMPTY_CHECK_NOT_NIL_( \
+#define \
+BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_IS_EMPTY_CHECK_NOT_NIL_( \
         next_next_sign) \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_NOT_PAREN_( \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_NOT_PAREN_( \
             next_next_sign), \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_IS_EMPTY_CHECK_OPERATOR_ \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_IS_EMPTY_CHECK_OPERATOR_ \
     , \
         0 BOOST_PP_TUPLE_EAT(1) \
     )(next_next_sign)

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_IS_EMPTY_CHECK_( \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_IS_EMPTY_CHECK_( \
         next_next_sign) \
     /* result is empty <=> next_next_sign == nil || (next_next_sign != ()... */\
     /* && != opeator(...)... && != operator new... && != operator delete...) */\
     /* (this supports type conversion `operator T()` which has no result) */ \
     BOOST_PP_EXPAND(BOOST_PP_IIF( \
- CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_PAREN(next_next_sign), \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_IS_NIL_PAREN(next_next_sign), \
         1 BOOST_PP_TUPLE_EAT(1) \
     , \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_IS_EMPTY_CHECK_NOT_NIL_ \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_IS_EMPTY_CHECK_NOT_NIL_ \
     )(next_next_sign))

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_IS_EMPTY_PAREN_(sign) \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_IS_EMPTY_CHECK_( \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_LIST( /* next */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME( /* next */ \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_IS_EMPTY_PAREN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_IS_EMPTY_CHECK_( \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_LIST( /* next */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_NAME( /* next */ \
             sign \
         )) \
     )

#ifndef BOOST_NO_VARIADIC_MACROS
-# define CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_MAYBE_NAME_1TOKEN_SIZE_( \
+# define \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_MAYBE_NAME_1TOKEN_SIZE_( \
             ...) \
- CONTRACT_DETAIL_PP_VARIADIC_SIZE(__VA_ARGS__),
+ BOOST_CONTRACT_DETAIL_PP_VARIADIC_SIZE(__VA_ARGS__),
#else
-# define CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_MAYBE_NAME_1TOKEN_SIZE_( \
+# define \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_MAYBE_NAME_1TOKEN_SIZE_( \
             token) \
         1, /* must always be 1 token `(token)` if no variadics */
#endif

#define CONRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_MAYBE_NAME_1TOKEN_(sign) \
     BOOST_PP_EQUAL(BOOST_PP_TUPLE_ELEM(2, 0, ( \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_MAYBE_NAME_1TOKEN_SIZE_ \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_MAYBE_NAME_1TOKEN_SIZE_ \
             sign)), 1)

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_MAYBE_NAME_(sign) \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_HAS_PAREN(sign), \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_MAYBE_NAME_(sign) \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_HAS_PAREN(sign), \
         CONRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_MAYBE_NAME_1TOKEN_ \
     , \
         0 BOOST_PP_TUPLE_EAT(1) \
     )(sign)

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_IS_EMPTY_(sign) \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_IS_EMPTY_(sign) \
     BOOST_PP_IIF(BOOST_PP_EXPAND( /* EXPAND for MSVC */ \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_MAYBE_NAME_(sign)), \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_IS_EMPTY_PAREN_ \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_COMMA_FRONT(sign), \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_MAYBE_NAME_( \
+ sign)), \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_IS_EMPTY_PAREN_ \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_COMMA_FRONT(sign), \
         0 BOOST_PP_TUPLE_EAT(1) \
     , \
         0 BOOST_PP_TUPLE_EAT(1) \
     ))(sign)

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_TRAIT_(sign) \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_IS_EMPTY_(sign), \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_TRAIT_(sign) \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_IS_EMPTY_( \
+ sign), \
         (0, ()) /* empty array for no result type */ \
         BOOST_PP_TUPLE_EAT(1) \
     , \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE \
     )(sign)

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_SIGN_(sign) \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_IS_EMPTY_(sign), \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_SIGN_(sign) \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_IS_EMPTY_( \
+ sign), \
         sign BOOST_PP_TUPLE_EAT(1) /* no result_type to skip */ \
     , \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TYPE /* skip result_type */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TYPE /* skip result_type */ \
     )(sign)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_RESULT_TYPE(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_TRAIT_, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_RESULT_TYPE(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE_SIGN_)

// PUBLIC //

// Expand to `(comma_n, (result_type_token1, ...))` (array for unwrapped
// commas, 0-size array if no result type for constructors and destructors).
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE(func_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_RESULT_TYPE(func_traits) \
     BOOST_PP_ARRAY_ELEM(10, func_traits)

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func/static.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func/static.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func/static.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,38 +5,38 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_FUNC_TRAITS_STATIC_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_STATIC_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_STATIC_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_STATIC_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/keyword.hpp>
-#include <contract/detail/preprocessor/keyword/static.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/keyword.hpp>
+#include <boost/contract/detail/preprocessor/keyword/static.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_STATIC_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_STATIC_FRONT, static)
-
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_STATIC_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_STATIC_REMOVE_FRONT)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_STATIC_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_STATIC_FRONT, static)
+
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_STATIC_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_STATIC_REMOVE_FRONT)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_STATIC(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_STATIC_TRAIT_, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_STATIC_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_STATIC(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_STATIC_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_STATIC_SIGN_)

// PUBLIC //

// Expand to `[static]`.
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_STATIC(func_traits) \
- BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_STATIC(func_traits) \
+ BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
BOOST_PP_ARRAY_ELEM(7, func_traits))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func/template.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func/template.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func/template.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,70 +5,72 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_HPP_

-#include <contract/detail/preprocessor/traits/template_param.hpp>
-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/list.hpp>
-#include <contract/detail/preprocessor/array/first_n.hpp>
-#include <contract/detail/preprocessor/array/rest_n.hpp>
-#include <contract/detail/preprocessor/array/rem.hpp>
-#include <contract/detail/preprocessor/keyword/template.hpp>
+#include <boost/contract/detail/preprocessor/traits/template_param.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/list.hpp>
+#include <boost/contract/detail/preprocessor/array/first_n.hpp>
+#include <boost/contract/detail/preprocessor/array/rest_n.hpp>
+#include <boost/contract/detail/preprocessor/array/rem.hpp>
+#include <boost/contract/detail/preprocessor/keyword/template.hpp>
#include <boost/preprocessor/tuple/rem.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_TRAIT_(sign) \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_TRAIT_(sign) \
     ( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_TEMPLATE_FRONT(sign) \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_TEMPLATE_FRONT(sign) \
     , \
- CONTRACT_DETAIL_PP_TEMPLATE_PARAMS_TRAITS(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAMS_TRAITS(sign) \
     )

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_REMOVE_template \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST_REMOVE
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_REMOVE_template \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST_REMOVE

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TAGGED_LIST(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_TEMPLATE_FRONT, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_REMOVE_)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TAGGED_LIST(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_TEMPLATE_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_REMOVE_)

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_INDEX_ 2
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_INDEX_ 2

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_TEMPLATE(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_TRAIT_, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_TEMPLATE(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_SIGN_)

// PUBLIC //

// Expand to 1 iff it is a template (even if no params `template<>`).
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_IS_TEMPLATE(func_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_IS_TEMPLATE(func_traits) \
     BOOST_PP_TUPLE_ELEM(2, 0, BOOST_PP_ARRAY_ELEM( \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_INDEX_, func_traits))
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_INDEX_, func_traits))

// Expand to pp-list of template params (see `TEMPLATE_PARAM_TRAITS` macros).
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_PARAMS(func_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_PARAMS(func_traits) \
     BOOST_PP_TUPLE_ELEM(2, 1, BOOST_PP_ARRAY_ELEM( \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_INDEX_, func_traits))
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_INDEX_, func_traits))

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_REPLACE( \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_REPLACE( \
         func_traits, template_sign) \
     /* can't use ARRAY_REPLACE here because it has reentrancy _D */ \
     ( BOOST_PP_ARRAY_SIZE(func_traits), \
     ( \
- CONTRACT_DETAIL_PP_ARRAY_REM(CONTRACT_DETAIL_PP_ARRAY_FIRST_N( \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_INDEX_, \
- func_traits)) \
- , CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_TRAIT_(template_sign) \
- , CONTRACT_DETAIL_PP_ARRAY_REM(CONTRACT_DETAIL_PP_ARRAY_REST_N( \
- BOOST_PP_INC( \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_INDEX_),\
- func_traits)) \
+ BOOST_CONTRACT_DETAIL_PP_ARRAY_REM( \
+ BOOST_CONTRACT_DETAIL_PP_ARRAY_FIRST_N( \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_INDEX_, \
+ func_traits)) \
+ , BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_TRAIT_(template_sign) \
+ , BOOST_CONTRACT_DETAIL_PP_ARRAY_REM( \
+ BOOST_CONTRACT_DETAIL_PP_ARRAY_REST_N( \
+ BOOST_PP_INC( \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_TEMPLATE_INDEX_),\
+ func_traits)) \
     ) )

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func/virtual.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func/virtual.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func/virtual.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,38 +5,38 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_FUNC_TRAITS_VIRTUAL_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_VIRTUAL_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_VIRTUAL_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_VIRTUAL_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/keyword.hpp>
-#include <contract/detail/preprocessor/keyword/virtual.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/keyword.hpp>
+#include <boost/contract/detail/preprocessor/keyword/virtual.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_VIRTUAL_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_VIRTUAL_FRONT, virtual)
-
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_VIRTUAL_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_VIRTUAL_REMOVE_FRONT)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_VIRTUAL_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_VIRTUAL_FRONT, virtual)
+
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_VIRTUAL_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_VIRTUAL_REMOVE_FRONT)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_VIRTUAL(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_VIRTUAL_TRAIT_, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_VIRTUAL_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_VIRTUAL(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_VIRTUAL_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_VIRTUAL_SIGN_)

// PUBLIC //

// Expand to `[virtual]`.
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_VIRTUAL(func_traits) \
- BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_VIRTUAL(func_traits) \
+ BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
BOOST_PP_ARRAY_ELEM(8, func_traits))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func/volatile.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func/volatile.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func/volatile.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,39 +5,39 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_FUNC_TRAITS_VOLATILE_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_VOLATILE_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_VOLATILE_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_VOLATILE_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply.hpp>
-#include <contract/detail/preprocessor/traits/aux_/keyword.hpp>
-#include <contract/detail/preprocessor/traits/aux_/nil.hpp>
-#include <contract/detail/preprocessor/keyword/volatile.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/keyword.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/nil.hpp>
+#include <boost/contract/detail/preprocessor/keyword/volatile.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PRIVATE //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_VOLATILE_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
- CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_VOLATILE_FRONT, volatile)
-
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_VOLATILE_SIGN_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_VOLATILE_REMOVE_FRONT)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_VOLATILE_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_VOLATILE_FRONT, volatile)
+
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_VOLATILE_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_KEYWORD(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_VOLATILE_REMOVE_FRONT)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_VOLATILE(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_VOLATILE_TRAIT_, \
- CONTRACT_DETAIL_PP_FUNC_TRAITS_VOLATILE_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_AUX_VOLATILE(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_VOLATILE_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_VOLATILE_SIGN_)

// PUBLIC //

// Expand to `[volatile]`.
-#define CONTRACT_DETAIL_PP_FUNC_TRAITS_VOLATILE(func_traits) \
- BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_TRAITS_VOLATILE(func_traits) \
+ BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
BOOST_PP_ARRAY_ELEM(15, func_traits))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func_param/classifier.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func_param/classifier.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func_param/classifier.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,16 +5,16 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply_1.hpp>
-#include <contract/detail/preprocessor/traits/aux_/nil.hpp>
-#include <contract/detail/preprocessor/keyword/contract/deduce.hpp>
-#include <contract/detail/preprocessor/keyword/contract/in.hpp>
-#include <contract/detail/preprocessor/keyword/contract/out.hpp>
-#include <contract/detail/preprocessor/keyword/register.hpp>
-#include <contract/detail/preprocessor/keyword/auto.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply_1.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/nil.hpp>
+#include <boost/contract/detail/preprocessor/keyword/boost/contract/deduce.hpp>
+#include <boost/contract/detail/preprocessor/keyword/boost/contract/in.hpp>
+#include <boost/contract/detail/preprocessor/keyword/boost/contract/out.hpp>
+#include <boost/contract/detail/preprocessor/keyword/register.hpp>
+#include <boost/contract/detail/preprocessor/keyword/auto.hpp>
#include <boost/preprocessor/control/iif.hpp>
#include <boost/preprocessor/tuple/elem.hpp>
#include <boost/preprocessor/array/elem.hpp>
@@ -22,107 +22,109 @@
// PRIVATE //

// Second `auto` is for named parameter any type.
-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_AUTO_2ND_(sign) \
- BOOST_PP_EXPR_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_AUTO_FRONT(sign), \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_AUTO_2ND_(sign) \
+ BOOST_PP_EXPR_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_AUTO_FRONT(sign), \
         auto \
     )

-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_REQUIRES_(sign) \
- BOOST_PP_EXPR_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_REQUIRES_FRONT(sign), \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_REQUIRES_(sign) \
+ BOOST_PP_EXPR_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_REQUIRES_FRONT(sign),\
         requires \
     ) \
- CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_AUTO_2ND_( \
- CONTRACT_DETAIL_PP_KEYWORD_REQUIRES_REMOVE_FRONT(sign))
+ BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_AUTO_2ND_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_REQUIRES_REMOVE_FRONT(sign))

-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_OUT_(sign) \
- BOOST_PP_EXPR_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_OUT_FRONT(sign), \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_OUT_(sign) \
+ BOOST_PP_EXPR_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_OUT_FRONT(sign), \
         out \
     ) \
- CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_REQUIRES_( \
- CONTRACT_DETAIL_PP_KEYWORD_OUT_REMOVE_FRONT(sign))
+ BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_REQUIRES_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_OUT_REMOVE_FRONT(sign))

-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_IN_(sign) \
- BOOST_PP_EXPR_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_IN_FRONT(sign), \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_IN_(sign) \
+ BOOST_PP_EXPR_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_IN_FRONT(sign), \
         in \
     ) \
- CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_OUT_( \
- CONTRACT_DETAIL_PP_KEYWORD_IN_REMOVE_FRONT(sign))
+ BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_OUT_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IN_REMOVE_FRONT(sign))

-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_DEDUCE_(sign) \
- BOOST_PP_EXPR_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_DEDUCE_FRONT(sign), \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_DEDUCE_(sign) \
+ BOOST_PP_EXPR_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_DEDUCE_FRONT(sign), \
         deduce \
     ) \
- CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_IN_( \
- CONTRACT_DETAIL_PP_KEYWORD_DEDUCE_REMOVE_FRONT(sign))
+ BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_IN_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_DEDUCE_REMOVE_FRONT(sign))

-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_REGISTER_(sign) \
- BOOST_PP_EXPR_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_REGISTER_FRONT(sign), \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_REGISTER_(sign) \
+ BOOST_PP_EXPR_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_REGISTER_FRONT(sign),\
         register \
     ) \
- CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_DEDUCE_( \
- CONTRACT_DETAIL_PP_KEYWORD_REGISTER_REMOVE_FRONT(sign))
+ BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_DEDUCE_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_REGISTER_REMOVE_FRONT(sign))

// First `auto` is for storage classifiers.
-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_AUTO_1ST_(sign) \
- BOOST_PP_EXPR_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_AUTO_FRONT(sign), \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_AUTO_1ST_(sign) \
+ BOOST_PP_EXPR_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_AUTO_FRONT(sign), \
         auto \
     ) \
- CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_REGISTER_( \
- CONTRACT_DETAIL_PP_KEYWORD_AUTO_REMOVE_FRONT(sign))
+ BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_REGISTER_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_AUTO_REMOVE_FRONT(sign))

-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
- CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_AUTO_1ST_(sign)
-
-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_TRAIT_xx(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_AUTO_FRONT(sign), \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_AUTO_1ST_(sign)
+
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_TRAIT_xx(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_AUTO_FRONT(sign), \
         auto BOOST_PP_TUPLE_EAT(1) /* auto for storage classifier */ \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_REGISTER_FRONT(sign), \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_REGISTER_FRONT(sign), \
         register BOOST_PP_TUPLE_EAT(1) \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_DEDUCE_FRONT(sign), \
- deduce CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_IN_xx \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_IN_FRONT(sign), \
- in CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_OUT_ \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_OUT_FRONT(sign), \
- out CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_REQUIRES_ \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_DEDUCE_FRONT(sign), \
+ deduce BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_IN_xx \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_IN_FRONT(sign), \
+ in BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_OUT_ \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_OUT_FRONT(sign), \
+ out BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_REQUIRES_ \
     , \
         BOOST_PP_TUPLE_EAT(1) /* empty (for not classified pos param) */ \
     )))))( /* the following removal order is important */ \
- CONTRACT_DETAIL_PP_KEYWORD_OUT_REMOVE_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_IN_REMOVE_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_DEDUCE_REMOVE_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_REGISTER_REMOVE_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_AUTO_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_OUT_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IN_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_DEDUCE_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_REGISTER_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_AUTO_REMOVE_FRONT( \
             sign \
         ))))) \
     )

-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_SIGN_(sign) \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_SIGN_(sign) \
     /* the following removal order is important */ \
- CONTRACT_DETAIL_PP_KEYWORD_REQUIRES_REMOVE_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_AUTO_REMOVE_FRONT( /* named param any type */ \
- CONTRACT_DETAIL_PP_KEYWORD_OUT_REMOVE_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_IN_REMOVE_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_DEDUCE_REMOVE_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_REGISTER_REMOVE_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_AUTO_REMOVE_FRONT( /* storage classifier */ \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_REQUIRES_REMOVE_FRONT( \
+ /* auto for named param of any type */ \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_AUTO_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_OUT_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IN_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_DEDUCE_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_REGISTER_REMOVE_FRONT( \
+ /* auto as storage classifier */ \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_AUTO_REMOVE_FRONT( \
         sign \
     )))))))

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_AUX_CLASSIFIER(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY_INIT_1(traits_sign, \
- CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_TRAIT_, \
- CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_AUX_CLASSIFIER(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY_INIT_1(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER_SIGN_)

// PUBLIC //

// Expand to `[deduce] in | out | in out [auto | requires]` for named params,
// or `[auto | register]` for positional param.
-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER(fparam_traits) \
- BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_CLASSIFIER(fparam_traits) \
+ BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
             BOOST_PP_ARRAY_ELEM(0, BOOST_PP_TUPLE_ELEM(2, 0, fparam_traits)))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func_param/default.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func_param/default.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func_param/default.hpp 2013-03-04 18:42:59 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_FUNC_PARAM_TRAITS_DEFAULT_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_DEFAULT_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_DEFAULT_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_DEFAULT_HPP_

#include <boost/preprocessor/tuple/elem.hpp>

@@ -14,7 +14,7 @@

// Expand to `(comma_n, (default_value_token1, ...))` (array for unwrapped
// commas, 0-size array if no default value).
-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_DEFAULT(fparam) \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_DEFAULT(fparam) \
BOOST_PP_TUPLE_ELEM(2, 1, fparam)

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func_param/name.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func_param/name.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func_param/name.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,18 +5,18 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_NAME_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_NAME_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_NAME_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_NAME_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply_1.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply_1.hpp>
#include <boost/preprocessor/tuple/rem.hpp>
#include <boost/preprocessor/tuple/elem.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_AUX_NAME(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY_1(traits_sign, \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_AUX_NAME(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY_1(traits_sign, \
             /* there's nothing else left in sign (no trailing nil) */ \
             BOOST_PP_TUPLE_REM(1), \
             BOOST_PP_TUPLE_REM(1))
@@ -24,7 +24,7 @@
// PUBLIC //

// Expand to parameter name.
-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_NAME(fparam_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_NAME(fparam_traits) \
     BOOST_PP_ARRAY_ELEM(2, BOOST_PP_TUPLE_ELEM(2, 0, fparam_traits))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/func_param/type.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/func_param/type.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/func_param/type.hpp 2013-03-04 18:42:59 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_FUNC_PARAM_TRAITS_TYPE_HPP_
-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_TYPE_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_TYPE_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_TYPE_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply_1.hpp>
-#include <contract/detail/preprocessor/traits/aux_/type.hpp>
-#include <contract/detail/preprocessor/keyword/contract/requires.hpp>
-#include <contract/detail/preprocessor/keyword/contract/deduce.hpp>
-#include <contract/detail/preprocessor/keyword/auto.hpp>
-#include <contract/detail/preprocessor/keyword/void.hpp>
-#include <contract/detail/preprocessor/keyword/using.hpp>
-#include <contract/detail/preprocessor/keyword/namespace.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply_1.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/type.hpp>
+#include <boost/contract/detail/preprocessor/keyword/boost/contract/requires.hpp>
+#include <boost/contract/detail/preprocessor/keyword/boost/contract/deduce.hpp>
+#include <boost/contract/detail/preprocessor/keyword/auto.hpp>
+#include <boost/contract/detail/preprocessor/keyword/void.hpp>
+#include <boost/contract/detail/preprocessor/keyword/using.hpp>
+#include <boost/contract/detail/preprocessor/keyword/namespace.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/control/iif.hpp>
#include <boost/preprocessor/tuple/eat.hpp>
@@ -25,57 +25,58 @@

// PRIVATE //

-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_TYPE_NO_(sign, after01) \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_TYPE_NO_(sign, after01) \
     BOOST_PP_IIF(after01, \
         sign \
     , \
         (0, ()) /* no type */ \
     )

-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_TYPE_YES_(sign, after01) \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_TYPE_YES_(sign, after01) \
     BOOST_PP_IIF(after01, \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TYPE \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TYPE \
     , \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TYPE \
     )(sign)

-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_TYPE_(sign, after01) \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_VOID_FRONT(sign), \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_TYPE_(sign, after01) \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_VOID_FRONT(sign), \
         /* skip `void` for empty param list `(void)` */ \
- CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_TYPE_NO_ \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_TYPE_NO_ \
     , BOOST_PP_IIF(BOOST_PP_AND( /* BITAND doesn't expand properly on MSVC */ \
- CONTRACT_DETAIL_PP_KEYWORD_IS_USING_FRONT(sign), \
- CONTRACT_DETAIL_PP_KEYWORD_IS_NAMESPACE_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_USING_REMOVE_FRONT(sign))), \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_USING_FRONT(sign), \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_NAMESPACE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_USING_REMOVE_FRONT( \
+ sign))), \
         /* skip named params `using namespace tag` as it has no type */ \
- CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_TYPE_NO_ \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_DEDUCE_FRONT(sign), \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_TYPE_NO_ \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_DEDUCE_FRONT(sign), \
         /* skip deduced named params list `deduce( ... )` has no type */ \
- CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_TYPE_NO_ \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_TYPE_NO_ \
     , \
         /* actual type or requirement (for positional and named param) */ \
- CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_TYPE_YES_ \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_TYPE_YES_ \
     )))(sign, after01)

-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_AUX_TYPE_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_TYPE_(sign, 0 /* current */)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_AUX_TYPE_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_TYPE_(sign, 0 /* current */)

-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_AUX_TYPE_SIGN_(sign) \
- CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_TYPE_(sign, 1 /* after */)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_AUX_TYPE_SIGN_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_TYPE_(sign, 1 /* after */)

// PROTECTED //

-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_AUX_TYPE(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY_1(traits_sign, \
- CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_AUX_TYPE_TRAIT_, \
- CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_AUX_TYPE_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_AUX_TYPE(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY_1(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_AUX_TYPE_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_AUX_TYPE_SIGN_)

// PUBLIC //

// Expand to type or named param only requirement `(n, (type_token0, ...))`
// (0-sized array for no type (e.g., named param any type), array to handle
// unwrapped commas).
-#define CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_TYPE(fparam_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_TYPE(fparam_traits) \
     BOOST_PP_ARRAY_ELEM(1, BOOST_PP_TUPLE_ELEM(2, 0, fparam_traits))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/oldof/assignment.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/oldof/assignment.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/oldof/assignment.hpp 2013-03-04 18:42:59 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_OLDOF_TRAITS_ASSIGNMENT_HPP_
-#define CONTRACT_DETAIL_PP_OLDOF_TRAITS_ASSIGNMENT_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_OLDOF_TRAITS_ASSIGNMENT_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_OLDOF_TRAITS_ASSIGNMENT_HPP_

#include <boost/preprocessor/array/elem.hpp>

// PUBLIC //

// Expand to `variable =`.
-#define CONTRACT_DETAIL_PP_OLDOF_TRAITS_ASSIGNMENT(oldof_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_OLDOF_TRAITS_ASSIGNMENT(oldof_traits) \
BOOST_PP_ARRAY_ELEM(1, oldof_traits)

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/oldof/expr.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/oldof/expr.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/oldof/expr.hpp 2013-03-04 18:42:59 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_OLDOF_TRAITS_EXPR_HPP_
-#define CONTRACT_DETAIL_PP_OLDOF_TRAITS_EXPR_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_OLDOF_TRAITS_EXPR_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_OLDOF_TRAITS_EXPR_HPP_

#include <boost/preprocessor/array/elem.hpp>

// PUBLIC //

// Expand to `expression`.
-#define CONTRACT_DETAIL_PP_OLDOF_TRAITS_EXPR(oldof_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_OLDOF_TRAITS_EXPR(oldof_traits) \
BOOST_PP_ARRAY_ELEM(2, oldof_traits)

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/oldof/type.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/oldof/type.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/oldof/type.hpp 2013-03-04 18:42:59 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_OLDOF_TRAITS_TYPE_HPP_
-#define CONTRACT_DETAIL_PP_OLDOF_TRAITS_TYPE_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_OLDOF_TRAITS_TYPE_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_OLDOF_TRAITS_TYPE_HPP_

#include <boost/preprocessor/array/elem.hpp>

@@ -14,7 +14,7 @@

// Expand to `(n, (type_token0, ...))` (array for unwrapped commas, 0-size
// array for no old-of type specified).
-#define CONTRACT_DETAIL_PP_OLDOF_TRAITS_TYPE(oldof_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_OLDOF_TRAITS_TYPE(oldof_traits) \
BOOST_PP_ARRAY_ELEM(0, oldof_traits)

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/params/group.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/params/group.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/params/group.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,12 +5,12 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_HPP_
-#define CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_HPP_

// PRIVATE //

-#define CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_POSITIONAL_(d, p, \
+#define BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_POSITIONAL_(d, p, \
         tag_namespace, positional_params, named_params, deduced_params, \
         param_classifier_macro) \
     ( \
@@ -25,7 +25,7 @@
         param_classifier_macro \
     )

-#define CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_NAMED_(d, p, \
+#define BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_NAMED_(d, p, \
         tag_namespace, positional_params, named_params, deduced_params, \
         param_classifier_macro) \
     ( \
@@ -40,7 +40,7 @@
         param_classifier_macro \
     )

-#define CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_DEDUCED_(d, p, \
+#define BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_DEDUCED_(d, p, \
         tag_namespace, positional_params, named_params, deduced_params, \
         param_classifier_macro) \
     ( \
@@ -55,32 +55,32 @@
         param_classifier_macro \
     )

-#define CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_BY_CLASSIFIER_(d, p, \
+#define BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_BY_CLASSIFIER_(d, p, \
         tag_namespace, positional_params, named_params, deduced_params, \
         param_classifier_macro) \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_DEDUCE_FRONT( \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_DEDUCE_FRONT( \
             param_classifier_macro(p)), \
- CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_DEDUCED_ \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_IN_FRONT( /* also `in out` */ \
+ BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_DEDUCED_ \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_IN_FRONT( \
+ param_classifier_macro(p)), /* also `in out` */ \
+ BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_NAMED_ \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_OUT_FRONT( \
             param_classifier_macro(p)), \
- CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_NAMED_ \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_OUT_FRONT( \
- param_classifier_macro(p)), \
- CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_NAMED_ \
+ BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_NAMED_ \
     , \
- CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_POSITIONAL_ \
+ BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_POSITIONAL_ \
     )))(d, p, tag_namespace, positional_params, named_params, deduced_params, \
             param_classifier_macro)

-#define CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_TUPLE_( \
+#define BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_TUPLE_( \
         d, tag_positional_named_deduced_classifier, p) \
     BOOST_PP_IIF(BOOST_PP_IS_EMPTY( \
             /* only positional param can have EMPTY classifier */ \
             BOOST_PP_TUPLE_ELEM(5, 4, \
                     tag_positional_named_deduced_classifier)(p)), \
- CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_POSITIONAL_ \
+ BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_POSITIONAL_ \
     , \
- CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_BY_CLASSIFIER_ \
+ BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_BY_CLASSIFIER_ \
     )(d, p, \
         BOOST_PP_TUPLE_ELEM(5, 0, tag_positional_named_deduced_classifier), \
         BOOST_PP_TUPLE_ELEM(5, 1, tag_positional_named_deduced_classifier), \
@@ -89,7 +89,7 @@
         BOOST_PP_TUPLE_ELEM(5, 4, tag_positional_named_deduced_classifier) \
     )

-#define CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_TUPLE_5TO4_( \
+#define BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_TUPLE_5TO4_( \
         tag_positional_named_deduced_classifier) \
     ( \
         BOOST_PP_TUPLE_ELEM(5, 0, tag_positional_named_deduced_classifier) \
@@ -104,10 +104,11 @@
// PRIVATE //

// Group params pp-list into positional, named, and deduced.
-#define CONTRACT_DETAIL_PP_PARAMS_TRAITS_AUX_GROUP( \
+#define BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_AUX_GROUP( \
         namespace_params, param_classifier_macro) \
- CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_TUPLE_5TO4_( \
- BOOST_PP_LIST_FOLD_LEFT(CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_TUPLE_, \
+ BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_TUPLE_5TO4_( \
+ BOOST_PP_LIST_FOLD_LEFT( \
+ BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_GROUP_TUPLE_, \
         ( \
             BOOST_PP_TUPLE_ELEM(2, 0, namespace_params) \
         , \
@@ -125,15 +126,15 @@
// PUBLIC //

// Expand to pp-list of positional params (see PARAM_TRAITS).
-#define CONTRACT_DETAIL_PP_PARAMS_TRAITS_POSITIONAL(params_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_POSITIONAL(params_traits) \
     BOOST_PP_TUPLE_ELEM(4, 1, params_traits)

// Expand to pp-list of named (induced) params (see PARAM_TRAITS).
-#define CONTRACT_DETAIL_PP_PARAMS_TRAITS_NAMED(params_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_NAMED(params_traits) \
     BOOST_PP_TUPLE_ELEM(4, 2, params_traits)

// Expand to pp-list of (named) deduced params (see PARAM_TRAITS).
-#define CONTRACT_DETAIL_PP_PARAMS_TRAITS_DEDUCED(params_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_DEDUCED(params_traits) \
     BOOST_PP_TUPLE_ELEM(4, 3, params_traits)

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/params/namespace.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/params/namespace.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/params/namespace.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,35 +5,35 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_PARAMS_TRAITS_NAMESPACE_HPP_
-#define CONTRACT_DETAIL_PP_PARAMS_TRAITS_NAMESPACE_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_NAMESPACE_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_NAMESPACE_HPP_

// PRIVATE //

-#define CONTRACT_DETAIL_PP_PARAMS_TRAITS_NAMESPACE_GET_( \
+#define BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_NAMESPACE_GET_( \
         params, param_name_macro) \
     ( \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
- CONTRACT_DETAIL_PP_KEYWORD_NAMESPACE_REMOVE_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_USING_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_NAMESPACE_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_USING_REMOVE_FRONT( \
                 param_name_macro(BOOST_PP_LIST_FIRST(params)))) \
     , \
         BOOST_PP_LIST_REST(params) \
     )

// Precondition: size(params) >= 1 (i.e., is_cons(params)).
-#define CONTRACT_DETAIL_PP_PARAMS_TRAITS_NAMESPACE_CHECK_( \
+#define BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_NAMESPACE_CHECK_( \
         params, param_name_macro) \
     BOOST_PP_IIF(BOOST_PP_BITAND( \
- CONTRACT_DETAIL_PP_KEYWORD_IS_USING_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_USING_FRONT( \
                     param_name_macro(BOOST_PP_LIST_FIRST(params))), \
- CONTRACT_DETAIL_PP_KEYWORD_IS_NAMESPACE_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_USING_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_NAMESPACE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_USING_REMOVE_FRONT( \
                     param_name_macro(BOOST_PP_LIST_FIRST(params))))), \
- CONTRACT_DETAIL_PP_PARAMS_TRAITS_NAMESPACE_GET_ \
+ BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_NAMESPACE_GET_ \
     , \
         ( \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* no tag-namespace */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* no tag-namespace */ \
         , \
             params \
         ) \
@@ -43,13 +43,13 @@
// PROTECTED //

// Expand to 2-tuple `(tag_namespace, params)`.
-#define CONTRACT_DETAIL_PP_PARAMS_TRAITS_AUX_NAMESPACE( \
+#define BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_AUX_NAMESPACE( \
         params, param_name_macro) \
     BOOST_PP_IIF(BOOST_PP_LIST_IS_CONS(params), \
- CONTRACT_DETAIL_PP_PARAMS_TRAITS_NAMESPACE_CHECK_ \
+ BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_NAMESPACE_CHECK_ \
     , \
         ( \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* no tag-namespace */ \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* no tag-namespace */ \
         , \
             params \
         ) \
@@ -59,8 +59,8 @@
// PUBLIC //

// Expand to `[tag_namespace]` (empty is not specified).
-#define CONTRACT_DETAIL_PP_PARAMS_TRAITS_NAMESPACE(params_traits) \
- BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
+#define BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_NAMESPACE(params_traits) \
+ BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
             BOOST_PP_TUPLE_ELEM(4, 0, params_traits))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/params/void.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/params/void.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/params/void.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,14 +5,16 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_PARAMS_TRAITS_VOID_HPP_
-#define CONTRACT_DETAIL_PP_PARAMS_TRAITS_VOID_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_VOID_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_VOID_HPP_

// PRIVATE //

// Precondition: size(params) == 1.
-#define CONTRACT_DETAIL_PP_PARAMS_TRAITS_CHECK_VOID_(params, param_name_macro) \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_VOID_FRONT( /* false if unary */\
+#define BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_CHECK_VOID_( \
+ params, param_name_macro) \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_VOID_FRONT( \
+ /* false also if unary */\
             param_name_macro(BOOST_PP_LIST_FIRST(params))), \
         BOOST_PP_NIL /* `(func_name)( void )` returns empty param pp-list */ \
     , \
@@ -22,9 +24,10 @@
// PROTECTED //

// Expand to nil pp-list if params is `(void, NIL)`.
-#define CONTRACT_DETAIL_PP_PARAMS_TRAITS_AUX_VOID(params, param_name_macro) \
+#define BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_AUX_VOID( \
+ params, param_name_macro) \
     BOOST_PP_IIF(BOOST_PP_EQUAL(BOOST_PP_LIST_SIZE(params), 1), \
- CONTRACT_DETAIL_PP_PARAMS_TRAITS_CHECK_VOID_ \
+ BOOST_CONTRACT_DETAIL_PP_PARAMS_TRAITS_CHECK_VOID_ \
     , \
         params BOOST_PP_TUPLE_EAT(2) \
     )(params, param_name_macro)

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/template_param/default.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/template_param/default.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/template_param/default.hpp 2013-03-04 18:42:59 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_TEMPLATE_PARAM_TRAITS_DEFAULT_HPP_
-#define CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_DEFAULT_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_DEFAULT_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_DEFAULT_HPP_

#include <boost/preprocessor/tuple/elem.hpp>

@@ -14,7 +14,7 @@

// Expand to `(comma_n, (default_value_token1, ...))` (array for unwrapped
// commas, 0-size array if no default value).
-#define CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_DEFAULT(tparam) \
+#define BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_DEFAULT(tparam) \
BOOST_PP_TUPLE_ELEM(2, 1, tparam)

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/template_param/kind.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/template_param/kind.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/template_param/kind.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,18 +5,18 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_HPP_
-#define CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply_1.hpp>
-#include <contract/detail/preprocessor/traits/aux_/list_1.hpp>
-#include <contract/detail/preprocessor/traits/aux_/nil.hpp>
-#include <contract/detail/preprocessor/keyword/contract/deduce.hpp>
-#include <contract/detail/preprocessor/keyword/contract/in.hpp>
-#include <contract/detail/preprocessor/keyword/contract/out.hpp>
-#include <contract/detail/preprocessor/keyword/typename.hpp>
-#include <contract/detail/preprocessor/keyword/class.hpp>
-#include <contract/detail/preprocessor/keyword/template.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply_1.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/list_1.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/nil.hpp>
+#include <boost/contract/detail/preprocessor/keyword/boost/contract/deduce.hpp>
+#include <boost/contract/detail/preprocessor/keyword/boost/contract/in.hpp>
+#include <boost/contract/detail/preprocessor/keyword/boost/contract/out.hpp>
+#include <boost/contract/detail/preprocessor/keyword/typename.hpp>
+#include <boost/contract/detail/preprocessor/keyword/class.hpp>
+#include <boost/contract/detail/preprocessor/keyword/template.hpp>
#include <boost/preprocessor/control/iif.hpp>
#include <boost/preprocessor/tuple/rem.hpp>
#include <boost/preprocessor/tuple/elem.hpp>
@@ -25,113 +25,114 @@
// PRIVATE //

// Cannot use PP_TUPLE_REM for reentrancy on GCC with C++0x.
-#define CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_REM_(tokens) tokens
+#define BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_REM_(tokens) tokens

-#define CONTRACT_DETAIL_PP_TEMPLATE_PARAM_REQUIRES_AUTO_(sign) \
- BOOST_PP_EXPR_IF(CONTRACT_DETAIL_PP_KEYWORD_IS_REQUIRES_FRONT(sign), \
+#define BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_REQUIRES_AUTO_(sign) \
+ BOOST_PP_EXPR_IF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_REQUIRES_FRONT(sign), \
         requires \
     ) \
- BOOST_PP_EXPR_IF(CONTRACT_DETAIL_PP_KEYWORD_IS_AUTO_FRONT(sign), \
+ BOOST_PP_EXPR_IF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_AUTO_FRONT(sign), \
         auto /* named value template parameter any type */ \
     )

-#define CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_TPL_REMOVE_template\
- CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST_REMOVE
+#define BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_TPL_REMOVE_template\
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST_REMOVE

-#define CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_TPL_YES_( \
+#define BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_TPL_YES_( \
         sign) \
     template( \
- CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST_1(sign, \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_TAGGED_LIST_1(sign, \
                 1, /* might be empty */ \
                 0, /* no defaults (use usual `=` instead) */ \
- CONTRACT_DETAIL_PP_KEYWORD_IS_TEMPLATE_FRONT, \
- CONTRACT_DETAIL_PP_KEYWORD_TEMPLATE_REMOVE_FRONT, \
- CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_REM_) \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_TEMPLATE_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_TEMPLATE_REMOVE_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_REM_) \
     ) \
- BOOST_PP_EXPR_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_CLASS_FRONT( \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TAGGED_LIST(sign, \
- CONTRACT_DETAIL_PP_KEYWORD_IS_TEMPLATE_FRONT, \
- CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_TPL_REMOVE_)), \
+ BOOST_PP_EXPR_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_CLASS_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TAGGED_LIST(sign, \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_TEMPLATE_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_TPL_REMOVE_)), \
         class \
     )

-#define CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_TPL_(sign) \
+#define BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_TPL_(sign) \
     /* template tparam `template(tparam_list) class` */ \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_TEMPLATE_FRONT(sign), \
- CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_TPL_YES_ \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_TEMPLATE_FRONT(sign), \
+ BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_TPL_YES_ \
     , \
         BOOST_PP_TUPLE_EAT(1) \
     )(sign)

-#define CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_TPL_REQUIRES_AUTO_(sign) \
- CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_TPL_(sign) \
+#define BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_TPL_REQUIRES_AUTO_(\
+ sign) \
+ BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_TPL_(sign) \
     /* requires and auto (named params only ) */ \
- CONTRACT_DETAIL_PP_TEMPLATE_PARAM_REQUIRES_AUTO_( \
- CONTRACT_DETAIL_PP_KEYWORD_CLASS_REMOVE_FRONT( \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TAGGED_LIST( \
+ BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_REQUIRES_AUTO_( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_CLASS_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TAGGED_LIST( \
                   sign \
- , CONTRACT_DETAIL_PP_KEYWORD_IS_TEMPLATE_FRONT \
- , CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_TPL_REMOVE_ \
+ , BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_TEMPLATE_FRONT \
+ , BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_TPL_REMOVE_ \
             )))

-#define CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_TRAIT_(sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
- BOOST_PP_EXPR_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_DEDUCE_FRONT(sign), \
+#define BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_TRAIT_(sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL /* optional trait */ \
+ BOOST_PP_EXPR_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_DEDUCE_FRONT(sign), \
         deduce \
     ) \
- BOOST_PP_EXPR_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_IN_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_DEDUCE_REMOVE_FRONT(sign)), \
+ BOOST_PP_EXPR_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_IN_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_DEDUCE_REMOVE_FRONT(sign)), \
         in \
     ) \
- BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_TYPENAME_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_IN_REMOVE_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_DEDUCE_REMOVE_FRONT(sign))), \
+ BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_TYPENAME_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IN_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_DEDUCE_REMOVE_FRONT(sign))), \
         BOOST_PP_IDENTITY(typename) \
- , BOOST_PP_IIF(CONTRACT_DETAIL_PP_KEYWORD_IS_CLASS_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_IN_REMOVE_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_DEDUCE_REMOVE_FRONT(sign))), \
+ , BOOST_PP_IIF(BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_CLASS_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IN_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_DEDUCE_REMOVE_FRONT(sign))), \
         BOOST_PP_IDENTITY(class) \
     , BOOST_PP_EMPTY \
     ))() \
     /* template tparam `template(tparam_list) class` */ \
- CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_TPL_REQUIRES_AUTO_( \
+ BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_TPL_REQUIRES_AUTO_( \
             /* the following removal order matters */ \
- CONTRACT_DETAIL_PP_KEYWORD_CLASS_REMOVE_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_TYPENAME_REMOVE_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_IN_REMOVE_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_DEDUCE_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_CLASS_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_TYPENAME_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IN_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_DEDUCE_REMOVE_FRONT( \
                 sign \
             )))))

-#define CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_SIGN_(sign) \
+#define BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_SIGN_(sign) \
     /* the following removal order matters */ \
- CONTRACT_DETAIL_PP_KEYWORD_AUTO_REMOVE_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_REQUIRES_REMOVE_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_CLASS_REMOVE_FRONT( \
- CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TAGGED_LIST( \
- CONTRACT_DETAIL_PP_KEYWORD_TYPENAME_REMOVE_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_CLASS_REMOVE_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_IN_REMOVE_FRONT( \
- CONTRACT_DETAIL_PP_KEYWORD_DEDUCE_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_AUTO_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_REQUIRES_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_CLASS_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_AFTER_TAGGED_LIST( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_TYPENAME_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_CLASS_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IN_REMOVE_FRONT( \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_DEDUCE_REMOVE_FRONT( \
             sign \
         )))), \
- CONTRACT_DETAIL_PP_KEYWORD_IS_TEMPLATE_FRONT, \
- CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_TPL_REMOVE_ \
+ BOOST_CONTRACT_DETAIL_PP_KEYWORD_IS_TEMPLATE_FRONT, \
+ BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_TPL_REMOVE_ \
     ))))

// PROTECTED //

-#define CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_AUX_KIND(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY_INIT_1(traits_sign, \
- CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_TRAIT_, \
- CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_SIGN_)
+#define BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_AUX_KIND(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY_INIT_1(traits_sign, \
+ BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_TRAIT_, \
+ BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND_SIGN_)

// PUBLIC //

// Expand to `[deduce] [in] [typename | class | template(tparam_list) class]
// [auto | requires]` (empty for positional value tparam).
-#define CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND(tparam_traits) \
- BOOST_PP_CAT(CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
+#define BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_KIND(tparam_traits) \
+ BOOST_PP_CAT(BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_NIL_REMOVE_, \
             BOOST_PP_ARRAY_ELEM(0, BOOST_PP_TUPLE_ELEM(2, 0, tparam_traits)))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/template_param/name.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/template_param/name.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/template_param/name.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,18 +5,18 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_NAME_HPP_
-#define CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_NAME_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_NAME_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_NAME_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply_1.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply_1.hpp>
#include <boost/preprocessor/tuple/rem.hpp>
#include <boost/preprocessor/tuple/elem.hpp>
#include <boost/preprocessor/array/elem.hpp>

// PROTECTED //

-#define CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_AUX_NAME(traits_sign) \
- CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY_1(traits_sign, \
+#define BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_AUX_NAME(traits_sign) \
+ BOOST_CONTRACT_DETAIL_PP_TRAITS_AUX_APPLY_1(traits_sign, \
             /* there's nothing else left in sign (no trailing nil) */ \
             BOOST_PP_TUPLE_REM(1), \
             BOOST_PP_TUPLE_REM(1))
@@ -24,7 +24,7 @@
// PUBLIC //

// Expand to parameter name.
-#define CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_NAME(tparam_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_NAME(tparam_traits) \
     BOOST_PP_ARRAY_ELEM(2, BOOST_PP_TUPLE_ELEM(2, 0, tparam_traits))

#endif // #include guard

Modified: sandbox/contract/boost/contract/detail/preprocessor/traits/template_param/requirement.hpp
==============================================================================
--- sandbox/contract/boost/contract/detail/preprocessor/traits/template_param/requirement.hpp (original)
+++ sandbox/contract/boost/contract/detail/preprocessor/traits/template_param/requirement.hpp 2013-03-04 18:42:59 EST (Mon, 04 Mar 2013)
@@ -5,11 +5,11 @@
// http://www.boost.org/LICENSE_1_0.txt)
// Home at http://sourceforge.net/projects/contractpp

-#ifndef CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_REQUIREMENT_HPP_
-#define CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_REQUIREMENT_HPP_
+#ifndef BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_REQUIREMENT_HPP_
+#define BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_REQUIREMENT_HPP_

-#include <contract/detail/preprocessor/traits/aux_/apply_1.hpp>
-#include <contract/detail/preprocessor/traits/aux_/type.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/apply_1.hpp>
+#include <boost/contract/detail/preprocessor/traits/aux_/type.hpp>
#include <boost/preprocessor/control/iif.hpp>
#include <boost/preprocessor/tuple/eat.hpp>
#include <boost/preprocessor/tuple/elem.hpp>
@@ -17,16 +17,18 @@

// PROTECTED //

-#define CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_AUX_REQUIREMENT(traits_sign) \
+#define BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_AUX_REQUIREMENT( \
+ traits_sign) \
/* reuse func param parsing */ \
- CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_AUX_TYPE(traits_sign)
+ BOOST_CONTRACT_DETAIL_PP_FUNC_PARAM_TRAITS_AUX_TYPE(traits_sign)

// PUBLIC //

// Expand to type or named param only requirement `(n, (type_token0, ...))`
// (0-sized array for no type (e.g., named param any type), array to handle
// unwrapped commas).
-#define CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_REQUIREMENT(tparam_traits) \
+#define BOOST_CONTRACT_DETAIL_PP_TEMPLATE_PARAM_TRAITS_REQUIREMENT( \
+ tparam_traits) \
BOOST_PP_ARRAY_ELEM(1, BOOST_PP_TUPLE_ELEM(2, 0, tparam_traits))

#endif // #include guard

Date view	Thread view	Subject view	Author view

Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk