|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r69368 - in sandbox/local: . boost/detail/preprocessor/variadic_macro_data boost/local boost/local/aux_/preprocessor/variadic
From: lorcaminiti_at_[hidden]
Date: 2011-02-27 19:39:19
Author: lcaminiti
Date: 2011-02-27 19:39:15 EST (Sun, 27 Feb 2011)
New Revision: 69368
URL: http://svn.boost.org/trac/boost/changeset/69368
Log:
Renamed varidaic macro files.
Added:
sandbox/local/xJamroot.jam
- copied unchanged from r69354, /sandbox/local/jamroot.jam
Removed:
sandbox/local/jamroot.jam
Text files modified:
sandbox/local/boost/detail/preprocessor/variadic_macro_data/vmd.hpp | 50 ++++++++++++++++++++--------------------
sandbox/local/boost/local/aux_/preprocessor/variadic/is.hpp | 3 +
sandbox/local/boost/local/aux_/preprocessor/variadic/size.hpp | 11 ++++----
sandbox/local/boost/local/aux_/preprocessor/variadic/to_seq.hpp | 2
sandbox/local/boost/local/block.hpp | 6 ++--
sandbox/local/boost/local/exit.hpp | 6 ++--
sandbox/local/boost/local/function.hpp | 6 ++--
7 files changed, 43 insertions(+), 41 deletions(-)
Modified: sandbox/local/boost/detail/preprocessor/variadic_macro_data/vmd.hpp
==============================================================================
--- sandbox/local/boost/detail/preprocessor/variadic_macro_data/vmd.hpp (original)
+++ sandbox/local/boost/detail/preprocessor/variadic_macro_data/vmd.hpp 2011-02-27 19:39:15 EST (Sun, 27 Feb 2011)
@@ -35,7 +35,7 @@
The value returned can be between 1 and 64.
*/
-#define BOODT_DETAIL_PP_VMD_DATA_SIZE(...) \
+#define BOOST_DETAIL_PP_VMD_DATA_SIZE(...) \
BOOST_DETAIL_PP_VMD_DETAIL_DATA_SIZE(__VA_ARGS__) \
/**/
@@ -54,7 +54,7 @@
preprocessing token.
*/
-#define BOODT_DETAIL_PP_VMD_DATA_ELEM(n,...) \
+#define BOOST_DETAIL_PP_VMD_DATA_ELEM(n,...) \
BOOST_DETAIL_PP_VMD_DETAIL_DATA_ELEM(n,__VA_ARGS__) \
/**/
@@ -70,7 +70,7 @@
data to a Boost PP library macro.
*/
-#define BOODT_DETAIL_PP_VMD_DATA_TO_PP_TUPLE(...) \
+#define BOOST_DETAIL_PP_VMD_DATA_TO_PP_TUPLE(...) \
BOOST_DETAIL_PP_VMD_DETAIL_DATA_TO_PP_TUPLE(__VA_ARGS__) \
/**/
@@ -86,7 +86,7 @@
data to a Boost PP library macro.
*/
-#define BOODT_DETAIL_PP_VMD_DATA_TO_PP_ARRAY(...) \
+#define BOOST_DETAIL_PP_VMD_DATA_TO_PP_ARRAY(...) \
BOOST_DETAIL_PP_VMD_DETAIL_DATA_TO_PP_ARRAY(__VA_ARGS__) \
/**/
@@ -102,7 +102,7 @@
data to a Boost PP library macro.
*/
-#define BOODT_DETAIL_PP_VMD_DATA_TO_PP_LIST(...) \
+#define BOOST_DETAIL_PP_VMD_DATA_TO_PP_LIST(...) \
BOOST_DETAIL_PP_VMD_DETAIL_DATA_TO_PP_LIST(__VA_ARGS__) \
/**/
@@ -118,7 +118,7 @@
data to a Boost PP library macro.
*/
-#define BOODT_DETAIL_PP_VMD_DATA_TO_PP_SEQ(...) \
+#define BOOST_DETAIL_PP_VMD_DATA_TO_PP_SEQ(...) \
BOOST_DETAIL_PP_VMD_DETAIL_DATA_TO_PP_SEQ(__VA_ARGS__) \
/**/
@@ -137,7 +137,7 @@
calculated from the tuple itself.
*/
-#define BOODT_DETAIL_PP_VMD_PP_TUPLE_SIZE(tuple) \
+#define BOOST_DETAIL_PP_VMD_PP_TUPLE_SIZE(tuple) \
BOOST_DETAIL_PP_VMD_DETAIL_PP_TUPLE_SIZE(tuple) \
/**/
@@ -163,8 +163,8 @@
macro without the necessity of having to pass a size.
*/
-#define BOODT_DETAIL_PP_VMD_PP_TUPLE_ELEM(n,tuple) \
- BOOST_DETAIL_PP_VMD_DETAIL_PP_TUPLE_ELEM(BOODT_DETAIL_PP_VMD_PP_TUPLE_SIZE(tuple),n,tuple) \
+#define BOOST_DETAIL_PP_VMD_PP_TUPLE_ELEM(n,tuple) \
+ BOOST_DETAIL_PP_VMD_DETAIL_PP_TUPLE_ELEM(BOOST_DETAIL_PP_VMD_PP_TUPLE_SIZE(tuple),n,tuple) \
/**/
/// Expands to a series of tokens which are equivalent to removing the parentheses from a tuple.
@@ -175,7 +175,7 @@
returns = a series of comma-separated tokens equivalent to removing the parentheses from a tuple.
This result is actually equivalent to the form of variadic macro data
- and can be used as an alternative to BOODT_DETAIL_PP_VMD_PP_TUPLE_TO_DATA to convert
+ and can be used as an alternative to BOOST_DETAIL_PP_VMD_PP_TUPLE_TO_DATA to convert
the tuple to variadic macro data.
In the Boost PP library there is no way to calculate
@@ -188,8 +188,8 @@
macro without the necessity of having to pass a size.
*/
-#define BOODT_DETAIL_PP_VMD_PP_TUPLE_REM_CTOR(tuple) \
- BOOST_DETAIL_PP_VMD_DETAIL_PP_TUPLE_REM_CTOR(BOODT_DETAIL_PP_VMD_PP_TUPLE_SIZE(tuple),tuple) \
+#define BOOST_DETAIL_PP_VMD_PP_TUPLE_REM_CTOR(tuple) \
+ BOOST_DETAIL_PP_VMD_DETAIL_PP_TUPLE_REM_CTOR(BOOST_DETAIL_PP_VMD_PP_TUPLE_SIZE(tuple),tuple) \
/**/
/// Expands to a tuple whose elements are in reversed order.
@@ -210,8 +210,8 @@
macro without the necessity of having to pass a size.
*/
-#define BOODT_DETAIL_PP_VMD_PP_TUPLE_REVERSE(tuple) \
- BOOST_DETAIL_PP_VMD_DETAIL_PP_TUPLE_REVERSE(BOODT_DETAIL_PP_VMD_PP_TUPLE_SIZE(tuple),tuple) \
+#define BOOST_DETAIL_PP_VMD_PP_TUPLE_REVERSE(tuple) \
+ BOOST_DETAIL_PP_VMD_DETAIL_PP_TUPLE_REVERSE(BOOST_DETAIL_PP_VMD_PP_TUPLE_SIZE(tuple),tuple) \
/**/
/// Expands to a list whose elements are the same as a tuple.
@@ -232,8 +232,8 @@
macro without the necessity of having to pass a size.
*/
-#define BOODT_DETAIL_PP_VMD_PP_TUPLE_TO_LIST(tuple) \
- BOOST_DETAIL_PP_VMD_DETAIL_PP_TUPLE_TO_LIST(BOODT_DETAIL_PP_VMD_PP_TUPLE_SIZE(tuple),tuple) \
+#define BOOST_DETAIL_PP_VMD_PP_TUPLE_TO_LIST(tuple) \
+ BOOST_DETAIL_PP_VMD_DETAIL_PP_TUPLE_TO_LIST(BOOST_DETAIL_PP_VMD_PP_TUPLE_SIZE(tuple),tuple) \
/**/
/// Expands to a sequence whose elements are the same as a tuple.
@@ -254,8 +254,8 @@
macro without the necessity of having to pass a size.
*/
-#define BOODT_DETAIL_PP_VMD_PP_TUPLE_TO_SEQ(tuple) \
- BOOST_DETAIL_PP_VMD_DETAIL_PP_TUPLE_TO_SEQ(BOODT_DETAIL_PP_VMD_PP_TUPLE_SIZE(tuple),tuple) \
+#define BOOST_DETAIL_PP_VMD_PP_TUPLE_TO_SEQ(tuple) \
+ BOOST_DETAIL_PP_VMD_DETAIL_PP_TUPLE_TO_SEQ(BOOST_DETAIL_PP_VMD_PP_TUPLE_SIZE(tuple),tuple) \
/**/
/// Expands to variadic macro data whose arguments are the same as a tuple's elements.
@@ -272,7 +272,7 @@
of a final variadic macro data '...' macro parameter.
*/
-#define BOODT_DETAIL_PP_VMD_PP_TUPLE_TO_DATA(tuple) \
+#define BOOST_DETAIL_PP_VMD_PP_TUPLE_TO_DATA(tuple) \
BOOST_DETAIL_PP_VMD_DETAIL_PP_TUPLE_TO_DATA(tuple) \
/**/
@@ -290,8 +290,8 @@
of a final variadic macro data '...' macro parameter.
*/
-#define BOODT_DETAIL_PP_VMD_PP_ARRAY_TO_DATA(array) \
- BOODT_DETAIL_PP_VMD_PP_TUPLE_TO_DATA(BOOST_PP_ARRAY_DATA(array)) \
+#define BOOST_DETAIL_PP_VMD_PP_ARRAY_TO_DATA(array) \
+ BOOST_DETAIL_PP_VMD_PP_TUPLE_TO_DATA(BOOST_PP_ARRAY_DATA(array)) \
/**/
/// Expands to variadic macro data whose arguments are the same as a list's elements.
@@ -308,8 +308,8 @@
of a final variadic macro data '...' macro parameter.
*/
-#define BOODT_DETAIL_PP_VMD_PP_LIST_TO_DATA(list) \
- BOODT_DETAIL_PP_VMD_PP_TUPLE_TO_DATA(BOOST_PP_LIST_TO_TUPLE(list)) \
+#define BOOST_DETAIL_PP_VMD_PP_LIST_TO_DATA(list) \
+ BOOST_DETAIL_PP_VMD_PP_TUPLE_TO_DATA(BOOST_PP_LIST_TO_TUPLE(list)) \
/**/
/// Expands to variadic macro data whose arguments are the same as a sequence's elements.
@@ -326,8 +326,8 @@
of a final variadic macro data '...' macro parameter.
*/
-#define BOODT_DETAIL_PP_VMD_PP_SEQ_TO_DATA(seq) \
- BOODT_DETAIL_PP_VMD_PP_TUPLE_TO_DATA(BOOST_PP_SEQ_TO_TUPLE(seq)) \
+#define BOOST_DETAIL_PP_VMD_PP_SEQ_TO_DATA(seq) \
+ BOOST_DETAIL_PP_VMD_PP_TUPLE_TO_DATA(BOOST_PP_SEQ_TO_TUPLE(seq)) \
/**/
#endif // BOOST_NO_VARIADIC_MACROS
Modified: sandbox/local/boost/local/aux_/preprocessor/variadic/is.hpp
==============================================================================
--- sandbox/local/boost/local/aux_/preprocessor/variadic/is.hpp (original)
+++ sandbox/local/boost/local/aux_/preprocessor/variadic/is.hpp 2011-02-27 19:39:15 EST (Sun, 27 Feb 2011)
@@ -11,7 +11,8 @@
#include <boost/preprocessor/logical/not.hpp>
#include <boost/preprocessor/control/if.hpp>
#include <boost/preprocessor/comparison/greater.hpp>
-#include <boost/preprocessor/facilities/is_unary.hpp>
+// `IS_UNARY` not working on Borland and other pp which have no variadic anyway.
+#include <boost/preprocessor/detail/is_unary.hpp>
// PRIVATE //
Modified: sandbox/local/boost/local/aux_/preprocessor/variadic/size.hpp
==============================================================================
--- sandbox/local/boost/local/aux_/preprocessor/variadic/size.hpp (original)
+++ sandbox/local/boost/local/aux_/preprocessor/variadic/size.hpp 2011-02-27 19:39:15 EST (Sun, 27 Feb 2011)
@@ -8,11 +8,12 @@
#include "eat.hpp"
#include <boost/detail/preprocessor/variadic_macro_data/vmd.hpp>
-#include <boost/preprcoessor/control/iif.hpp>
-#include <boost/preprcoessor/comparison/equal.hpp>
-#include <boost/preprcoessor/facilities/empty.hpp>
-#include <boost/preprcoessor/facilities/is_empty.hpp>
-#include <boost/preprcoessor/facilities/is_empty.hpp>
+#include <boost/preprocessor/control/iif.hpp>
+#include <boost/preprocessor/comparison/equal.hpp>
+#include <boost/preprocessor/facilities/empty.hpp>
+#include <boost/preprocessor/facilities/is_empty.hpp>
+// `IS_UNARY` not working on Borland and other pp which have no variadic anyway.
+#include <boost/preprocessor/detail/is_unary.hpp>
// PRIVATE //
Modified: sandbox/local/boost/local/aux_/preprocessor/variadic/to_seq.hpp
==============================================================================
--- sandbox/local/boost/local/aux_/preprocessor/variadic/to_seq.hpp (original)
+++ sandbox/local/boost/local/aux_/preprocessor/variadic/to_seq.hpp 2011-02-27 19:39:15 EST (Sun, 27 Feb 2011)
@@ -17,7 +17,7 @@
#define BOOST_LOCAL_AUX_PP_VARIADIC_TO_SEQ_NOT_EMPTY_(...) \
BOOST_PP_IIF(BOOST_LOCAL_AUX_PP_IS_VARIADIC(__VA_ARGS__), \
- BOOST_DETAIL_PP_VMD_DATA_TO_SEQ \
+ BOOST_DETAIL_PP_VMD_DATA_TO_PP_SEQ \
, \
BOOST_LOCAL_AUX_PP_VARIADIC_SAME \
)(__VA_ARGS__)
Modified: sandbox/local/boost/local/block.hpp
==============================================================================
--- sandbox/local/boost/local/block.hpp (original)
+++ sandbox/local/boost/local/block.hpp 2011-02-27 19:39:15 EST (Sun, 27 Feb 2011)
@@ -73,16 +73,16 @@
#else // BOOST_NO_VARIADIC_MACROS
-#include "aux_/preprocessor/va.hpp"
+#include "aux_/preprocessor/variadic/to_seq.hpp"
#define BOOST_LOCAL_BLOCK(...) \
BOOST_LOCAL_AUX_BLOCK(BOOST_LOCAL_FUNCTION_PARAMS, \
- BOOST_LOCAL_AUX_PP_VA_TO_SEQ( \
+ BOOST_LOCAL_AUX_PP_VARIADIC_TO_SEQ( \
(void) /* for empty seq */, __VA_ARGS__))
#define BOOST_LOCAL_BLOCK_TPL(...) \
BOOST_LOCAL_AUX_BLOCK(BOOST_LOCAL_FUNCTION_PARAMS_TPL, \
- BOOST_LOCAL_AUX_PP_VA_TO_SEQ( \
+ BOOST_LOCAL_AUX_PP_VARIADIC_TO_SEQ( \
(void) /* for empty seq */, __VA_ARGS__))
#endif // BOOST_NO_VARIADIC_MACROS
Modified: sandbox/local/boost/local/exit.hpp
==============================================================================
--- sandbox/local/boost/local/exit.hpp (original)
+++ sandbox/local/boost/local/exit.hpp 2011-02-27 19:39:15 EST (Sun, 27 Feb 2011)
@@ -75,16 +75,16 @@
#else // BOOST_NO_VARIADIC_MACROS
-#include "aux_/preprocessor/va.hpp"
+#include "aux_/preprocessor/variadic/to_seq.hpp"
#define BOOST_LOCAL_EXIT(...) \
BOOST_LOCAL_AUX_EXIT(BOOST_LOCAL_FUNCTION_PARAMS, \
- BOOST_LOCAL_AUX_PP_VA_TO_SEQ( \
+ BOOST_LOCAL_AUX_PP_VARIADIC_TO_SEQ( \
(void) /* for empty seq */, __VA_ARGS__))
#define BOOST_LOCAL_EXIT_TPL(...) \
BOOST_LOCAL_AUX_EXIT(BOOST_LOCAL_FUNCTION_PARAMS_TPL, \
- BOOST_LOCAL_AUX_PP_VA_TO_SEQ( \
+ BOOST_LOCAL_AUX_PP_VARIADIC_TO_SEQ( \
(void) /* for empty seq */, __VA_ARGS__))
#endif // BOOST_NO_VARIADIC_MACROS
Modified: sandbox/local/boost/local/function.hpp
==============================================================================
--- sandbox/local/boost/local/function.hpp (original)
+++ sandbox/local/boost/local/function.hpp 2011-02-27 19:39:15 EST (Sun, 27 Feb 2011)
@@ -29,15 +29,15 @@
#else // BOOST_NO_VARIADIC_MACROS
-#include "aux_/preprocessor/va.hpp"
+#include "aux_/preprocessor/variadic/to_seq.hpp"
#define BOOST_LOCAL_FUNCTION_PARAMS(...) \
- BOOST_LOCAL_AUX_FUNCTION_PARAMS(BOOST_LOCAL_AUX_PP_VA_TO_SEQ( \
+ BOOST_LOCAL_AUX_FUNCTION_PARAMS(BOOST_LOCAL_AUX_PP_VARIADIC_TO_SEQ( \
(void) /* for empty seq */, __VA_ARGS__), \
__LINE__, 0 /* no template */)
#define BOOST_LOCAL_FUNCTION_PARAMS_TPL(...) \
- BOOST_LOCAL_AUX_FUNCTION_PARAMS(BOOST_LOCAL_AUX_PP_VA_TO_SEQ( \
+ BOOST_LOCAL_AUX_FUNCTION_PARAMS(BOOST_LOCAL_AUX_PP_VARIADIC_TO_SEQ( \
(void) /* for empty seq */, __VA_ARGS__), \
__LINE__, 1 /* template */)
Deleted: sandbox/local/jamroot.jam
==============================================================================
--- sandbox/local/jamroot.jam 2011-02-27 19:39:15 EST (Sun, 27 Feb 2011)
+++ (empty file)
@@ -1,18 +0,0 @@
-
-# Copyright (C) 2009-2011 Lorenzo Caminiti
-# Use, modification, and distribution is subject to the
-# Boost Software License, Version 1.0
-# (see accompanying file LICENSE_1_0.txt or a copy at
-# http://www.boost.org/LICENSE_1_0.txt).
-
-import os ;
-
-local BOOST_ROOT = [ os.environ BOOST_ROOT ] ;
-
-project
- : requirements
- <include>"." # For this library within Boost libraries.
- <include>"src" # For this library within Contract++.
- <include>$(BOOST_ROOT) # Boost libraries.
- ;
-
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