Update of /cvsroot/boost/boost/boost/xpressive/proto
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22398/proto
Modified Files:
generate.hpp
Log Message:
fix oops
Index: generate.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/generate.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- generate.hpp 26 May 2007 00:53:57 -0000 1.4
+++ generate.hpp 26 May 2007 03:31:42 -0000 1.5
@@ -11,8 +11,7 @@
#define BOOST_PROTO_GENERATE_HPP_EAN_02_13_2007
#include <boost/xpressive/proto/detail/prefix.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/bool.hpp>
+#include <boost/utility/enable_if.hpp>
#include <boost/xpressive/proto/proto_fwd.hpp>
#include <boost/xpressive/proto/matches.hpp>
#include <boost/xpressive/proto/detail/suffix.hpp>
@@ -70,16 +69,12 @@
namespace detail
{
- struct empty
- {};
-
template<typename Domain, typename Expr>
struct generate_if
- : mpl::if_<
+ : lazy_enable_if<
matches<Expr, typename Domain::grammar>
, typename Domain::template apply<Expr>
- , detail::empty
- >::type
+ >
{};
// Optimization, generate fewer templates...
@@ -87,11 +82,6 @@
struct generate_if<proto::default_domain, Expr>
{
typedef Expr type;
-
- static Expr const &make(Expr const &expr)
- {
- return expr;
- }
};
}
-------------------------------------------------------------------------
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
