Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r73513 - 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-03 13:35:10


Author: eldiener
Date: 2011-08-03 13:35:08 EDT (Wed, 03 Aug 2011)
New Revision: 73513
URL: http://svn.boost.org/trac/boost/changeset/73513

Log:
Separation of is_tuple_begin into own header files.
Added:
   sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail.hpp (contents, props changed)
   sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_common.hpp (contents, props changed)
   sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_is_tuple_begin.hpp (contents, props changed)
   sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_is_tuple_begin_common.hpp (contents, props changed)
   sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_is_tuple_begin_native.hpp (contents, props changed)
   sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_is_tuple_begin_pplib.hpp (contents, props changed)
Text files modified:
   sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_main_common.hpp | 4 ----
   sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_main_pplib.hpp | 3 ++-
   sandbox/variadic_macro_data/boost/variadic_macro_data/vmd.hpp | 1 +
   sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_main_common.hpp | 12 ------------
   sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_main_native.hpp | 27 ++-------------------------
   sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_main_pplib.hpp | 28 ++--------------------------
   sandbox/variadic_macro_data/libs/variadic_macro_data/test/test_tuple_begin.cpp | 2 +-
   7 files changed, 8 insertions(+), 69 deletions(-)

Added: sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail.hpp
==============================================================================
--- (empty file)
+++ sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail.hpp 2011-08-03 13:35:08 EDT (Wed, 03 Aug 2011)
@@ -0,0 +1,11 @@
+#if !defined(VMD_DETAIL_HPP)
+#define VMD_DETAIL_HPP
+
+#include "vmd_detail_setup.hpp"
+
+#if BOOST_VMD_VARIADICS
+
+#include "vmd_detail_common.hpp"
+
+#endif /* BOOST_VMD_VARIADICS */
+#endif /* VMD_DETAIL_HPP */

Added: sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_common.hpp
==============================================================================
--- (empty file)
+++ sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_common.hpp 2011-08-03 13:35:08 EDT (Wed, 03 Aug 2011)
@@ -0,0 +1,13 @@
+#if !defined(VMD_DETAIL_COMMON_HPP)
+#define VMD_DETAIL_COMMON_HPP
+
+#include "vmd_detail_setup.hpp"
+
+#if BOOST_VMD_VARIADICS
+
+#define VMD_DETAIL_COMMON_EXPAND(...) \
+ 1,1 \
+/**/
+
+#endif /* BOOST_VMD_VARIADICS */
+#endif /* VMD_DETAIL_COMMON_HPP */

Modified: sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_main_common.hpp
==============================================================================
--- sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_main_common.hpp (original)
+++ sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_main_common.hpp 2011-08-03 13:35:08 EDT (Wed, 03 Aug 2011)
@@ -5,10 +5,6 @@
 
 #if BOOST_VMD_VARIADICS
 
-#define VMD_DETAIL_IS_TUPLE_BEGIN_EXPAND(...) \
- 1,1 \
-/**/
-
 #if BOOST_VMD_MSVC
 
 #define VMD_DETAIL_IS_EMPTY_GEN_ZERO(x) 0

Modified: sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_main_pplib.hpp
==============================================================================
--- sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_main_pplib.hpp (original)
+++ sandbox/variadic_macro_data/boost/variadic_macro_data/detail/vmd_detail_main_pplib.hpp 2011-08-03 13:35:08 EDT (Wed, 03 Aug 2011)
@@ -12,6 +12,7 @@
 
 #include <boost/preprocessor/arithmetic/dec.hpp>
 #include <boost/preprocessor/variadic/size.hpp>
+#include "vmd_detail.hpp"
 
 #define VMD_DETAIL_IS_EMPTY_VSIZE(...) VMD_DETAIL_IS_EMPTY_VSIZE2(__VA_ARGS__)
 #define VMD_DETAIL_IS_EMPTY_VSIZE2(...) VMD_DETAIL_IS_EMPTY_VSIZE3(__VA_ARGS__)
@@ -22,7 +23,7 @@
       ( \
       VMD_DETAIL_IS_EMPTY_VSIZE \
         ( \
- VMD_DETAIL_IS_TUPLE_BEGIN_EXPAND param \
+ VMD_DETAIL_COMMON_EXPAND param \
         ) \
       ) \
 /**/

Modified: sandbox/variadic_macro_data/boost/variadic_macro_data/vmd.hpp
==============================================================================
--- sandbox/variadic_macro_data/boost/variadic_macro_data/vmd.hpp (original)
+++ sandbox/variadic_macro_data/boost/variadic_macro_data/vmd.hpp 2011-08-03 13:35:08 EDT (Wed, 03 Aug 2011)
@@ -6,6 +6,7 @@
 #if BOOST_VMD_VARIADICS
 
 #include "vmd_main.hpp"
+#include "vmd_is_tuple_begin.hpp"
 
 #endif /* BOOST_VMD_VARIADICS */
 #endif /* VARIADIC_MACRO_DATA_HPP */

Added: sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_is_tuple_begin.hpp
==============================================================================
--- (empty file)
+++ sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_is_tuple_begin.hpp 2011-08-03 13:35:08 EDT (Wed, 03 Aug 2011)
@@ -0,0 +1,17 @@
+#if !defined(VMD_IS_TUPLE_BEGIN_HPP)
+#define VMD_IS_TUPLE_BEGIN_HPP
+
+#include "detail/vmd_detail_setup.hpp"
+
+#if BOOST_VMD_VARIADICS
+
+#if BOOST_VMD_PPLIB
+#include "vmd_is_tuple_begin_pplib.hpp"
+#else
+#include "vmd_is_tuple_begin_native.hpp"
+#endif /* BOOST_VMD_PPLIB */
+
+#include "vmd_is_tuple_begin_common.hpp"
+
+#endif /* BOOST_VMD_VARIADICS */
+#endif /* VMD_IS_TUPLE_BEGIN_HPP */

Added: sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_is_tuple_begin_common.hpp
==============================================================================
--- (empty file)
+++ sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_is_tuple_begin_common.hpp 2011-08-03 13:35:08 EDT (Wed, 03 Aug 2011)
@@ -0,0 +1,37 @@
+#if !defined(VMD_IS_TUPLE_BEGIN_COMMON_HPP)
+#define VMD_IS_TUPLE_BEGIN_COMMON_HPP
+
+#include "detail/vmd_detail_setup.hpp"
+
+#if BOOST_VMD_VARIADICS
+
+#include "detail/vmd_detail_main.hpp"
+
+/*
+
+ The succeeding comments in this file are in doxygen format.
+
+*/
+
+/** \file
+*/
+
+#if !BOOST_VMD_MSVC
+
+# define BOOST_VMD_IS_TUPLE_BEGIN(...) \
+ VMD_DETAIL_IS_EMPTY_SPLIT \
+ ( \
+ 0, \
+ VMD_DETAIL_IS_EMPTY_CAT \
+ ( \
+ VMD_DETAIL_IS_EMPTY_IS_VARIADIC_R_, \
+ VMD_DETAIL_IS_EMPTY_IS_VARIADIC_C __VA_ARGS__ \
+ ) \
+ ) \
+/**/
+
+#endif /* BOOST_VMD_MSVC */
+
+#endif /* BOOST_VMD_VARIADICS */
+
+#endif /* VMD_IS_TUPLE_BEGIN_COMMON_HPP */

Added: sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_is_tuple_begin_native.hpp
==============================================================================
--- (empty file)
+++ sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_is_tuple_begin_native.hpp 2011-08-03 13:35:08 EDT (Wed, 03 Aug 2011)
@@ -0,0 +1,50 @@
+#if !defined(VMD_IS_TUPLE_BEGIN_NATIVE_HPP)
+#define VMD_IS_TUPLE_BEGIN_NATIVE_HPP
+
+#include "detail/vmd_detail_setup.hpp"
+
+#if BOOST_VMD_VARIADICS
+
+#include <boost/preprocessor/arithmetic/dec.hpp>
+
+#include "vmd_main.hpp"
+#include "detail/vmd_detail.hpp"
+
+/*
+
+ The succeeding comments in this file are in doxygen format.
+
+*/
+
+/** \file
+*/
+
+#if BOOST_VMD_MSVC
+
+/// Tests whether its parameter begins with a tuple.
+/**
+
+ param = a macro parameter.
+
+ returns = 1 if the param begins with a tuple, else 0 if it does not.
+ If the param begins with a tuple, it may contain other
+ tokens after it.
+
+ There is no completely safe way to test whether the param is a tuple.
+ At best one can use BOOST_VMD_ASSERT_IS_TUPLE to cause a compiler error
+ if the parameter is not a tuple.
+
+*/
+#define BOOST_VMD_IS_TUPLE_BEGIN(param) \
+ BOOST_PP_DEC \
+ ( \
+ BOOST_VMD_DATA_SIZE \
+ ( \
+ VMD_DETAIL_COMMON_EXPAND param \
+ ) \
+ ) \
+/**/
+
+#endif /* BOOST_VMD_MSVC */
+#endif /* BOOST_VMD_VARIADICS */
+#endif /* VMD_IS_TUPLE_BEGIN_NATIVE_HPP */

Added: sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_is_tuple_begin_pplib.hpp
==============================================================================
--- (empty file)
+++ sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_is_tuple_begin_pplib.hpp 2011-08-03 13:35:08 EDT (Wed, 03 Aug 2011)
@@ -0,0 +1,51 @@
+#if !defined(VMD_IS_TUPLE_BEGIN_PPLIB_HPP)
+#define VMD_IS_TUPLE_BEGIN_PPLIB_HPP
+
+#include "detail/vmd_detail_setup.hpp"
+
+#if BOOST_VMD_VARIADICS
+
+#include <boost/preprocessor/arithmetic/dec.hpp>
+#include <boost/preprocessor/variadic/size.hpp>
+
+#include "detail/vmd_detail.hpp"
+
+/*
+
+ The succeeding comments in this file are in doxygen format.
+
+*/
+
+/** \file
+*/
+
+#if BOOST_VMD_MSVC
+
+/// Tests whether its parameter begins with a tuple.
+/**
+
+ param = a macro parameter.
+
+ returns = 1 if the param begins with a tuple, else 0 if it does not.
+ If the param begins with a tuple, it may contain other
+ tokens after it.
+
+ There is no completely safe way to test whether the param is a tuple.
+ At best one can use BOOST_VMD_ASSERT_IS_TUPLE to cause a compiler error
+ if the parameter is not a tuple.
+
+
+*/
+#define BOOST_VMD_IS_TUPLE_BEGIN(param) \
+ BOOST_PP_DEC \
+ ( \
+ BOOST_PP_VARIADIC_SIZE \
+ ( \
+ VMD_DETAIL_COMMON_EXPAND param \
+ ) \
+ ) \
+/**/
+
+#endif /* BOOST_VMD_MSVC */
+#endif /* BOOST_VMD_VARIADICS */
+#endif /* VMD_IS_TUPLE_BEGIN_PPLIB_HPP */

Modified: sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_main_common.hpp
==============================================================================
--- sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_main_common.hpp (original)
+++ sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_main_common.hpp 2011-08-03 13:35:08 EDT (Wed, 03 Aug 2011)
@@ -42,18 +42,6 @@
 
 #if !BOOST_VMD_MSVC
 
-# define BOOST_VMD_IS_TUPLE_BEGIN(...) \
- VMD_DETAIL_IS_EMPTY_SPLIT \
- ( \
- 0, \
- VMD_DETAIL_IS_EMPTY_CAT \
- ( \
- VMD_DETAIL_IS_EMPTY_IS_VARIADIC_R_, \
- VMD_DETAIL_IS_EMPTY_IS_VARIADIC_C __VA_ARGS__ \
- ) \
- ) \
-/**/
-
 #define BOOST_VMD_IS_EMPTY(...) \
     VMD_DETAIL_IS_EMPTY_IIF \
       ( \

Modified: sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_main_native.hpp
==============================================================================
--- sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_main_native.hpp (original)
+++ sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_main_native.hpp 2011-08-03 13:35:08 EDT (Wed, 03 Aug 2011)
@@ -10,6 +10,7 @@
 #include <boost/preprocessor/list/to_tuple.hpp>
 #include <boost/preprocessor/seq/to_tuple.hpp>
 
+#include "detail/vmd_detail.hpp"
 #include "detail/vmd_detail_main.hpp"
 
 /*
@@ -329,30 +330,6 @@
 
 #if BOOST_VMD_MSVC
 
-/// Tests whether its parameter begins with a tuple.
-/**
-
- param = a macro parameter.
-
- returns = 1 if the param begins with a tuple, else 0 if it does not.
- If the param begins with a tuple, it may contain other
- tokens after it.
-
- There is no completely safe way to test whether the param is a tuple.
- At best one can use BOOST_VMD_ASSERT_IS_TUPLE to cause a compiler error
- if the parameter is not a tuple.
-
-*/
-#define BOOST_VMD_IS_TUPLE_BEGIN(param) \
- BOOST_PP_DEC \
- ( \
- BOOST_VMD_DATA_SIZE \
- ( \
- VMD_DETAIL_IS_TUPLE_BEGIN_EXPAND param \
- ) \
- ) \
-/**/
-
 #define BOOST_VMD_IS_EMPTY(param) \
     VMD_DETAIL_IS_EMPTY_IIF \
       ( \
@@ -360,7 +337,7 @@
         ( \
         BOOST_VMD_DATA_SIZE \
           ( \
- VMD_DETAIL_IS_TUPLE_BEGIN_EXPAND param \
+ VMD_DETAIL_COMMON_EXPAND param \
           ) \
         ) \
       ) \

Modified: sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_main_pplib.hpp
==============================================================================
--- sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_main_pplib.hpp (original)
+++ sandbox/variadic_macro_data/boost/variadic_macro_data/vmd_main_pplib.hpp 2011-08-03 13:35:08 EDT (Wed, 03 Aug 2011)
@@ -23,6 +23,7 @@
 #include <boost/preprocessor/variadic/to_seq.hpp>
 #include <boost/preprocessor/variadic/to_tuple.hpp>
 
+#include "detail/vmd_detail.hpp"
 #include "detail/vmd_detail_main.hpp"
 
 /*
@@ -342,31 +343,6 @@
 
 #if BOOST_VMD_MSVC
 
-/// Tests whether its parameter begins with a tuple.
-/**
-
- param = a macro parameter.
-
- returns = 1 if the param begins with a tuple, else 0 if it does not.
- If the param begins with a tuple, it may contain other
- tokens after it.
-
- There is no completely safe way to test whether the param is a tuple.
- At best one can use BOOST_VMD_ASSERT_IS_TUPLE to cause a compiler error
- if the parameter is not a tuple.
-
-
-*/
-#define BOOST_VMD_IS_TUPLE_BEGIN(param) \
- BOOST_PP_DEC \
- ( \
- BOOST_PP_VARIADIC_SIZE \
- ( \
- VMD_DETAIL_IS_TUPLE_BEGIN_EXPAND param \
- ) \
- ) \
-/**/
-
 #define BOOST_VMD_IS_EMPTY(param) \
     VMD_DETAIL_IS_EMPTY_IIF \
       ( \
@@ -374,7 +350,7 @@
         ( \
         BOOST_PP_VARIADIC_SIZE \
           ( \
- VMD_DETAIL_IS_TUPLE_BEGIN_EXPAND param \
+ VMD_DETAIL_COMMON_EXPAND param \
           ) \
         ) \
       ) \

Modified: sandbox/variadic_macro_data/libs/variadic_macro_data/test/test_tuple_begin.cpp
==============================================================================
--- sandbox/variadic_macro_data/libs/variadic_macro_data/test/test_tuple_begin.cpp (original)
+++ sandbox/variadic_macro_data/libs/variadic_macro_data/test/test_tuple_begin.cpp 2011-08-03 13:35:08 EDT (Wed, 03 Aug 2011)
@@ -1,4 +1,4 @@
-#include <boost/variadic_macro_data/vmd.hpp>
+#include <boost/variadic_macro_data/vmd_is_tuple_begin.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
 int main()


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