Update of /cvsroot/boost/boost/boost/fusion/functional/adapter
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30383/adapter
Modified Files:
fused.hpp fused_function_object.hpp fused_procedure.hpp
unfused_generic.hpp unfused_lvalue_args.hpp
unfused_rvalue_args.hpp unfused_typed.hpp
Log Message:
fixes const-correctness
Index: fused.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/fusion/functional/adapter/fused.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- fused.hpp 13 Jul 2007 18:47:02 -0000 1.4
+++ fused.hpp 15 Jul 2007 16:25:07 -0000 1.5
@@ -11,7 +11,7 @@
#include <boost/type_traits/add_reference.hpp>
-#include <boost/fusion/support/detail/access.hpp>
+#include <boost/fusion/functional/adapter/detail/access.hpp>
#include <boost/fusion/functional/invocation/invoke.hpp>
namespace boost { namespace fusion
@@ -25,8 +25,8 @@
{
Function fnc_transformed;
- typedef typename boost::add_reference<Function>::type func_fwd_t;
- typedef typename detail::call_param<Function>::type func_const_fwd_t;
+ typedef typename detail::qf_c<Function>::type & func_const_fwd_t;
+ typedef typename detail::qf<Function>::type & func_fwd_t;
public:
Index: fused_function_object.hpp
===================================================================
RCS file:
/cvsroot/boost/boost/boost/fusion/functional/adapter/fused_function_object.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- fused_function_object.hpp 13 Jul 2007 18:47:02 -0000 1.4
+++ fused_function_object.hpp 15 Jul 2007 16:25:09 -0000 1.5
@@ -11,7 +11,7 @@
#include <boost/type_traits/add_reference.hpp>
-#include <boost/fusion/support/detail/access.hpp>
+#include <boost/fusion/functional/adapter/detail/access.hpp>
#include <boost/fusion/functional/invocation/invoke_function_object.hpp>
namespace boost { namespace fusion
@@ -25,8 +25,8 @@
{
Function fnc_transformed;
- typedef typename boost::add_reference<Function>::type func_fwd_t;
- typedef typename detail::call_param<Function>::type func_const_fwd_t;
+ typedef typename detail::qf_c<Function>::type & func_const_fwd_t;
+ typedef typename detail::qf<Function>::type & func_fwd_t;
public:
Index: fused_procedure.hpp
===================================================================
RCS file:
/cvsroot/boost/boost/boost/fusion/functional/adapter/fused_procedure.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fused_procedure.hpp 13 Jul 2007 18:47:02 -0000 1.3
+++ fused_procedure.hpp 15 Jul 2007 16:25:10 -0000 1.4
@@ -11,7 +11,7 @@
#include <boost/type_traits/add_reference.hpp>
-#include <boost/fusion/support/detail/access.hpp>
+#include <boost/fusion/functional/adapter/detail/access.hpp>
#include <boost/fusion/functional/invocation/invoke_procedure.hpp>
namespace boost { namespace fusion
@@ -25,8 +25,8 @@
{
Function fnc_transformed;
- typedef typename boost::add_reference<Function>::type func_fwd_t;
- typedef typename detail::call_param<Function>::type func_const_fwd_t;
+ typedef typename detail::qf_c<Function>::type & func_const_fwd_t;
+ typedef typename detail::qf<Function>::type & func_fwd_t;
public:
Index: unfused_generic.hpp
===================================================================
RCS file:
/cvsroot/boost/boost/boost/fusion/functional/adapter/unfused_generic.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- unfused_generic.hpp 14 Jul 2007 20:22:30 -0000 1.7
+++ unfused_generic.hpp 15 Jul 2007 16:25:10 -0000 1.8
@@ -37,7 +37,9 @@
{
Function fnc_transformed;
- typedef typename detail::uncr<Function>::type function;
+ typedef typename detail::qf_c<Function>::type function_c;
+ typedef typename detail::qf<Function>::type function;
+
typedef typename detail::call_param<Function>::type func_const_fwd_t;
public:
@@ -50,7 +52,7 @@
struct result;
typedef typename boost::result_of<
- function const (fusion::vector0 &) >::type call_const_0_result;
+ function_c(fusion::vector0 &) >::type call_const_0_result;
inline call_const_0_result operator()() const
{
@@ -69,7 +71,7 @@
#define BOOST_FUSION_CODE(tpl_params,arg_types,params,args)
\
template <tpl_params>
\
- inline typename boost::result_of<function const (
\
+ inline typename boost::result_of<function_c(
\
BOOST_PP_CAT(fusion::vector,N)<arg_types> & )>::type
\
operator()(params) const
\
{
\
@@ -127,7 +129,7 @@
template <class Self, BOOST_PP_ENUM_PARAMS(N,typename T)>
struct result
< Self const (BOOST_PP_ENUM_PARAMS(N,T)) >
- : boost::result_of<function const (
+ : boost::result_of<function_c(
BOOST_PP_CAT(fusion::vector,N)< BOOST_PP_ENUM_BINARY_PARAMS(N,
typename detail::gref<T,>::type BOOST_PP_INTERCEPT) > & )>
{ };
@@ -135,7 +137,7 @@
template <class Self, BOOST_PP_ENUM_PARAMS(N,typename T)>
struct result
< Self(BOOST_PP_ENUM_PARAMS(N,T)) >
- : boost::result_of<function (
+ : boost::result_of<function(
BOOST_PP_CAT(fusion::vector,N)< BOOST_PP_ENUM_BINARY_PARAMS(N,
typename detail::gref<T,>::type BOOST_PP_INTERCEPT) > & )>
{ };
@@ -143,7 +145,7 @@
#if BOOST_WORKAROUND(BOOST_MSVC,BOOST_TESTED_AT(1400))
template <BOOST_PP_ENUM_PARAMS(N,typename T)>
- inline typename boost::result_of<function const(
+ inline typename boost::result_of<function_c(
BOOST_PP_CAT(fusion::vector,N)<BOOST_PP_ENUM_PARAMS(N,PT)> &
)>::type
operator()(BOOST_PP_ENUM_BINARY_PARAMS(N,PT,a)) const
{
Index: unfused_lvalue_args.hpp
===================================================================
RCS file:
/cvsroot/boost/boost/boost/fusion/functional/adapter/unfused_lvalue_args.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- unfused_lvalue_args.hpp 14 Jul 2007 20:22:30 -0000 1.7
+++ unfused_lvalue_args.hpp 15 Jul 2007 16:25:10 -0000 1.8
@@ -32,7 +32,9 @@
{
Function fnc_transformed;
- typedef typename detail::uncr<Function>::type function;
+ typedef typename detail::qf_c<Function>::type function_c;
+ typedef typename detail::qf<Function>::type function;
+
typedef typename detail::call_param<Function>::type func_const_fwd_t;
public:
@@ -45,7 +47,7 @@
struct result;
typedef typename boost::result_of<
- function const (fusion::vector0 &) >::type call_const_0_result;
+ function_c(fusion::vector0 &) >::type call_const_0_result;
inline call_const_0_result operator()() const
{
@@ -54,7 +56,7 @@
}
typedef typename boost::result_of<
- function (fusion::vector0 &) >::type call_0_result;
+ function(fusion::vector0 &) >::type call_0_result;
inline call_0_result operator()()
{
@@ -95,20 +97,20 @@
template <class Self, BOOST_PP_ENUM_PARAMS(N,typename T)>
struct result< Self const (BOOST_PP_ENUM_PARAMS(N,T)) >
- : boost::result_of< function const (
+ : boost::result_of< function_c(
BOOST_PP_CAT(fusion::vector,N)< BOOST_PP_ENUM_BINARY_PARAMS(N,
typename detail::mref<T,>::type BOOST_PP_INTERCEPT) > & )>
{ };
template <class Self, BOOST_PP_ENUM_PARAMS(N,typename T)>
struct result< Self(BOOST_PP_ENUM_PARAMS(N,T)) >
- : boost::result_of< function (
+ : boost::result_of< function(
BOOST_PP_CAT(fusion::vector,N)< BOOST_PP_ENUM_BINARY_PARAMS(N,
typename detail::mref<T,>::type BOOST_PP_INTERCEPT) > & )>
{ };
template <BOOST_PP_ENUM_PARAMS(N,typename T)>
- inline typename
boost::result_of<function(BOOST_PP_CAT(fusion::vector,N)
+ inline typename
boost::result_of<function_c(BOOST_PP_CAT(fusion::vector,N)
<BOOST_PP_ENUM_BINARY_PARAMS(N,T,& BOOST_PP_INTERCEPT)> & )>::type
operator()(BOOST_PP_ENUM_BINARY_PARAMS(N,T,& a)) const
{
Index: unfused_rvalue_args.hpp
===================================================================
RCS file:
/cvsroot/boost/boost/boost/fusion/functional/adapter/unfused_rvalue_args.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- unfused_rvalue_args.hpp 14 Jul 2007 20:22:30 -0000 1.7
+++ unfused_rvalue_args.hpp 15 Jul 2007 16:25:10 -0000 1.8
@@ -32,7 +32,9 @@
{
Function fnc_transformed;
- typedef typename detail::uncr<Function>::type function;
+ typedef typename detail::qf_c<Function>::type function_c;
+ typedef typename detail::qf<Function>::type function;
+
typedef typename detail::call_param<Function>::type func_const_fwd_t;
public:
@@ -45,7 +47,7 @@
struct result;
typedef typename boost::result_of<
- function const (fusion::vector0 &) >::type call_const_0_result;
+ function_c(fusion::vector0 &) >::type call_const_0_result;
inline call_const_0_result operator()() const
{
@@ -54,7 +56,7 @@
}
typedef typename boost::result_of<
- function (fusion::vector0 &) >::type call_0_result;
+ function(fusion::vector0 &) >::type call_0_result;
inline call_0_result operator()()
{
@@ -95,20 +97,20 @@
template <class Self, BOOST_PP_ENUM_PARAMS(N,typename T)>
struct result< Self const (BOOST_PP_ENUM_PARAMS(N,T)) >
- : boost::result_of< function const (
+ : boost::result_of< function_c(
BOOST_PP_CAT(fusion::vector,N)< BOOST_PP_ENUM_BINARY_PARAMS(N,
typename detail::cref<T,>::type BOOST_PP_INTERCEPT) > & )>
{ };
template <class Self, BOOST_PP_ENUM_PARAMS(N,typename T)>
struct result< Self (BOOST_PP_ENUM_PARAMS(N,T)) >
- : boost::result_of< function (
+ : boost::result_of< function(
BOOST_PP_CAT(fusion::vector,N)< BOOST_PP_ENUM_BINARY_PARAMS(N,
typename detail::cref<T,>::type BOOST_PP_INTERCEPT) > & )>
{ };
template <BOOST_PP_ENUM_PARAMS(N,typename T)>
- inline typename
boost::result_of<function(BOOST_PP_CAT(fusion::vector,N)
+ inline typename
boost::result_of<function_c(BOOST_PP_CAT(fusion::vector,N)
<BOOST_PP_ENUM_BINARY_PARAMS(N,T,const& BOOST_PP_INTERCEPT)> &
)>::type
operator()(BOOST_PP_ENUM_BINARY_PARAMS(N,T,const& a)) const
{
Index: unfused_typed.hpp
===================================================================
RCS file:
/cvsroot/boost/boost/boost/fusion/functional/adapter/unfused_typed.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- unfused_typed.hpp 14 Jul 2007 20:22:30 -0000 1.9
+++ unfused_typed.hpp 15 Jul 2007 16:25:11 -0000 1.10
@@ -41,26 +41,29 @@
namespace detail
{
- template <class Derived, class Function, class Sequence, long Arity>
+ template <class Derived, class FunctionC, class Function,
+ class Sequence, long Arity>
struct unfused_typed_impl;
}
template <class Function, class Sequence>
class unfused_typed
: public detail::unfused_typed_impl
- < unfused_typed<Function,Sequence>, typename
detail::uncr<Function>::type,
- Sequence, result_of::size<Sequence>::value >
+ < unfused_typed<Function,Sequence>, typename
detail::qf_c<Function>::type,
+ typename detail::qf<Function>::type, Sequence,
result_of::size<Sequence>::value >
{
Function fnc_transformed;
- typedef typename detail::uncr<Function>::type function;
+ typedef typename detail::qf_c<Function>::type function_c;
+ typedef typename detail::qf<Function>::type function;
+
typedef typename detail::call_param<Function>::type func_const_fwd_t;
typedef typename detail::unfused_typed_impl<
- unfused_typed<Function,Sequence>,function,Sequence,
+ unfused_typed<Function,Sequence>,function_c,function,Sequence,
result_of::size<Sequence>::value > base;
- template <class D, class F, class S, long A>
+ template <class D, class FC, class F, class S, long A>
friend struct detail::unfused_typed_impl;
public:
@@ -75,21 +78,22 @@
namespace detail
{
- template <class Derived, class Function, class Sequence>
- struct unfused_typed_impl<Derived,Function,Sequence,0>
+ template <class Derived, class FunctionC, class Function,
+ class Sequence>
+ struct unfused_typed_impl<Derived,FunctionC,Function,Sequence,0>
{
typedef fusion::vector0 arg_vector_t;
public:
typedef typename boost::result_of<
- Function const (arg_vector_t &) > call_const_0_result;
+ FunctionC (arg_vector_t &) > call_const_0_result;
typedef typename boost::result_of<
Function(arg_vector_t &) > call_0_result;
inline typename boost::result_of<
- Function const (arg_vector_t &) >::type
+ FunctionC (arg_vector_t &) >::type
operator()() const
{
arg_vector_t arg;
@@ -139,9 +143,10 @@
namespace detail
{
- template <class Derived, class Function, class Sequence>
- struct unfused_typed_impl<Derived,Function,Sequence,N>
- : unfused_typed_impl<Derived,Function,
+ template <class Derived, class FunctionC, class Function,
+ class Sequence>
+ struct unfused_typed_impl<Derived,FunctionC,Function,Sequence,N>
+ : unfused_typed_impl<Derived,FunctionC,Function,
typename result_of::pop_back<Sequence>::type, BOOST_PP_DEC(N) >
{
typedef typename result_of::as_vector<Sequence>::type arg_vector_t;
@@ -149,14 +154,14 @@
protected:
typedef typename boost::result_of<
- Function const (arg_vector_t &) > BOOST_PP_CAT(rc,N);
+ FunctionC(arg_vector_t &) > BOOST_PP_CAT(rc,N);
typedef typename boost::result_of<
Function(arg_vector_t &) > BOOST_PP_CAT(r,N);
public:
- using unfused_typed_impl< Derived,Function,
+ using unfused_typed_impl< Derived,FunctionC,Function,
typename result_of::pop_back<Sequence>::type, BOOST_PP_DEC(N)
>::operator();
@@ -164,7 +169,7 @@
typename call_param<typename result_of::value_at_c<s,i>::type>::type a##i
inline typename boost::result_of<
- Function const (arg_vector_t &) >::type
+ FunctionC(arg_vector_t &) >::type
operator()(BOOST_PP_ENUM(N,M,arg_vector_t)) const
{
arg_vector_t arg(BOOST_PP_ENUM_PARAMS(N,a));
@@ -173,7 +178,7 @@
#if !BOOST_WORKAROUND(BOOST_MSVC, < 1400)
inline typename boost::result_of<
- Function (arg_vector_t &) >::type
+ Function(arg_vector_t &) >::type
operator()(BOOST_PP_ENUM(N,M,arg_vector_t))
{
arg_vector_t arg(BOOST_PP_ENUM_PARAMS(N,a));
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
