|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r69028 - in sandbox/assign_v2/boost/assign/v2/ref: . array/alloc array/csv convert_traits list_tuple/cpp03
From: erwann.rogard_at_[hidden]
Date: 2011-02-19 05:39:44
Author: e_r
Date: 2011-02-19 05:39:42 EST (Sat, 19 Feb 2011)
New Revision: 69028
URL: http://svn.boost.org/trac/boost/changeset/69028
Log:
upd assign_v2
Text files modified:
sandbox/assign_v2/boost/assign/v2/ref/array/alloc/lazy.hpp | 1 -
sandbox/assign_v2/boost/assign/v2/ref/array/csv/make.hpp | 12 ++++++------
sandbox/assign_v2/boost/assign/v2/ref/convert_traits/checking.hpp | 12 ++++++------
sandbox/assign_v2/boost/assign/v2/ref/fusion.hpp | 24 +-----------------------
sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp03/container.hpp | 26 +++++++++++++-------------
5 files changed, 26 insertions(+), 49 deletions(-)
Modified: sandbox/assign_v2/boost/assign/v2/ref/array/alloc/lazy.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/alloc/lazy.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/alloc/lazy.hpp 2011-02-19 05:39:42 EST (Sat, 19 Feb 2011)
@@ -11,7 +11,6 @@
#define BOOST_ASSIGN_V2_REF_ARRAY_ALLOC_LAZY_ER_2010_HPP
#include <boost/shared_ptr.hpp>
#include <boost/assign/v2/ref/wrapper.hpp>
-#include <boost/assign/v2/ref/fusion/assign_array.hpp>
#include <boost/assign/v2/ref/array/alloc/lazy_fwd.hpp>
#include <boost/assign/v2/ref/array/interface.hpp>
#include <boost/assign/v2/ref/array/impl_traits.hpp>
Modified: sandbox/assign_v2/boost/assign/v2/ref/array/csv/make.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/csv/make.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/csv/make.hpp 2011-02-19 05:39:42 EST (Sat, 19 Feb 2011)
@@ -105,8 +105,8 @@
#else
-#define MACRO1(z, i, data) r.rebind(i, BOOST_PP_CAT(data, i) );
-#define MACRO2(z, n, U)\
+#define BOOST_ASSIGN_V2_MACRO1(z, i, data) r.rebind(i, BOOST_PP_CAT(data, i) );
+#define BOOST_ASSIGN_V2_MACRO2(z, n, U)\
namespace csv_array_aux{\
template<typename T>\
typename nth_result_of::csv_array<n, T>::type\
@@ -114,7 +114,7 @@
{\
typedef typename nth_result_of::csv_array<n, T>::type result_;\
result_ r;\
- BOOST_PP_REPEAT( n, MACRO1, _ )\
+ BOOST_PP_REPEAT( n, BOOST_ASSIGN_V2_MACRO1, _ )\
return r;\
}\
}\
@@ -133,11 +133,11 @@
BOOST_PP_REPEAT_FROM_TO(
1,
BOOST_PP_INC(BOOST_ASSIGN_V2_LIMIT_CSV_ARITY),
- MACRO2,
+ BOOST_ASSIGN_V2_MACRO2,
~
)
-#undef MACRO1
-#undef MACRO2
+#undef BOOST_ASSIGN_V2_MACRO1
+#undef BOOST_ASSIGN_V2_MACRO2
#endif // BOOST_ASSIGN_V2_ENABLE_CPP0X
}// ref
Modified: sandbox/assign_v2/boost/assign/v2/ref/convert_traits/checking.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/convert_traits/checking.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/convert_traits/checking.hpp 2011-02-19 05:39:42 EST (Sat, 19 Feb 2011)
@@ -92,7 +92,7 @@
}
-#define MACRO(T1, T2, T3) \
+#define BOOST_ASSIGN_V2_MACRO(T1, T2, T3) \
template<typename T> \
void do_check( \
typename boost::enable_if< \
@@ -113,12 +113,12 @@
typedef boost::numeric::conversion_traits<
double,long double>::supertype d_;
}// supertype_
-MACRO(short , int, supertype_::a_)
-MACRO(int , long, supertype_::b_)
-MACRO(float , double, supertype_::c_)
+BOOST_ASSIGN_V2_MACRO(short , int, supertype_::a_)
+BOOST_ASSIGN_V2_MACRO(int , long, supertype_::b_)
+BOOST_ASSIGN_V2_MACRO(float , double, supertype_::c_)
typedef long double long_double_;
-MACRO(double , long_double_, workaround::d_)
-#undef MACRO
+BOOST_ASSIGN_V2_MACRO(double , long_double_, workaround::d_)
+#undef BOOST_ASSIGN_V2_MACRO
}// distinct_value_type
*/
Modified: sandbox/assign_v2/boost/assign/v2/ref/fusion.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/fusion.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/fusion.hpp 2011-02-19 05:39:42 EST (Sat, 19 Feb 2011)
@@ -1,23 +1 @@
-//////////////////////////////////////////////////////////////////////////////
-// Boost.Assign v2 //
-// //
-// Copyright (C) 2003-2004 Thorsten Ottosen //
-// Copyright (C) 2010 Erwann Rogard //
-// Use, modification and distribution are subject to the //
-// Boost Software License, Version 1.0. (See accompanying file //
-// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
-//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_REF_FUSION_ER_2010_HPP
-#define BOOST_ASSIGN_V2_REF_FUSION_ER_2010_HPP
-
-#include <boost/assign/v2/ref/fusion/assign_array.hpp>
-#include <boost/assign/v2/ref/fusion/assign_copy.hpp>
-#include <boost/assign/v2/ref/fusion/container.hpp>
-#include <boost/assign/v2/ref/fusion/make.hpp>
-#include <boost/assign/v2/ref/fusion/most_const.hpp>
-#include <boost/assign/v2/ref/fusion/nil_arg.hpp>
-#include <boost/assign/v2/ref/fusion/nth_result_of.hpp>
-#include <boost/assign/v2/ref/fusion/policy.hpp>
-#include <boost/assign/v2/ref/fusion/root.hpp>
-
-#endif
+// TODO remove file
\ No newline at end of file
Modified: sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp03/container.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp03/container.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/list_tuple/cpp03/container.hpp 2011-02-19 05:39:42 EST (Sat, 19 Feb 2011)
@@ -70,7 +70,7 @@
template<params( typename T )>
struct tuple
{
-#define MACRO(z, n, T)\
+#define BOOST_ASSIGN_V2_MACRO(z, n, T)\
typename list_tuple_aux::tuple_value<\
BOOST_PP_CAT(T, n)\
>::type\
@@ -78,11 +78,11 @@
typedef boost::tuples::tuple<
BOOST_PP_ENUM(
BOOST_ASSIGN_V2_LIMIT_ARITY,
- MACRO,
+ BOOST_ASSIGN_V2_MACRO,
T
)
> type;
-#undef MACRO
+#undef BOOST_ASSIGN_V2_MACRO
};
@@ -175,11 +175,11 @@
}
-#define MACRO1(T,R)\
+#define BOOST_ASSIGN_V2_MACRO1(T,R)\
typename list_tuple_aux::tuple_param<T>::type R\
/**/
-#define MACRO(z, n, T)\
- MACRO1(\
+#define BOOST_ASSIGN_V2_MACRO(z, n, T)\
+ BOOST_ASSIGN_V2_MACRO1(\
BOOST_PP_CAT(T,BOOST_PP_INC(n)),\
BOOST_PP_CAT(_,BOOST_PP_INC(n))\
)\
@@ -187,10 +187,10 @@
/**/
explicit container(
const L& l,
- MACRO1(T0,_0) // (*)
+ BOOST_ASSIGN_V2_MACRO1(T0,_0) // (*)
BOOST_PP_ENUM_TRAILING(
BOOST_PP_DEC(BOOST_ASSIGN_V2_LIMIT_ARITY),
- MACRO,
+ BOOST_ASSIGN_V2_MACRO,
T
)
)
@@ -201,8 +201,8 @@
{
BOOST_STATIC_ASSERT( N > 0 );
}
-#undef MACRO1
-#undef MACRO
+#undef BOOST_ASSIGN_V2_MACRO1
+#undef BOOST_ASSIGN_V2_MACRO
template<params_default(typename U, na_type)>
struct result : meta_result_::template apply<params(U)>{};
@@ -215,7 +215,7 @@
return result_( *this );
}
-#define MACRO(z, n, data)\
+#define BOOST_ASSIGN_V2_MACRO(z, n, data)\
template<BOOST_PP_ENUM_PARAMS(n, typename U)>\
typename result<BOOST_PP_ENUM_PARAMS(n, U)>::type\
impl( BOOST_PP_ENUM_BINARY_PARAMS(n, U, &_) )const\
@@ -232,13 +232,13 @@
BOOST_PP_REPEAT_FROM_TO(
1,
BOOST_PP_INC(BOOST_ASSIGN_V2_LIMIT_ARITY),
- MACRO,
+ BOOST_ASSIGN_V2_MACRO,
~
)
};
-#undef MACRO
+#undef BOOST_ASSIGN_V2_MACRO
#undef params
#undef params_default
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