Update of /cvsroot/boost/boost/boost/xpressive/proto
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26850/proto
Modified Files:
context.hpp eval.hpp
Log Message:
test_actions passes on intel-win-9.1, misc. clean-up
Index: context.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/context.hpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- context.hpp 5 Apr 2007 20:49:11 -0000 1.21
+++ context.hpp 16 Apr 2007 08:10:16 -0000 1.22
@@ -28,6 +28,7 @@
#include <boost/utility/result_of.hpp>
#include <boost/type_traits/is_const.hpp>
#include <boost/type_traits/is_function.hpp>
+ #include <boost/type_traits/remove_cv.hpp>
#include <boost/xpressive/proto/proto_fwd.hpp>
#include <boost/xpressive/proto/tags.hpp>
#include <boost/xpressive/proto/eval.hpp>
@@ -388,10 +389,13 @@
private:
/// INTERNAL ONLY
///
- struct inner_context : Context
+ typedef typename remove_cv<Context>::type context_type;
+ /// INTERNAL ONLY
+ ///
+ struct inner_context
+ : context_type
{
inner_context();
- using Context::operator ();
struct private_type_ { private_type_ const &operator,(int)
const { return *this; } };
typedef private_type_ const
&(*pointer_to_function)(BOOST_PP_ENUM_PARAMS(BOOST_PP_INC(N), detail::dont_care
BOOST_PP_INTERCEPT));
operator pointer_to_function() const;
Index: eval.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/eval.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- eval.hpp 29 Mar 2007 22:19:38 -0000 1.1
+++ eval.hpp 16 Apr 2007 08:10:16 -0000 1.2
@@ -41,14 +41,14 @@
{};
template<typename Expr, typename Context>
- typename Context::template eval<Expr>::result_type
+ typename proto::result_of::eval<Expr, Context>::type
operator ()(Expr &expr, Context &context) const
{
return typename Context::template eval<Expr>()(expr, context);
}
template<typename Expr, typename Context>
- typename Context::template eval<Expr>::result_type
+ typename proto::result_of::eval<Expr, Context>::type
operator ()(Expr &expr, Context const &context) const
{
return typename Context::template eval<Expr>()(expr, context);
-------------------------------------------------------------------------
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
