Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r75988 - in sandbox/closure/boost/closure: aux_/preprocessor/variadic detail/preprocessor/keyword detail/preprocessor/keyword/facility
From: lorcaminiti_at_[hidden]
Date: 2011-12-16 08:56:41


Author: lcaminiti
Date: 2011-12-16 08:56:38 EST (Fri, 16 Dec 2011)
New Revision: 75988
URL: http://svn.boost.org/trac/boost/changeset/75988

Log:
Renamed pp-keywords.
Text files modified:
   sandbox/closure/boost/closure/aux_/preprocessor/variadic/to_seq.hpp | 2 +
   sandbox/closure/boost/closure/detail/preprocessor/keyword/auto.hpp | 74 +++++++++++++++++++-----------------
   sandbox/closure/boost/closure/detail/preprocessor/keyword/bind.hpp | 74 +++++++++++++++++++-----------------
   sandbox/closure/boost/closure/detail/preprocessor/keyword/const.hpp | 74 +++++++++++++++++++-----------------
   sandbox/closure/boost/closure/detail/preprocessor/keyword/const_bind.hpp | 80 +++++++++++++++++++++-------------------
   sandbox/closure/boost/closure/detail/preprocessor/keyword/default.hpp | 74 +++++++++++++++++++-----------------
   sandbox/closure/boost/closure/detail/preprocessor/keyword/facility/add.hpp | 20 +++++-----
   sandbox/closure/boost/closure/detail/preprocessor/keyword/facility/is.hpp | 22 ++++++----
   sandbox/closure/boost/closure/detail/preprocessor/keyword/facility/remove.hpp | 34 +++++++++--------
   sandbox/closure/boost/closure/detail/preprocessor/keyword/inline.hpp | 74 +++++++++++++++++++-----------------
   sandbox/closure/boost/closure/detail/preprocessor/keyword/recursive.hpp | 68 ++++++++++++++++++----------------
   sandbox/closure/boost/closure/detail/preprocessor/keyword/register.hpp | 74 +++++++++++++++++++-----------------
   sandbox/closure/boost/closure/detail/preprocessor/keyword/return.hpp | 74 +++++++++++++++++++-----------------
   sandbox/closure/boost/closure/detail/preprocessor/keyword/this.hpp | 74 +++++++++++++++++++-----------------
   sandbox/closure/boost/closure/detail/preprocessor/keyword/void.hpp | 74 +++++++++++++++++++-----------------
   15 files changed, 472 insertions(+), 420 deletions(-)

Modified: sandbox/closure/boost/closure/aux_/preprocessor/variadic/to_seq.hpp
==============================================================================
--- sandbox/closure/boost/closure/aux_/preprocessor/variadic/to_seq.hpp (original)
+++ sandbox/closure/boost/closure/aux_/preprocessor/variadic/to_seq.hpp 2011-12-16 08:56:38 EST (Fri, 16 Dec 2011)
@@ -15,6 +15,8 @@
 #include <boost/preprocessor/variadic/to_seq.hpp>
 #include <boost/preprocessor/control/iif.hpp>
 #include <boost/preprocessor/control/if.hpp>
+#include <boost/preprocessor/tuple/rem.hpp> // For PP_REM.
+#include <boost/preprocessor/tuple/eat.hpp> // For PP_EAT.
 
 // PRIVATE //
 

Modified: sandbox/closure/boost/closure/detail/preprocessor/keyword/auto.hpp
==============================================================================
--- sandbox/closure/boost/closure/detail/preprocessor/keyword/auto.hpp (original)
+++ sandbox/closure/boost/closure/detail/preprocessor/keyword/auto.hpp 2011-12-16 08:56:38 EST (Fri, 16 Dec 2011)
@@ -4,50 +4,54 @@
 // License, Version 1.0 (see accompanying file LICENSE_1_0.txt or a
 // copy at http://www.boost.org/LICENSE_1_0.txt).
 
-#ifndef BOOST_DETAIL_PP_KEYWORD_AUTO_HPP_
-#define BOOST_DETAIL_PP_KEYWORD_AUTO_HPP_
+#ifndef BOOST_CLOSURE_DETAIL_PP_KEYWORD_AUTO_HPP_
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_AUTO_HPP_
 
-#include "facility/is.hpp"
-#include "facility/add.hpp"
-#include "facility/remove.hpp"
+#include <boost/closure/detail/preprocessor/keyword/facility/is.hpp>
+#include <boost/closure/detail/preprocessor/keyword/facility/add.hpp>
+#include <boost/closure/detail/preprocessor/keyword/facility/remove.hpp>
+
+// PRIVATE //
 
 // These are not local macros -- DO NOT #UNDEF.
-#define BOOST_DETAIL_PP_KEYWORD_AUTO_IS_auto (1) /* unary */
-#define auto_BOOST_DETAIL_PP_KEYWORD_AUTO_IS (1) /* unary */
-#define BOOST_DETAIL_PP_KEYWORD_AUTO_REMOVE_auto /* nothing */
-#define auto_BOOST_DETAIL_PP_KEYWORD_AUTO_REMOVE /* nothing */
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_AUTO_IS_auto (1) /* unary */
+#define auto_BOOST_CLOSURE_DETAIL_PP_KEYWORD_AUTO_IS (1) /* unary */
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_AUTO_REMOVE_auto /* nothing */
+#define auto_BOOST_CLOSURE_DETAIL_PP_KEYWORD_AUTO_REMOVE /* nothing */
+
+// PUBLIC //
 
 // Is.
 
-#define BOOST_DETAIL_PP_KEYWORD_IS_AUTO_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
- BOOST_DETAIL_PP_KEYWORD_AUTO_IS_)
-
-#define BOOST_DETAIL_PP_KEYWORD_IS_AUTO_BACK(token) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_BACK(token, \
- _BOOST_DETAIL_PP_KEYWORD_AUTO_IS)
-
-// Rremove.
-
-#define BOOST_DETAIL_PP_KEYWORD_AUTO_REMOVE_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_AUTO_FRONT, \
- BOOST_DETAIL_PP_KEYWORD_AUTO_REMOVE_)
-
-#define BOOST_DETAIL_PP_KEYWORD_AUTO_REMOVE_BACK(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_BACK(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_AUTO_BACK, \
- _BOOST_DETAIL_PP_KEYWORD_AUTO_REMOVE)
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_AUTO_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_AUTO_IS_)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_AUTO_BACK(token) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_BACK(token, \
+ _BOOST_CLOSURE_DETAIL_PP_KEYWORD_AUTO_IS)
+
+// Remove.
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_AUTO_REMOVE_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_AUTO_FRONT, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_AUTO_REMOVE_)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_AUTO_REMOVE_BACK(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_BACK(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_AUTO_BACK, \
+ _BOOST_CLOSURE_DETAIL_PP_KEYWORD_AUTO_REMOVE)
 
 // Add.
 
-#define BOOST_DETAIL_PP_KEYWORD_AUTO_ADD_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_FRONT(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_AUTO_FRONT, auto)
-
-#define BOOST_DETAIL_PP_KEYWORD_AUTO_ADD_BACK(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_BACK(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_AUTO_BACK, auto)
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_AUTO_ADD_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_ADD_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_AUTO_FRONT, auto)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_AUTO_ADD_BACK(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_ADD_BACK(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_AUTO_BACK, auto)
 
 #endif // #include guard
 

Modified: sandbox/closure/boost/closure/detail/preprocessor/keyword/bind.hpp
==============================================================================
--- sandbox/closure/boost/closure/detail/preprocessor/keyword/bind.hpp (original)
+++ sandbox/closure/boost/closure/detail/preprocessor/keyword/bind.hpp 2011-12-16 08:56:38 EST (Fri, 16 Dec 2011)
@@ -4,50 +4,54 @@
 // License, Version 1.0 (see accompanying file LICENSE_1_0.txt or a
 // copy at http://www.boost.org/LICENSE_1_0.txt).
 
-#ifndef BOOST_LOCAL_AUX_PP_KEYWORD_BIND_HPP_
-#define BOOST_LOCAL_AUX_PP_KEYWORD_BIND_HPP_
+#ifndef BOOST_CLOSURE_DETAIL_PP_KEYWORD_BIND_HPP_
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_BIND_HPP_
 
-#include <boost/detail/preprocessor/keyword/facility/is.hpp>
-#include <boost/detail/preprocessor/keyword/facility/add.hpp>
-#include <boost/detail/preprocessor/keyword/facility/remove.hpp>
+#include <boost/closure/detail/preprocessor/keyword/facility/is.hpp>
+#include <boost/closure/detail/preprocessor/keyword/facility/add.hpp>
+#include <boost/closure/detail/preprocessor/keyword/facility/remove.hpp>
+
+// PRIVATE //
 
 // These are not local macros -- DO NOT #UNDEF.
-#define BOOST_LOCAL_AUX_PP_KEYWORD_BIND_IS_bind (1) /* unary */
-#define bind_BOOST_LOCAL_AUX_PP_KEYWORD_BIND_IS (1) /* unary */
-#define BOOST_LOCAL_AUX_PP_KEYWORD_BIND_REMOVE_bind /* nothing */
-#define bind_BOOST_LOCAL_AUX_PP_KEYWORD_BIND_REMOVE /* nothing */
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_BIND_IS_bind (1) /* unary */
+#define bind_BOOST_CLOSURE_DETAIL_PP_KEYWORD_BIND_IS (1) /* unary */
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_BIND_REMOVE_bind /* nothing */
+#define bind_BOOST_CLOSURE_DETAIL_PP_KEYWORD_BIND_REMOVE /* nothing */
+
+// PUBLIC //
 
 // Is.
 
-#define BOOST_LOCAL_AUX_PP_KEYWORD_IS_BIND_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
- BOOST_LOCAL_AUX_PP_KEYWORD_BIND_IS_)
-
-#define BOOST_LOCAL_AUX_PP_KEYWORD_IS_BIND_BACK(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_BACK(tokens, \
- _BOOST_LOCAL_AUX_PP_KEYWORD_BIND_IS)
-
-// Rremove.
-
-#define BOOST_LOCAL_AUX_PP_KEYWORD_BIND_REMOVE_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT(tokens, \
- BOOST_LOCAL_AUX_PP_KEYWORD_IS_BIND_FRONT, \
- BOOST_LOCAL_AUX_PP_KEYWORD_BIND_REMOVE_)
-
-#define BOOST_LOCAL_AUX_PP_KEYWORD_BIND_REMOVE_BACK(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_BACK(tokens, \
- BOOST_LOCAL_AUX_PP_KEYWORD_IS_BIND_BACK, \
- _BOOST_LOCAL_AUX_PP_KEYWORD_BIND_REMOVE)
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_BIND_FRONT(tokens) \
+ BOOST_CLOSRE_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_BIND_IS_)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_BIND_BACK(tokens) \
+ BOOST_CLOSRE_DETAIL_PP_KEYWORD_FACILITY_IS_BACK(tokens, \
+ _BOOST_CLOSURE_DETAIL_PP_KEYWORD_BIND_IS)
+
+// Remove.
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_BIND_REMOVE_FRONT(tokens) \
+ BOOST_CLOSRE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_BIND_FRONT, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_BIND_REMOVE_)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_BIND_REMOVE_BACK(tokens) \
+ BOOST_CLOSRE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_BACK(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_BIND_BACK, \
+ _BOOST_CLOSURE_DETAIL_PP_KEYWORD_BIND_REMOVE)
 
 // Add.
 
-#define BOOST_LOCAL_AUX_PP_KEYWORD_BIND_ADD_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_FRONT(tokens, \
- BOOST_LOCAL_AUX_PP_KEYWORD_IS_BIND_FRONT, bind)
-
-#define BOOST_LOCAL_AUX_PP_KEYWORD_BIND_ADD_BACK(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_BACK(tokens, \
- BOOST_LOCAL_AUX_PP_KEYWORD_IS_BIND_BACK, bind)
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_BIND_ADD_FRONT(tokens) \
+ BOOST_CLOSRE_DETAIL_PP_KEYWORD_FACILITY_ADD_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_BIND_FRONT, bind)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_BIND_ADD_BACK(tokens) \
+ BOOST_CLOSRE_DETAIL_PP_KEYWORD_FACILITY_ADD_BACK(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_BIND_BACK, bind)
 
 #endif // #include guard
 

Modified: sandbox/closure/boost/closure/detail/preprocessor/keyword/const.hpp
==============================================================================
--- sandbox/closure/boost/closure/detail/preprocessor/keyword/const.hpp (original)
+++ sandbox/closure/boost/closure/detail/preprocessor/keyword/const.hpp 2011-12-16 08:56:38 EST (Fri, 16 Dec 2011)
@@ -4,50 +4,54 @@
 // License, Version 1.0 (see accompanying file LICENSE_1_0.txt or a
 // copy at http://www.boost.org/LICENSE_1_0.txt).
 
-#ifndef BOOST_DETAIL_PP_KEYWORD_CONST_HPP_
-#define BOOST_DETAIL_PP_KEYWORD_CONST_HPP_
+#ifndef BOOST_CLOSURE_DETAIL_PP_KEYWORD_CONST_HPP_
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_CONST_HPP_
 
-#include "facility/is.hpp"
-#include "facility/add.hpp"
-#include "facility/remove.hpp"
+#include <boost/closure/detail/preprocessor/facility/is.hpp>
+#include <boost/closure/detail/preprocessor/facility/add.hpp>
+#include <boost/closure/detail/preprocessor/facility/remove.hpp>
+
+// PRIVATE //
 
 // These are not local macros -- DO NOT #UNDEF.
-#define BOOST_DETAIL_PP_KEYWORD_CONST_IS_const (1) /* unary */
-#define const_BOOST_DETAIL_PP_KEYWORD_CONST_IS (1) /* unary */
-#define BOOST_DETAIL_PP_KEYWORD_CONST_REMOVE_const /* nothing */
-#define const_BOOST_DETAIL_PP_KEYWORD_CONST_REMOVE /* nothing */
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_CONST_IS_const (1) /* unary */
+#define const_BOOST_CLOSURE_DETAIL_PP_KEYWORD_CONST_IS (1) /* unary */
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_CONST_REMOVE_const /* nothing */
+#define const_BOOST_CLOSURE_DETAIL_PP_KEYWORD_CONST_REMOVE /* nothing */
+
+// PUBLIC //
 
 // Is.
 
-#define BOOST_DETAIL_PP_KEYWORD_IS_CONST_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
- BOOST_DETAIL_PP_KEYWORD_CONST_IS_)
-
-#define BOOST_DETAIL_PP_KEYWORD_IS_CONST_BACK(token) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_BACK(token, \
- _BOOST_DETAIL_PP_KEYWORD_CONST_IS)
-
-// Rremove.
-
-#define BOOST_DETAIL_PP_KEYWORD_CONST_REMOVE_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_CONST_FRONT, \
- BOOST_DETAIL_PP_KEYWORD_CONST_REMOVE_)
-
-#define BOOST_DETAIL_PP_KEYWORD_CONST_REMOVE_BACK(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_BACK(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_CONST_BACK, \
- _BOOST_DETAIL_PP_KEYWORD_CONST_REMOVE)
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_CONST_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_CONST_IS_)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_CONST_BACK(token) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_BACK(token, \
+ _BOOST_CLOSURE_DETAIL_PP_KEYWORD_CONST_IS)
+
+// Remove.
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_CONST_REMOVE_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_CONST_FRONT, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_CONST_REMOVE_)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_CONST_REMOVE_BACK(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_BACK(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_CONST_BACK, \
+ _BOOST_CLOSURE_DETAIL_PP_KEYWORD_CONST_REMOVE)
 
 // Add.
 
-#define BOOST_DETAIL_PP_KEYWORD_CONST_ADD_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_FRONT(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_CONST_FRONT, const)
-
-#define BOOST_DETAIL_PP_KEYWORD_CONST_ADD_BACK(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_BACK(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_CONST_BACK, const)
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_CONST_ADD_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_ADD_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_CONST_FRONT, const)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_CONST_ADD_BACK(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_ADD_BACK(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_CONST_BACK, const)
 
 #endif // #include guard
 

Modified: sandbox/closure/boost/closure/detail/preprocessor/keyword/const_bind.hpp
==============================================================================
--- sandbox/closure/boost/closure/detail/preprocessor/keyword/const_bind.hpp (original)
+++ sandbox/closure/boost/closure/detail/preprocessor/keyword/const_bind.hpp 2011-12-16 08:56:38 EST (Fri, 16 Dec 2011)
@@ -4,64 +4,68 @@
 // License, Version 1.0 (see accompanying file LICENSE_1_0.txt or a
 // copy at http://www.boost.org/LICENSE_1_0.txt).
 
-#ifndef BOOST_LOCAL_AUX_PP_KEYWORD_CONST_BIND_HPP_
-#define BOOST_LOCAL_AUX_PP_KEYWORD_CONST_BIND_HPP_
+#ifndef BOOST_CLOSURE_DETAIL_PP_KEYWORD_CONST_BIND_HPP_
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_CONST_BIND_HPP_
 
-#include "bind.hpp"
-#include <boost/detail/preprocessor/keyword/const.hpp>
-#include <boost/detail/preprocessor/keyword/facility/add.hpp>
+#include <boost/closure/detail/preprocessor/keyword/bind.hpp>
+#include <boost/closure/detail/preprocessor/keyword/const.hpp>
+#include <boost/closure/detail/preprocessor/keyword/facility/add.hpp>
 #include <boost/preprocessor/control/iif.hpp>
 #include <boost/preprocessor/tuple/eat.hpp>
 
+// PRIVATE //
+
 // These are not local macros -- DO NOT #UNDEF.
-#define BOOST_LOCAL_AUX_PP_KEYWORD_BIND_IS_bind (1) /* unary */
-#define bind_BOOST_LOCAL_AUX_PP_KEYWORD_BIND_IS (1) /* unary */
-#define BOOST_LOCAL_AUX_PP_KEYWORD_BIND_REMOVE_bind /* nothing */
-#define bind_BOOST_LOCAL_AUX_PP_KEYWORD_BIND_REMOVE /* nothing */
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_BIND_IS_bind (1) /* unary */
+#define bind_BOOST_CLOSURE_DETAIL_PP_KEYWORD_BIND_IS (1) /* unary */
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_BIND_REMOVE_bind /* nothing */
+#define bind_BOOST_CLOSURE_DETAIL_PP_KEYWORD_BIND_REMOVE /* nothing */
+
+// PUBLIC //
 
 // Is.
 
-#define BOOST_LOCAL_AUX_PP_KEYWORD_IS_CONST_BIND_FRONT_(tokens) \
- BOOST_LOCAL_AUX_PP_KEYWORD_IS_BIND_FRONT( \
- BOOST_DETAIL_PP_KEYWORD_CONST_REMOVE_FRONT(tokens))
-
-#define BOOST_LOCAL_AUX_PP_KEYWORD_IS_CONST_BIND_FRONT(tokens) \
- BOOST_PP_IIF(BOOST_DETAIL_PP_KEYWORD_IS_CONST_FRONT(tokens), \
- BOOST_LOCAL_AUX_PP_KEYWORD_IS_CONST_BIND_FRONT_ \
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_CONST_BIND_FRONT_(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_BIND_FRONT( \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_CONST_REMOVE_FRONT(tokens))
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_CONST_BIND_FRONT(tokens) \
+ BOOST_PP_IIF(BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_CONST_FRONT(tokens), \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_CONST_BIND_FRONT_ \
     , \
         0 BOOST_PP_TUPLE_EAT(1) \
     )(tokens)
         
-#define BOOST_LOCAL_AUX_PP_KEYWORD_IS_CONST_BIND_BACK_(tokens) \
- BOOST_DETAIL_PP_KEYWORD_IS_CONST_BACK( \
- BOOST_LOCAL_AUX_PP_KEYWORD_BIND_REMOVE_BACK(tokens))
-
-#define BOOST_LOCAL_AUX_PP_KEYWORD_IS_CONDT_BIND_BACK(tokens) \
- BOOST_PP_IIF(BOOST_LOCAL_AUX_PP_KEYWORD_IS_BIND_BACK(tokens) \
- BOOST_LOCAL_AUX_PP_KEYWORD_IS_CONST_BIND_BACK_ \
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_CONST_BIND_BACK_(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_CONST_BACK( \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_BIND_REMOVE_BACK(tokens))
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_CONDT_BIND_BACK(tokens) \
+ BOOST_PP_IIF(BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_BIND_BACK(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_CONST_BIND_BACK_ \
     , \
         0 BOOST_PP_TUPLE_EAT(1) \
     )(tokens)
 
-// Rremove.
+// Remove.
 
-#define BOOST_LOCAL_AUX_PP_KEYWORD_CONST_BIND_REMOVE_FRONT(tokens) \
- BOOST_LOCAL_AUX_PP_KEYWORD_BIND_REMOVE_FRONT( \
- BOOST_DETAIL_PP_KEYWORD_CONST_REMOVE_FRONT(tokens))
-
-#define BOOST_LOCAL_AUX_PP_KEYWORD_CONST_BIND_REMOVE_BACK(tokens) \
- BOOST_DETAIL_PP_KEYWORD_CONST_REMOVE_BACK( \
- BOOST_LOCAL_AUX_PP_KEYWORD_BIND_REMOVE_BACK(tokens))
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_CONST_BIND_REMOVE_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_BIND_REMOVE_FRONT( \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_CONST_REMOVE_FRONT(tokens))
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_CONST_BIND_REMOVE_BACK(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_CONST_REMOVE_BACK( \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_BIND_REMOVE_BACK(tokens))
 
 // Add.
 
-#define BOOST_LOCAL_AUX_PP_KEYWORD_CONST_BIND_ADD_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_FRONT(tokens, \
- BOOST_LOCAL_AUX_PP_KEYWORD_IS_CONST_BIND_FRONT, const bind)
-
-#define BOOST_LOCAL_AUX_PP_KEYWORD_CONST_BIND_ADD_BACK(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_BACK(tokens, \
- BOOST_LOCAL_AUX_PP_KEYWORD_IS_CONST_BIND_BACK, const bind)
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_CONST_BIND_ADD_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_ADD_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_CONST_BIND_FRONT, const bind)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_CONST_BIND_ADD_BACK(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_ADD_BACK(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_CONST_BIND_BACK, const bind)
 
 #endif // #include guard
 

Modified: sandbox/closure/boost/closure/detail/preprocessor/keyword/default.hpp
==============================================================================
--- sandbox/closure/boost/closure/detail/preprocessor/keyword/default.hpp (original)
+++ sandbox/closure/boost/closure/detail/preprocessor/keyword/default.hpp 2011-12-16 08:56:38 EST (Fri, 16 Dec 2011)
@@ -4,50 +4,54 @@
 // License, Version 1.0 (see accompanying file LICENSE_1_0.txt or a
 // copy at http://www.boost.org/LICENSE_1_0.txt).
 
-#ifndef BOOST_DETAIL_PP_KEYWORD_DEFAULT_HPP_
-#define BOOST_DETAIL_PP_KEYWORD_DEFAULT_HPP_
+#ifndef BOOST_CLOSURE_DETAIL_PP_KEYWORD_DEFAULT_HPP_
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_DEFAULT_HPP_
 
-#include "facility/is.hpp"
-#include "facility/add.hpp"
-#include "facility/remove.hpp"
+#include <boost/closure/detail/preprocessor/keyword/facility/is.hpp>
+#include <boost/closure/detail/preprocessor/keyword/facility/add.hpp>
+#include <boost/closure/detail/preprocessor/keyword/facility/remove.hpp>
+
+// PRIVATE //
 
 // These are not local macros -- DO NOT #UNDEF.
-#define BOOST_DETAIL_PP_KEYWORD_DEFAULT_IS_default (1) /* unary */
-#define default_BOOST_DETAIL_PP_KEYWORD_DEFAULT_IS (1) /* unary */
-#define BOOST_DETAIL_PP_KEYWORD_DEFAULT_REMOVE_default /* nothing */
-#define default_BOOST_DETAIL_PP_KEYWORD_DEFAULT_REMOVE /* nothing */
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_DEFAULT_IS_default (1) /* unary */
+#define default_BOOST_CLOSURE_DETAIL_PP_KEYWORD_DEFAULT_IS (1) /* unary */
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_DEFAULT_REMOVE_default /* nothing */
+#define default_BOOST_CLOSURE_DETAIL_PP_KEYWORD_DEFAULT_REMOVE /* nothing */
+
+// PUBLIC //
 
 // Is.
 
-#define BOOST_DETAIL_PP_KEYWORD_IS_DEFAULT_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
- BOOST_DETAIL_PP_KEYWORD_DEFAULT_IS_)
-
-#define BOOST_DETAIL_PP_KEYWORD_IS_DEFAULT_BACK(token) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_BACK(token, \
- _BOOST_DETAIL_PP_KEYWORD_DEFAULT_IS)
-
-// Rremove.
-
-#define BOOST_DETAIL_PP_KEYWORD_DEFAULT_REMOVE_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_DEFAULT_FRONT, \
- BOOST_DETAIL_PP_KEYWORD_DEFAULT_REMOVE_)
-
-#define BOOST_DETAIL_PP_KEYWORD_DEFAULT_REMOVE_BACK(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_BACK(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_DEFAULT_BACK, \
- _BOOST_DETAIL_PP_KEYWORD_DEFAULT_REMOVE)
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_DEFAULT_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_DEFAULT_IS_)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_DEFAULT_BACK(token) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_BACK(token, \
+ _BOOST_CLOSURE_DETAIL_PP_KEYWORD_DEFAULT_IS)
+
+// Remove.
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_DEFAULT_REMOVE_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_DEFAULT_FRONT, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_DEFAULT_REMOVE_)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_DEFAULT_REMOVE_BACK(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_BACK(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_DEFAULT_BACK, \
+ _BOOST_CLOSURE_DETAIL_PP_KEYWORD_DEFAULT_REMOVE)
 
 // Add.
 
-#define BOOST_DETAIL_PP_KEYWORD_DEFAULT_ADD_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_FRONT(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_DEFAULT_FRONT, default)
-
-#define BOOST_DETAIL_PP_KEYWORD_DEFAULT_ADD_BACK(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_BACK(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_DEFAULT_BACK, default)
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_DEFAULT_ADD_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_ADD_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_DEFAULT_FRONT, default)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_DEFAULT_ADD_BACK(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_ADD_BACK(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_DEFAULT_BACK, default)
 
 #endif // #include guard
 

Modified: sandbox/closure/boost/closure/detail/preprocessor/keyword/facility/add.hpp
==============================================================================
--- sandbox/closure/boost/closure/detail/preprocessor/keyword/facility/add.hpp (original)
+++ sandbox/closure/boost/closure/detail/preprocessor/keyword/facility/add.hpp 2011-12-16 08:56:38 EST (Fri, 16 Dec 2011)
@@ -4,21 +4,21 @@
 // License, Version 1.0 (see accompanying file LICENSE_1_0.txt or a
 // copy at http://www.boost.org/LICENSE_1_0.txt).
 
-#ifndef BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_HPP_
-#define BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_HPP_
+#ifndef BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_ADD_HPP_
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_ADD_HPP_
 
 #include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/logical/not.hpp>
+#include <boost/preprocessor/logical/compl.hpp>
 
-// `is_front_macro(tokens)` is 1 iff `tokens` start with `keyword` to add.
-#define BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_FRONT( \
+// `is_front_macro(tokens)` is 1 if `tokens` start w/ `keyword` to add, else 0.
+#define BOOST_CLOURE_DETAIL_PP_KEYWORD_FACILITY_ADD_FRONT( \
         tokens, is_front_macro, keyword) \
- BOOST_PP_EXPR_IIF(BOOST_PP_NOT(is_front_macro(tokens)), keyword) tokens
+ BOOST_PP_EXPR_IIF(BOOST_PP_COMPL(is_front_macro(tokens)), keyword) tokens
 
-// `is_back_macro(tokens)` is 1 iff `tokens` end with `keyword` to add.
-#define BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_BACK(tokens, \
- is_back_macro, keyword) \
- tokens BOOST_PP_EXPR_IIF(BOOST_PP_NOT(is_back_macro(tokens)), keyword)
+// `is_back_macro(tokens)` is 1 if `tokens` end with `keyword` to add, else 0.
+#define BOOST_CLOURE_DETAIL_PP_KEYWORD_FACILITY_ADD_BACK( \
+ tokens, is_back_macro, keyword) \
+ tokens BOOST_PP_EXPR_IIF(BOOST_PP_COMPL(is_back_macro(tokens)), keyword)
 
 #endif // #include guard
 

Modified: sandbox/closure/boost/closure/detail/preprocessor/keyword/facility/is.hpp
==============================================================================
--- sandbox/closure/boost/closure/detail/preprocessor/keyword/facility/is.hpp (original)
+++ sandbox/closure/boost/closure/detail/preprocessor/keyword/facility/is.hpp 2011-12-16 08:56:38 EST (Fri, 16 Dec 2011)
@@ -4,8 +4,8 @@
 // License, Version 1.0 (see accompanying file LICENSE_1_0.txt or a
 // copy at http://www.boost.org/LICENSE_1_0.txt).
 
-#ifndef BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_HPP_
-#define BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_HPP_
+#ifndef BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_HPP_
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_HPP_
 
 // Boost.Preprocessor author P. Mensodines confirmed on an Boost email thread
 // (subject ``check if a token is a keyword (was "BOOST_PP_IS_UNARY()")'')
@@ -14,33 +14,37 @@
 // technically only part of Boost.Preprocessor private API).
 #include <boost/preprocessor/detail/is_unary.hpp>
 #include <boost/preprocessor/cat.hpp>
+#include <boost/preprocessor/control/iif.hpp>
+#include <boost/preprocessor/tuple/eat.hpp>
 
 // PRIVATE //
 
-#define BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_(a, b) \
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_(a, b) \
     BOOST_PP_IS_UNARY(BOOST_PP_CAT(a, b))
 
 // PUBLIC //
 
-// `chekcing_prefix ## tokens` expand to unary (e.g., `(1)`) iff `tokens` start
+// `checking_prefix ## tokens` expand to unary (e.g., `(1)`) iff `tokens` start
 // with keyword to check.
-#define BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, checking_prefix) \
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT( \
+ tokens, checking_prefix) \
     BOOST_PP_IIF(BOOST_PP_IS_UNARY(tokens), \
         /* on MSVC this check works even if tokens already unary but on */ \
         /* C++03 (including GCC) this check on non-unary tokens gives */ \
         /* a concatenation error -- so return false is tokens is not unary */ \
         0 BOOST_PP_TUPLE_EAT(2) \
     , \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_ \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_ \
     )(checking_prefix, tokens)
 
-// `token ## chekcing_postfix` expand to unary (e.g., `(1)`) iff `token` is the
+// `token ## checking_postfix` expand to unary (e.g., `(1)`) iff `token` is the
 // keyword to check. This check only works if `token` is a single token, it
 // will always expand to 0 if token is multiple tokens (e.g., `const *this`).
 // This check will expand to 0 with no error if `token` starts with a
 // non-alphanumeric symbol (e.g., `*this`).
-#define BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_BACK(token, checking_postfix) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_(token, checking_postfix)
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_BACK( \
+ token, checking_postfix) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_(token, checking_postfix)
 
 #endif // #include guard
 

Modified: sandbox/closure/boost/closure/detail/preprocessor/keyword/facility/remove.hpp
==============================================================================
--- sandbox/closure/boost/closure/detail/preprocessor/keyword/facility/remove.hpp (original)
+++ sandbox/closure/boost/closure/detail/preprocessor/keyword/facility/remove.hpp 2011-12-16 08:56:38 EST (Fri, 16 Dec 2011)
@@ -4,8 +4,8 @@
 // License, Version 1.0 (see accompanying file LICENSE_1_0.txt or a
 // copy at http://www.boost.org/LICENSE_1_0.txt).
 
-#ifndef BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_HPP_
-#define BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_HPP_
+#ifndef BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_HPP_
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_HPP_
 
 #include <boost/preprocessor/control/iif.hpp>
 #include <boost/preprocessor/tuple/eat.hpp>
@@ -14,25 +14,27 @@
 // PRIVATE //
 
 // From PP_EXPAND (my own reentrant version).
-#if ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MWCC() && ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_DMC()
-# define BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT_EXPAND_(x) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT_EXPAND_I_(x)
+#if ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MWCC() && \
+ ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_DMC()
+# define BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT_EXPAND_(x) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT_EXPAND_I_(x)
 #else
-# define BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT_EXPAND_(x) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT_EXPAND_OO_((x))
-# define BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT_EXPAND_OO_(par) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT_EXPAND_I_ ## par
+# define BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT_EXPAND_(x) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT_EXPAND_OO_((x))
+# define BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT_EXPAND_OO_( \
+ par) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT_EXPAND_I_ ## par
 #endif
-#define BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT_EXPAND_I_(x) x
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT_EXPAND_I_(x) x
 
 // PUBLIC //
 
-// `is_front_macro(tokens)` is 1 iff `tokens` start with keyword to remove.
-// `removing_prefix ## <keyword-to-remove>` must expand to nothing.
-#define BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT( \
+// `is_front_macro(tokens)` is 1 if `tokens` start with keyword to remove.
+// `removing_prefix ## <keyword-to-remove>` must expand to nothing, else 0.
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT( \
         tokens, is_front_macro, removing_prefix) \
     /* without EXPAND doesn't expand on MSVC */ \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT_EXPAND_( \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT_EXPAND_( \
         BOOST_PP_IIF(is_front_macro(tokens), \
             BOOST_PP_CAT \
         , \
@@ -41,8 +43,8 @@
     )
 
 // `is_back_macro(tokens)` is 1 iff `tokens` end with keyword to remove.
-// `<keyword-to-remove> ## removing_postfix` must expand to nothing.
-#define BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_BACK( \
+// `<keyword-to-remove> ## removing_postfix` must expand to nothing, else 0.
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_BACK( \
         tokens, is_back_macro, removing_prefix) \
     BOOST_PP_IIF(is_back_macro(tokens), \
         BOOST_PP_CAT \

Modified: sandbox/closure/boost/closure/detail/preprocessor/keyword/inline.hpp
==============================================================================
--- sandbox/closure/boost/closure/detail/preprocessor/keyword/inline.hpp (original)
+++ sandbox/closure/boost/closure/detail/preprocessor/keyword/inline.hpp 2011-12-16 08:56:38 EST (Fri, 16 Dec 2011)
@@ -4,50 +4,54 @@
 // License, Version 1.0 (see accompanying file LICENSE_1_0.txt or a
 // copy at http://www.boost.org/LICENSE_1_0.txt).
 
-#ifndef BOOST_DETAIL_PP_KEYWORD_INLINE_HPP_
-#define BOOST_DETAIL_PP_KEYWORD_INLINE_HPP_
+#ifndef BOOST_CLOSURE_DETAIL_PP_KEYWORD_INLINE_HPP_
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_INLINE_HPP_
 
-#include "facility/is.hpp"
-#include "facility/add.hpp"
-#include "facility/remove.hpp"
+#include <boost/closure/detail/preprocessor/keyword/facility/is.hpp>
+#include <boost/closure/detail/preprocessor/keyword/facility/add.hpp>
+#include <boost/closure/detail/preprocessor/keyword/facility/remove.hpp>
+
+// PRIVATE //
 
 // These are not local macros -- DO NOT #UNDEF.
-#define BOOST_DETAIL_PP_KEYWORD_INLINE_IS_inline (1) /* unary */
-#define inline_BOOST_DETAIL_PP_KEYWORD_INLINE_IS (1) /* unary */
-#define BOOST_DETAIL_PP_KEYWORD_INLINE_REMOVE_inline /* nothing */
-#define inline_BOOST_DETAIL_PP_KEYWORD_INLINE_REMOVE /* nothing */
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_INLINE_IS_inline (1) /* unary */
+#define inline_BOOST_CLOSURE_DETAIL_PP_KEYWORD_INLINE_IS (1) /* unary */
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_INLINE_REMOVE_inline /* nothing */
+#define inline_BOOST_CLOSURE_DETAIL_PP_KEYWORD_INLINE_REMOVE /* nothing */
+
+// PUBLIC //
 
 // Is.
 
-#define BOOST_DETAIL_PP_KEYWORD_IS_INLINE_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
- BOOST_DETAIL_PP_KEYWORD_INLINE_IS_)
-
-#define BOOST_DETAIL_PP_KEYWORD_IS_INLINE_BACK(token) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_BACK(token, \
- _BOOST_DETAIL_PP_KEYWORD_INLINE_IS)
-
-// Rremove.
-
-#define BOOST_DETAIL_PP_KEYWORD_INLINE_REMOVE_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_INLINE_FRONT, \
- BOOST_DETAIL_PP_KEYWORD_INLINE_REMOVE_)
-
-#define BOOST_DETAIL_PP_KEYWORD_INLINE_REMOVE_BACK(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_BACK(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_INLINE_BACK, \
- _BOOST_DETAIL_PP_KEYWORD_INLINE_REMOVE)
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_INLINE_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_INLINE_IS_)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_INLINE_BACK(token) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_BACK(token, \
+ _BOOST_CLOSURE_DETAIL_PP_KEYWORD_INLINE_IS)
+
+// Remove.
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_INLINE_REMOVE_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_INLINE_FRONT, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_INLINE_REMOVE_)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_INLINE_REMOVE_BACK(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_BACK(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_INLINE_BACK, \
+ _BOOST_CLOSURE_DETAIL_PP_KEYWORD_INLINE_REMOVE)
 
 // Add.
 
-#define BOOST_DETAIL_PP_KEYWORD_INLINE_ADD_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_FRONT(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_INLINE_FRONT, inline)
-
-#define BOOST_DETAIL_PP_KEYWORD_INLINE_ADD_BACK(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_BACK(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_INLINE_BACK, inline)
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_INLINE_ADD_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_ADD_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_INLINE_FRONT, inline)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_INLINE_ADD_BACK(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_ADD_BACK(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_INLINE_BACK, inline)
 
 #endif // #include guard
 

Modified: sandbox/closure/boost/closure/detail/preprocessor/keyword/recursive.hpp
==============================================================================
--- sandbox/closure/boost/closure/detail/preprocessor/keyword/recursive.hpp (original)
+++ sandbox/closure/boost/closure/detail/preprocessor/keyword/recursive.hpp 2011-12-16 08:56:38 EST (Fri, 16 Dec 2011)
@@ -4,50 +4,54 @@
 // License, Version 1.0 (see accompanying file LICENSE_1_0.txt or a
 // copy at http://www.boost.org/LICENSE_1_0.txt).
 
-#ifndef BOOST_LOCAL_AUX_PP_KEYWORD_RECURSIVE_HPP_
-#define BOOST_LOCAL_AUX_PP_KEYWORD_RECURSIVE_HPP_
+#ifndef BOOST_CLOSURE_DETAIL_PP_KEYWORD_RECURSIVE_HPP_
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_RECURSIVE_HPP_
 
 #include <boost/detail/preprocessor/keyword/facility/is.hpp>
 #include <boost/detail/preprocessor/keyword/facility/add.hpp>
 #include <boost/detail/preprocessor/keyword/facility/remove.hpp>
 
+// PRIVATE //
+
 // These are not local macros -- DO NOT #UNDEF.
-#define BOOST_LOCAL_AUX_PP_KEYWORD_RECURSIVE_IS_recursive (1) /* unary */
-#define recursive_BOOST_LOCAL_AUX_PP_KEYWORD_RECURSIVE_IS (1) /* unary */
-#define BOOST_LOCAL_AUX_PP_KEYWORD_RECURSIVE_REMOVE_recursive /* nothing */
-#define recursive_BOOST_LOCAL_AUX_PP_KEYWORD_RECURSIVE_REMOVE /* nothing */
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_RECURSIVE_IS_recursive (1) /* unary */
+#define recursive_BOOST_CLOSURE_DETAIL_PP_KEYWORD_RECURSIVE_IS (1) /* unary */
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_RECURSIVE_REMOVE_recursive /* nothing */
+#define recursive_BOOST_CLOSURE_DETAIL_PP_KEYWORD_RECURSIVE_REMOVE /* nothing */
+
+// PUBLIC //
 
 // Is.
 
-#define BOOST_LOCAL_AUX_PP_KEYWORD_IS_RECURSIVE_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
- BOOST_LOCAL_AUX_PP_KEYWORD_RECURSIVE_IS_)
-
-#define BOOST_LOCAL_AUX_PP_KEYWORD_IS_RECURSIVE_BACK(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_BACK(tokens, \
- _BOOST_LOCAL_AUX_PP_KEYWORD_RECURSIVE_IS)
-
-// Rremove.
-
-#define BOOST_LOCAL_AUX_PP_KEYWORD_RECURSIVE_REMOVE_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT(tokens, \
- BOOST_LOCAL_AUX_PP_KEYWORD_IS_RECURSIVE_FRONT, \
- BOOST_LOCAL_AUX_PP_KEYWORD_RECURSIVE_REMOVE_)
-
-#define BOOST_LOCAL_AUX_PP_KEYWORD_RECURSIVE_REMOVE_BACK(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_BACK(tokens, \
- BOOST_LOCAL_AUX_PP_KEYWORD_IS_RECURSIVE_BACK, \
- _BOOST_LOCAL_AUX_PP_KEYWORD_RECURSIVE_REMOVE)
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_RECURSIVE_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_RECURSIVE_IS_)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_RECURSIVE_BACK(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_BACK(tokens, \
+ _BOOST_CLOSURE_DETAIL_PP_KEYWORD_RECURSIVE_IS)
+
+// Remove.
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_RECURSIVE_REMOVE_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_RECURSIVE_FRONT, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_RECURSIVE_REMOVE_)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_RECURSIVE_REMOVE_BACK(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_BACK(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_RECURSIVE_BACK, \
+ _BOOST_CLOSURE_DETAIL_PP_KEYWORD_RECURSIVE_REMOVE)
 
 // Add.
 
-#define BOOST_LOCAL_AUX_PP_KEYWORD_RECURSIVE_ADD_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_FRONT(tokens, \
- BOOST_LOCAL_AUX_PP_KEYWORD_IS_RECURSIVE_FRONT, recursive)
-
-#define BOOST_LOCAL_AUX_PP_KEYWORD_RECURSIVE_ADD_BACK(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_BACK(tokens, \
- BOOST_LOCAL_AUX_PP_KEYWORD_IS_RECURSIVE_BACK, recursive)
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_RECURSIVE_ADD_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_ADD_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_RECURSIVE_FRONT, recursive)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_RECURSIVE_ADD_BACK(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_ADD_BACK(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_RECURSIVE_BACK, recursive)
 
 #endif // #include guard
 

Modified: sandbox/closure/boost/closure/detail/preprocessor/keyword/register.hpp
==============================================================================
--- sandbox/closure/boost/closure/detail/preprocessor/keyword/register.hpp (original)
+++ sandbox/closure/boost/closure/detail/preprocessor/keyword/register.hpp 2011-12-16 08:56:38 EST (Fri, 16 Dec 2011)
@@ -4,50 +4,54 @@
 // License, Version 1.0 (see accompanying file LICENSE_1_0.txt or a
 // copy at http://www.boost.org/LICENSE_1_0.txt).
 
-#ifndef BOOST_DETAIL_PP_KEYWORD_REGISTER_HPP_
-#define BOOST_DETAIL_PP_KEYWORD_REGISTER_HPP_
+#ifndef BOOST_CLOSURE_DETAIL_PP_KEYWORD_REGISTER_HPP_
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_REGISTER_HPP_
 
-#include "facility/is.hpp"
-#include "facility/add.hpp"
-#include "facility/remove.hpp"
+#include <boost/closure/detail/preprocessor/keyword/facility/is.hpp>
+#include <boost/closure/detail/preprocessor/keyword/facility/add.hpp>
+#include <boost/closure/detail/preprocessor/keyword/facility/remove.hpp>
+
+// PRIVATE //
 
 // These are not local macros -- DO NOT #UNDEF.
-#define BOOST_DETAIL_PP_KEYWORD_REGISTER_IS_register (1) /* unary */
-#define register_BOOST_DETAIL_PP_KEYWORD_REGISTER_IS (1) /* unary */
-#define BOOST_DETAIL_PP_KEYWORD_REGISTER_REMOVE_register /* nothing */
-#define register_BOOST_DETAIL_PP_KEYWORD_REGISTER_REMOVE /* nothing */
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_REGISTER_IS_register (1) /* unary */
+#define register_BOOST_CLOSURE_DETAIL_PP_KEYWORD_REGISTER_IS (1) /* unary */
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_REGISTER_REMOVE_register /* nothing */
+#define register_BOOST_CLOSURE_DETAIL_PP_KEYWORD_REGISTER_REMOVE /* nothing */
+
+// PUBLIC //
 
 // Is.
 
-#define BOOST_DETAIL_PP_KEYWORD_IS_REGISTER_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
- BOOST_DETAIL_PP_KEYWORD_REGISTER_IS_)
-
-#define BOOST_DETAIL_PP_KEYWORD_IS_REGISTER_BACK(token) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_BACK(token, \
- _BOOST_DETAIL_PP_KEYWORD_REGISTER_IS)
-
-// Rremove.
-
-#define BOOST_DETAIL_PP_KEYWORD_REGISTER_REMOVE_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_REGISTER_FRONT, \
- BOOST_DETAIL_PP_KEYWORD_REGISTER_REMOVE_)
-
-#define BOOST_DETAIL_PP_KEYWORD_REGISTER_REMOVE_BACK(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_BACK(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_REGISTER_BACK, \
- _BOOST_DETAIL_PP_KEYWORD_REGISTER_REMOVE)
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_REGISTER_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_REGISTER_IS_)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_REGISTER_BACK(token) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_BACK(token, \
+ _BOOST_CLOSURE_DETAIL_PP_KEYWORD_REGISTER_IS)
+
+// Remove.
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_REGISTER_REMOVE_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_REGISTER_FRONT, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_REGISTER_REMOVE_)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_REGISTER_REMOVE_BACK(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_BACK(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_REGISTER_BACK, \
+ _BOOST_CLOSURE_DETAIL_PP_KEYWORD_REGISTER_REMOVE)
 
 // Add.
 
-#define BOOST_DETAIL_PP_KEYWORD_REGISTER_ADD_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_FRONT(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_REGISTER_FRONT, register)
-
-#define BOOST_DETAIL_PP_KEYWORD_REGISTER_ADD_BACK(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_BACK(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_REGISTER_BACK, register)
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_REGISTER_ADD_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_ADD_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_REGISTER_FRONT, register)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_REGISTER_ADD_BACK(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_ADD_BACK(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_REGISTER_BACK, register)
 
 #endif // #include guard
 

Modified: sandbox/closure/boost/closure/detail/preprocessor/keyword/return.hpp
==============================================================================
--- sandbox/closure/boost/closure/detail/preprocessor/keyword/return.hpp (original)
+++ sandbox/closure/boost/closure/detail/preprocessor/keyword/return.hpp 2011-12-16 08:56:38 EST (Fri, 16 Dec 2011)
@@ -4,50 +4,54 @@
 // License, Version 1.0 (see accompanying file LICENSE_1_0.txt or a
 // copy at http://www.boost.org/LICENSE_1_0.txt).
 
-#ifndef BOOST_DETAIL_PP_KEYWORD_RETURN_HPP_
-#define BOOST_DETAIL_PP_KEYWORD_RETURN_HPP_
+#ifndef BOOST_CLOSURE_DETAIL_PP_KEYWORD_RETURN_HPP_
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_RETURN_HPP_
 
-#include "facility/is.hpp"
-#include "facility/add.hpp"
-#include "facility/remove.hpp"
+#include <boost/closure/detail/preprocessor/keyword/facility/is.hpp>
+#include <boost/closure/detail/preprocessor/keyword/facility/add.hpp>
+#include <boost/closure/detail/preprocessor/keyword/facility/remove.hpp>
+
+// PRIVATE //
 
 // These are not local macros -- DO NOT #UNDEF.
-#define BOOST_DETAIL_PP_KEYWORD_RETURN_IS_return (1) /* unary */
-#define return_BOOST_DETAIL_PP_KEYWORD_RETURN_IS (1) /* unary */
-#define BOOST_DETAIL_PP_KEYWORD_RETURN_REMOVE_return /* nothing */
-#define return_BOOST_DETAIL_PP_KEYWORD_RETURN_REMOVE /* nothing */
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_RETURN_IS_return (1) /* unary */
+#define return_BOOST_CLOSURE_DETAIL_PP_KEYWORD_RETURN_IS (1) /* unary */
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_RETURN_REMOVE_return /* nothing */
+#define return_BOOST_CLOSURE_DETAIL_PP_KEYWORD_RETURN_REMOVE /* nothing */
+
+// PUBLIC //
 
 // Is.
 
-#define BOOST_DETAIL_PP_KEYWORD_IS_RETURN_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
- BOOST_DETAIL_PP_KEYWORD_RETURN_IS_)
-
-#define BOOST_DETAIL_PP_KEYWORD_IS_RETURN_BACK(token) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_BACK(token, \
- _BOOST_DETAIL_PP_KEYWORD_RETURN_IS)
-
-// Rremove.
-
-#define BOOST_DETAIL_PP_KEYWORD_RETURN_REMOVE_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_RETURN_FRONT, \
- BOOST_DETAIL_PP_KEYWORD_RETURN_REMOVE_)
-
-#define BOOST_DETAIL_PP_KEYWORD_RETURN_REMOVE_BACK(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_BACK(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_RETURN_BACK, \
- _BOOST_DETAIL_PP_KEYWORD_RETURN_REMOVE)
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_RETURN_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_RETURN_IS_)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_RETURN_BACK(token) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_BACK(token, \
+ _BOOST_CLOSURE_DETAIL_PP_KEYWORD_RETURN_IS)
+
+// Remove.
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_RETURN_REMOVE_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_RETURN_FRONT, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_RETURN_REMOVE_)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_RETURN_REMOVE_BACK(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_BACK(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_RETURN_BACK, \
+ _BOOST_CLOSURE_DETAIL_PP_KEYWORD_RETURN_REMOVE)
 
 // Add.
 
-#define BOOST_DETAIL_PP_KEYWORD_RETURN_ADD_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_FRONT(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_RETURN_FRONT, return)
-
-#define BOOST_DETAIL_PP_KEYWORD_RETURN_ADD_BACK(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_BACK(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_RETURN_BACK, return)
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_RETURN_ADD_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_ADD_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_RETURN_FRONT, return)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_RETURN_ADD_BACK(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_ADD_BACK(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_RETURN_BACK, return)
 
 #endif // #include guard
 

Modified: sandbox/closure/boost/closure/detail/preprocessor/keyword/this.hpp
==============================================================================
--- sandbox/closure/boost/closure/detail/preprocessor/keyword/this.hpp (original)
+++ sandbox/closure/boost/closure/detail/preprocessor/keyword/this.hpp 2011-12-16 08:56:38 EST (Fri, 16 Dec 2011)
@@ -4,50 +4,54 @@
 // License, Version 1.0 (see accompanying file LICENSE_1_0.txt or a
 // copy at http://www.boost.org/LICENSE_1_0.txt).
 
-#ifndef BOOST_DETAIL_PP_KEYWORD_THIS_HPP_
-#define BOOST_DETAIL_PP_KEYWORD_THIS_HPP_
+#ifndef BOOST_CLOSURE_DETAIL_PP_KEYWORD_THIS_HPP_
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_THIS_HPP_
 
-#include "facility/is.hpp"
-#include "facility/add.hpp"
-#include "facility/remove.hpp"
+#include <boost/closure/detail/preprocessor/keyword/facility/is.hpp>
+#include <boost/closure/detail/preprocessor/keyword/facility/add.hpp>
+#include <boost/closure/detail/preprocessor/keyword/facility/remove.hpp>
+
+// PRIVATE //
 
 // These are not local macros -- DO NOT #UNDEF.
-#define BOOST_DETAIL_PP_KEYWORD_THIS_IS_this (1) /* unary */
-#define this_BOOST_DETAIL_PP_KEYWORD_THIS_IS (1) /* unary */
-#define BOOST_DETAIL_PP_KEYWORD_THIS_REMOVE_this /* nothing */
-#define this_BOOST_DETAIL_PP_KEYWORD_THIS_REMOVE /* nothing */
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_THIS_IS_this (1) /* unary */
+#define this_BOOST_CLOSURE_DETAIL_PP_KEYWORD_THIS_IS (1) /* unary */
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_THIS_REMOVE_this /* nothing */
+#define this_BOOST_CLOSURE_DETAIL_PP_KEYWORD_THIS_REMOVE /* nothing */
+
+// PUBLIC //
 
 // Is.
 
-#define BOOST_DETAIL_PP_KEYWORD_IS_THIS_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
- BOOST_DETAIL_PP_KEYWORD_THIS_IS_)
-
-#define BOOST_DETAIL_PP_KEYWORD_IS_THIS_BACK(token) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_BACK(token, \
- _BOOST_DETAIL_PP_KEYWORD_THIS_IS)
-
-// Rremove.
-
-#define BOOST_DETAIL_PP_KEYWORD_THIS_REMOVE_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_THIS_FRONT, \
- BOOST_DETAIL_PP_KEYWORD_THIS_REMOVE_)
-
-#define BOOST_DETAIL_PP_KEYWORD_THIS_REMOVE_BACK(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_BACK(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_THIS_BACK, \
- _BOOST_DETAIL_PP_KEYWORD_THIS_REMOVE)
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_THIS_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_THIS_IS_)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_THIS_BACK(token) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_BACK(token, \
+ _BOOST_CLOSURE_DETAIL_PP_KEYWORD_THIS_IS)
+
+// Remove.
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_THIS_REMOVE_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_THIS_FRONT, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_THIS_REMOVE_)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_THIS_REMOVE_BACK(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_BACK(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_THIS_BACK, \
+ _BOOST_CLOSURE_DETAIL_PP_KEYWORD_THIS_REMOVE)
 
 // Add.
 
-#define BOOST_DETAIL_PP_KEYWORD_THIS_ADD_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_FRONT(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_THIS_FRONT, this)
-
-#define BOOST_DETAIL_PP_KEYWORD_THIS_ADD_BACK(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_BACK(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_THIS_BACK, this)
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_THIS_ADD_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_ADD_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_THIS_FRONT, this)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_THIS_ADD_BACK(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_ADD_BACK(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_THIS_BACK, this)
 
 #endif // #include guard
 

Modified: sandbox/closure/boost/closure/detail/preprocessor/keyword/void.hpp
==============================================================================
--- sandbox/closure/boost/closure/detail/preprocessor/keyword/void.hpp (original)
+++ sandbox/closure/boost/closure/detail/preprocessor/keyword/void.hpp 2011-12-16 08:56:38 EST (Fri, 16 Dec 2011)
@@ -4,50 +4,54 @@
 // License, Version 1.0 (see accompanying file LICENSE_1_0.txt or a
 // copy at http://www.boost.org/LICENSE_1_0.txt).
 
-#ifndef BOOST_DETAIL_PP_KEYWORD_VOID_HPP_
-#define BOOST_DETAIL_PP_KEYWORD_VOID_HPP_
+#ifndef BOOST_CLOSURE_DETAIL_PP_KEYWORD_VOID_HPP_
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_VOID_HPP_
 
-#include "facility/is.hpp"
-#include "facility/add.hpp"
-#include "facility/remove.hpp"
+#include <boost/closure/detail/preprocessor/keyword/facility/is.hpp>
+#include <boost/closure/detail/preprocessor/keyword/facility/add.hpp>
+#include <boost/closure/detail/preprocessor/keyword/facility/remove.hpp>
+
+// PRIVATE //
 
 // These are not local macros -- DO NOT #UNDEF.
-#define BOOST_DETAIL_PP_KEYWORD_VOID_IS_void (1) /* unary */
-#define void_BOOST_DETAIL_PP_KEYWORD_VOID_IS (1) /* unary */
-#define BOOST_DETAIL_PP_KEYWORD_VOID_REMOVE_void /* nothing */
-#define void_BOOST_DETAIL_PP_KEYWORD_VOID_REMOVE /* nothing */
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_VOID_IS_void (1) /* unary */
+#define void_BOOST_CLOSURE_DETAIL_PP_KEYWORD_VOID_IS (1) /* unary */
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_VOID_REMOVE_void /* nothing */
+#define void_BOOST_CLOSURE_DETAIL_PP_KEYWORD_VOID_REMOVE /* nothing */
+
+// PUBLIC //
 
 // Is.
 
-#define BOOST_DETAIL_PP_KEYWORD_IS_VOID_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
- BOOST_DETAIL_PP_KEYWORD_VOID_IS_)
-
-#define BOOST_DETAIL_PP_KEYWORD_IS_VOID_BACK(token) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_IS_BACK(token, \
- _BOOST_DETAIL_PP_KEYWORD_VOID_IS)
-
-// Rremove.
-
-#define BOOST_DETAIL_PP_KEYWORD_VOID_REMOVE_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_VOID_FRONT, \
- BOOST_DETAIL_PP_KEYWORD_VOID_REMOVE_)
-
-#define BOOST_DETAIL_PP_KEYWORD_VOID_REMOVE_BACK(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_REMOVE_BACK(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_VOID_BACK, \
- _BOOST_DETAIL_PP_KEYWORD_VOID_REMOVE)
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_VOID_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_VOID_IS_)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_VOID_BACK(token) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_IS_BACK(token, \
+ _BOOST_CLOSURE_DETAIL_PP_KEYWORD_VOID_IS)
+
+// Remove.
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_VOID_REMOVE_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_VOID_FRONT, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_VOID_REMOVE_)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_VOID_REMOVE_BACK(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_REMOVE_BACK(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_VOID_BACK, \
+ _BOOST_CLOSURE_DETAIL_PP_KEYWORD_VOID_REMOVE)
 
 // Add.
 
-#define BOOST_DETAIL_PP_KEYWORD_VOID_ADD_FRONT(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_FRONT(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_VOID_FRONT, void)
-
-#define BOOST_DETAIL_PP_KEYWORD_VOID_ADD_BACK(tokens) \
- BOOST_DETAIL_PP_KEYWORD_FACILITY_ADD_BACK(tokens, \
- BOOST_DETAIL_PP_KEYWORD_IS_VOID_BACK, void)
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_VOID_ADD_FRONT(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_ADD_FRONT(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_VOID_FRONT, void)
+
+#define BOOST_CLOSURE_DETAIL_PP_KEYWORD_VOID_ADD_BACK(tokens) \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_FACILITY_ADD_BACK(tokens, \
+ BOOST_CLOSURE_DETAIL_PP_KEYWORD_IS_VOID_BACK, void)
 
 #endif // #include guard
 


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