|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r73478 - in sandbox/variadic_macro_data: boost/variadic_macro_data boost/variadic_macro_data/detail libs/variadic_macro_data/test
From: eldiener_at_[hidden]
Date: 2011-08-01 12:42:59
Author: eldiener
Date: 2011-08-01 12:42:57 EDT (Mon, 01 Aug 2011)
New Revision: 73478
URL: http://svn.boost.org/trac/boost/changeset/73478
Log:
Updated tests and macros.
Text files modified:
sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail.hpp | 4 ++--
sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_common.hpp | 4 ----
sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_native.hpp | 22 ++++------------------
sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_pplib.hpp | 14 --------------
sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_setup.hpp | 2 +-
sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_common.hpp | 2 +-
sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_native.hpp | 8 ++++----
sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_pplib.hpp | 8 ++++----
sandbox/variadic_macro_data/libs/variadic_macro_data/test/Jamfile.v2 | 5 ++++-
sandbox/variadic_macro_data/libs/variadic_macro_data/test/test_data_as_array.cpp | 4 ++--
sandbox/variadic_macro_data/libs/variadic_macro_data/test/test_data_as_list.cpp | 4 ++--
sandbox/variadic_macro_data/libs/variadic_macro_data/test/test_data_as_sequence.cpp | 4 ++--
sandbox/variadic_macro_data/libs/variadic_macro_data/test/test_data_as_tuple.cpp | 4 ++--
13 files changed, 28 insertions(+), 57 deletions(-)
Modified: sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail.hpp
==============================================================================
--- sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail.hpp (original)
+++ sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail.hpp 2011-08-01 12:42:57 EDT (Mon, 01 Aug 2011)
@@ -13,5 +13,5 @@
#include "vmd_detail_common.hpp"
-#endif // BOOST_VMD_VARIADICS
-#endif // VMD_DETAIL_HPP
+#endif /* BOOST_VMD_VARIADICS */
+#endif /* VMD_DETAIL_HPP */
Modified: sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_common.hpp
==============================================================================
--- sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_common.hpp (original)
+++ sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_common.hpp 2011-08-01 12:42:57 EDT (Mon, 01 Aug 2011)
@@ -11,10 +11,6 @@
#if BOOST_VMD_MSVC
-# define VMD_DETAIL_IS_EMPTY_IS_TUPLE_BEGIN_EXPAND(...) \
- 1,1 \
-/**/
-
# define VMD_DETAIL_IS_EMPTY_GEN_ZERO(x) 0
# define VMD_DETAIL_IS_EMPTY_PRIMITIVE_CAT(a, b) a ## b
# define VMD_DETAIL_IS_EMPTY_IIF_0(t, b) b
Modified: sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_native.hpp
==============================================================================
--- sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_native.hpp (original)
+++ sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_native.hpp 2011-08-01 12:42:57 EDT (Mon, 01 Aug 2011)
@@ -12,7 +12,7 @@
#include <boost/preprocessor/tuple/to_seq.hpp>
#include <boost/preprocessor/tuple/rem.hpp>
-#if defined(BOOST_VMD_MSVC)
+#if BOOST_VMD_MSVC
#include <boost/preprocessor/arithmetic/dec.hpp>
#include <boost/preprocessor/facilities/empty.hpp>
#if ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MWCC()
@@ -27,7 +27,7 @@
#define VMD_DETAIL_VD_CAT_I(a, b) VMD_DETAIL_VD_CAT_II(a ## b)
#define VMD_DETAIL_VD_CAT_II(res) res
#endif
-#endif // defined(BOOST_VMD_MSVC)
+#endif // BOOST_VMD_MSVC
#define VMD_DETAIL_DATA_ELEM_0(p0, ...) p0
#define VMD_DETAIL_DATA_ELEM_1(p0, p1, ...) p1
@@ -127,7 +127,7 @@
#define VMD_DETAIL_PP_TUPLE_TO_DATA(tuple) \
VMD_DETAIL_REMOVE_TUPLE_PARENS tuple \
/**/
-#if defined(BOOST_VMD_MSVC)
+#if BOOST_VMD_MSVC
#define VMD_DETAIL_DATA_SIZE(...) \
VMD_DETAIL_VD_CAT(VMD_DETAIL_APPLY(VMD_DETAIL_ARG_N, (__VA_ARGS__, VMD_DETAIL_RSEQ_N())),BOOST_PP_EMPTY()) \
/**/
@@ -141,7 +141,7 @@
/**/
#define VMD_DETAIL_CAT(a, ...) VMD_DETAIL_PRIMITIVE_CAT(a, __VA_ARGS__)
#define VMD_DETAIL_PRIMITIVE_CAT(a, ...) a ## __VA_ARGS__
-#if defined(BOOST_VMD_MSVC)
+#if BOOST_VMD_MSVC
#define VMD_DETAIL_DATA_ELEM(n,...) \
VMD_DETAIL_VD_CAT(VMD_DETAIL_CAT(VMD_DETAIL_DATA_ELEM_, n)(__VA_ARGS__,),BOOST_PP_EMPTY()) \
/**/
@@ -178,19 +178,5 @@
BOOST_PP_IDENTITY(VMD_DETAIL_PP_TUPLE_TO_DATA(x)) \
/**/
-#if defined(BOOST_VMD_MSVC)
-
-# define VMD_DETAIL_IS_EMPTY_IS_TUPLE_BEGIN(x) \
- BOOST_PP_DEC \
- ( \
- VMD_DETAIL_DATA_SIZE \
- ( \
- VMD_DETAIL_IS_EMPTY_IS_TUPLE_BEGIN_EXPAND x \
- ) \
- ) \
-/**/
-
-#endif /* BOOST_VMD_MSVC */
-
#endif // BOOST_VMD_VARIADICS
#endif // VMD_DETAIL_NATIVE_HPP
Modified: sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_pplib.hpp
==============================================================================
--- sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_pplib.hpp (original)
+++ sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_pplib.hpp 2011-08-01 12:42:57 EDT (Mon, 01 Aug 2011)
@@ -18,19 +18,5 @@
BOOST_PP_IDENTITY(BOOST_PP_TUPLE_ENUM(x)) \
/**/
-#if BOOST_VMD_MSVC
-
-# define VMD_DETAIL_IS_EMPTY_IS_TUPLE_BEGIN(x) \
- BOOST_PP_DEC \
- ( \
- BOOST_PP_VARIADIC_SIZE \
- ( \
- VMD_DETAIL_IS_EMPTY_IS_TUPLE_BEGIN_EXPAND x \
- ) \
- ) \
-/**/
-
-#endif /* BOOST_PP_VARIADICS_MSVC */
-
#endif // BOOST_VMD_VARIADICS
#endif // VMD_DETAIL_PPLIB_HPP
Modified: sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_setup.hpp
==============================================================================
--- sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_setup.hpp (original)
+++ sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_setup.hpp 2011-08-01 12:42:57 EDT (Mon, 01 Aug 2011)
@@ -29,4 +29,4 @@
#endif /* BOOST_NO_VARIADIC_MACROS */
#endif /* BOOST_VMD_VARIADICS */
-#endif // VMD_DETAIL_SETUP_HPP
+#endif /* VMD_DETAIL_SETUP_HPP */
Modified: sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_common.hpp
==============================================================================
--- sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_common.hpp (original)
+++ sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_common.hpp 2011-08-01 12:42:57 EDT (Mon, 01 Aug 2011)
@@ -59,7 +59,7 @@
) \
/**/
-#endif
+#endif /* BOOST_VMD_MSVC */
#endif // BOOST_VMD_VARIADICS
#endif // VMD_COMMON_HPP
Modified: sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_native.hpp
==============================================================================
--- sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_native.hpp (original)
+++ sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_native.hpp 2011-08-01 12:42:57 EDT (Mon, 01 Aug 2011)
@@ -340,7 +340,7 @@
if the parameter is not a tuple.
*/
-# define BOOST_VMD_IS_TUPLE_BEGIN(param) \
+#define BOOST_VMD_IS_TUPLE_BEGIN(param) \
BOOST_PP_DEC \
( \
BOOST_VMD_DATA_SIZE \
@@ -352,20 +352,20 @@
#if BOOST_VMD_MSVC
-# define BOOST_VMD_IS_EMPTY(param) \
+#define BOOST_VMD_IS_EMPTY(param) \
VMD_DETAIL_IS_EMPTY_IIF \
( \
BOOST_PP_DEC \
( \
BOOST_VMD_DATA_SIZE \
( \
- VMD_DETAIL_IS_EMPTY_IS_TUPLE_BEGIN_EXPAND param \
+ VMD_DETAIL_IS_TUPLE_BEGIN_EXPAND param \
) \
) \
) \
( \
VMD_DETAIL_IS_EMPTY_GEN_ZERO, \
- VMD_DETAIL_IS_EMPTY_IS_TUPLE_BEGIN \
+ BOOST_VMD_IS_TUPLE_BEGIN \
) \
(VMD_DETAIL_IS_EMPTY_NON_FUNCTION_C param ()) \
/**/
Modified: sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_pplib.hpp
==============================================================================
--- sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_pplib.hpp (original)
+++ sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_pplib.hpp 2011-08-01 12:42:57 EDT (Mon, 01 Aug 2011)
@@ -355,7 +355,7 @@
*/
-# define BOOST_VMD_IS_TUPLE_BEGIN(param) \
+#define BOOST_VMD_IS_TUPLE_BEGIN(param) \
BOOST_PP_DEC \
( \
BOOST_PP_VARIADIC_SIZE \
@@ -367,20 +367,20 @@
#if BOOST_VMD_MSVC
-# define BOOST_VMD_IS_EMPTY(param) \
+#define BOOST_VMD_IS_EMPTY(param) \
VMD_DETAIL_IS_EMPTY_IIF \
( \
BOOST_PP_DEC \
( \
BOOST_PP_VARIADIC_SIZE \
( \
- VMD_DETAIL_IS_EMPTY_IS_TUPLE_BEGIN_EXPAND param \
+ VMD_DETAIL_IS_TUPLE_BEGIN_EXPAND param \
) \
) \
) \
( \
VMD_DETAIL_IS_EMPTY_GEN_ZERO, \
- VMD_DETAIL_IS_EMPTY_IS_TUPLE_BEGIN \
+ BOOST_VMD_IS_TUPLE_BEGIN \
) \
(VMD_DETAIL_IS_EMPTY_NON_FUNCTION_C param ()) \
/**/
Modified: sandbox/variadic_macro_data/libs/variadic_macro_data/test/Jamfile.v2
==============================================================================
--- sandbox/variadic_macro_data/libs/variadic_macro_data/test/Jamfile.v2 (original)
+++ sandbox/variadic_macro_data/libs/variadic_macro_data/test/Jamfile.v2 2011-08-01 12:42:57 EDT (Mon, 01 Aug 2011)
@@ -31,6 +31,7 @@
[ run test_data_as_sequence.cpp ]
[ run test_tuple_begin.cpp ]
[ run test_remove_parens.cpp ]
+ [ run test_is_empty.cpp ]
;
test-suite variadic_macro_data_pplib
@@ -56,5 +57,7 @@
[ run test_remove_parens.cpp : : :
<define>BOOST_VMD_PPLIB=1 :
test_remove_parens_pplib ]
-
+ [ run test_is_empty.cpp : : :
+ <define>BOOST_VMD_PPLIB=1 :
+ test_is_empty_pplib ]
;
Modified: sandbox/variadic_macro_data/libs/variadic_macro_data/test/test_data_as_array.cpp
==============================================================================
--- sandbox/variadic_macro_data/libs/variadic_macro_data/test/test_data_as_array.cpp (original)
+++ sandbox/variadic_macro_data/libs/variadic_macro_data/test/test_data_as_array.cpp 2011-08-01 12:42:57 EDT (Mon, 01 Aug 2011)
@@ -34,7 +34,7 @@
} \
/**/
-#if defined(BOOST_VMD_MSVC)
+#if BOOST_VMD_MSVC
#pragma warning( push )
#pragma warning( disable : 4127 )
@@ -43,7 +43,7 @@
BOOST_PP_REPEAT(BOOST_PP_ARRAY_SIZE(VMD_TEST_ARRAY_NUMBERS),VMD_TEST_ADD_TO_INT,VMD_TEST_ARRAY_NUMBERS)
-#if defined(BOOST_VMD_MSVC)
+#if BOOST_VMD_MSVC
#pragma warning( pop )
Modified: sandbox/variadic_macro_data/libs/variadic_macro_data/test/test_data_as_list.cpp
==============================================================================
--- sandbox/variadic_macro_data/libs/variadic_macro_data/test/test_data_as_list.cpp (original)
+++ sandbox/variadic_macro_data/libs/variadic_macro_data/test/test_data_as_list.cpp 2011-08-01 12:42:57 EDT (Mon, 01 Aug 2011)
@@ -33,7 +33,7 @@
} \
/**/
-#if defined(BOOST_VMD_MSVC)
+#if BOOST_VMD_MSVC
#pragma warning( push )
#pragma warning( disable : 4127 )
@@ -42,7 +42,7 @@
BOOST_PP_REPEAT(BOOST_PP_LIST_SIZE(VMD_TEST_LIST_NUMBERS),VMD_TEST_ADD_TO_INT,VMD_TEST_LIST_NUMBERS)
-#if defined(BOOST_VMD_MSVC)
+#if BOOST_VMD_MSVC
#pragma warning( pop )
Modified: sandbox/variadic_macro_data/libs/variadic_macro_data/test/test_data_as_sequence.cpp
==============================================================================
--- sandbox/variadic_macro_data/libs/variadic_macro_data/test/test_data_as_sequence.cpp (original)
+++ sandbox/variadic_macro_data/libs/variadic_macro_data/test/test_data_as_sequence.cpp 2011-08-01 12:42:57 EDT (Mon, 01 Aug 2011)
@@ -33,7 +33,7 @@
} \
/**/
-#if defined(BOOST_VMD_MSVC)
+#if BOOST_VMD_MSVC
#pragma warning( push )
#pragma warning( disable : 4127 )
@@ -42,7 +42,7 @@
BOOST_PP_REPEAT(BOOST_PP_SEQ_SIZE(VMD_TEST_SEQ_NUMBERS),VMD_TEST_ADD_TO_INT,VMD_TEST_SEQ_NUMBERS)
-#if defined(BOOST_VMD_MSVC)
+#if BOOST_VMD_MSVC
#pragma warning( pop )
Modified: sandbox/variadic_macro_data/libs/variadic_macro_data/test/test_data_as_tuple.cpp
==============================================================================
--- sandbox/variadic_macro_data/libs/variadic_macro_data/test/test_data_as_tuple.cpp (original)
+++ sandbox/variadic_macro_data/libs/variadic_macro_data/test/test_data_as_tuple.cpp 2011-08-01 12:42:57 EDT (Mon, 01 Aug 2011)
@@ -43,7 +43,7 @@
} \
/**/
-#if defined(BOOST_VMD_MSVC)
+#if BOOST_VMD_MSVC
#pragma warning( push )
#pragma warning( disable : 4127 )
@@ -52,7 +52,7 @@
BOOST_PP_REPEAT(BOOST_VMD_PP_TUPLE_SIZE(VMD_TEST_TUPLE_NUMBERS),VMD_TEST_ADD_TO_INT,VMD_TEST_TUPLE_NUMBERS)
-#if defined(BOOST_VMD_MSVC)
+#if BOOST_VMD_MSVC
#pragma warning( pop )
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