Update of /cvsroot/boost/boost/boost/xpressive/detail/static
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26850/detail/static
Modified Files:
grammar.hpp is_pure.hpp width_of.hpp
Log Message:
test_actions passes on intel-win-9.1, misc. clean-up
Index: grammar.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/static/grammar.hpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- grammar.hpp 15 Apr 2007 06:40:25 -0000 1.16
+++ grammar.hpp 16 Apr 2007 08:10:13 -0000 1.17
@@ -57,12 +57,7 @@
///////////////////////////////////////////////////////////////////////////
// ListSet
template<typename Char>
- struct ListSet
- : proto::or_<
- proto::comma<ListSet<Char>, CharLiteral<Char> >
- , proto::assign<set_initializer_type, CharLiteral<Char> >
- >
- {};
+ struct ListSet;
///////////////////////////////////////////////////////////////////////////
// as_repeat
Index: is_pure.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/static/is_pure.hpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- is_pure.hpp 6 Apr 2007 21:03:08 -0000 1.17
+++ is_pure.hpp 16 Apr 2007 08:10:13 -0000 1.18
@@ -13,7 +13,7 @@
# pragma once
#endif
-#include <boost/static_assert.hpp>
+#include <boost/mpl/and.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/mpl/assert.hpp>
#include <boost/xpressive/detail/detail_fwd.hpp>
@@ -22,7 +22,7 @@
///////////////////////////////////////////////////////////////////////////////
// equivalent to mpl::and_<X, Y>
#define BOOST_XPR_AND_PURE_(X, Y)
\
- mpl::bool_<X::value && Y::value>
+ mpl::and_<X, Y >
namespace boost { namespace xpressive { namespace detail
{
Index: width_of.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/static/width_of.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- width_of.hpp 6 Apr 2007 02:07:10 -0000 1.15
+++ width_of.hpp 16 Apr 2007 08:10:14 -0000 1.16
@@ -13,8 +13,13 @@
# pragma once
#endif
+#include <boost/mpl/if.hpp>
+#include <boost/mpl/or.hpp>
+#include <boost/mpl/plus.hpp>
+#include <boost/mpl/times.hpp>
#include <boost/mpl/assert.hpp>
#include <boost/mpl/size_t.hpp>
+#include <boost/mpl/equal_to.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/xpressive/detail/detail_fwd.hpp>
#include <boost/xpressive/proto/traits.hpp>
@@ -22,32 +27,29 @@
///////////////////////////////////////////////////////////////////////////////
// add widths
#define BOOST_XPR_ADD_WIDTH_(X, Y)
\
- mpl::size_t
\
- <
\
- X::value == unknown_width::value || Y::value == unknown_width::value
\
- ? unknown_width::value
\
- : X::value + Y::value
\
- >
+ mpl::if_<
\
+ mpl::or_<mpl::equal_to<X, unknown_width>, mpl::equal_to<Y,
unknown_width> > \
+ , unknown_width
\
+ , mpl::plus<X, Y >
\
+ >::type
///////////////////////////////////////////////////////////////////////////////
// multiply widths
#define BOOST_XPR_MULT_WIDTH_(X, Y)
\
- mpl::size_t
\
- <
\
- X::value == unknown_width::value || Y::value == unknown_width::value
\
- ? unknown_width::value
\
- : X::value * Y::value
\
- >
+ mpl::if_<
\
+ mpl::or_<mpl::equal_to<X, unknown_width>, mpl::equal_to<Y,
unknown_width> > \
+ , unknown_width
\
+ , mpl::times<X, Y >
\
+ >::type
///////////////////////////////////////////////////////////////////////////////
// check widths for equality
#define BOOST_XPR_EQUAL_WIDTH_(X, Y)
\
- mpl::size_t
\
- <
\
- X::value == Y::value
\
- ? X::value
\
- : unknown_width::value
\
- >
+ mpl::if_<
\
+ mpl::equal_to<X, Y >
\
+ , X
\
+ , unknown_width
\
+ >::type
namespace boost { namespace xpressive { namespace detail
{
-------------------------------------------------------------------------
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
