Subject: [Boost-commit] svn:boost r53521 - in trunk/boost/xpressive: . detail/core detail/core/matcher detail/static detail/static/transforms
From: eric_at_[hidden]
Date: 2009-06-01 01:05:55
Author: eric_niebler
Date: 2009-06-01 01:05:53 EDT (Mon, 01 Jun 2009)
New Revision: 53521
URL: http://svn.boost.org/trac/boost/changeset/53521
Log:
prefer mpl::if_c over mpl::if_ for better compile times
Text files modified:
trunk/boost/xpressive/detail/core/linker.hpp | 4 ++--
trunk/boost/xpressive/detail/core/matcher/simple_repeat_matcher.hpp | 2 +-
trunk/boost/xpressive/detail/static/grammar.hpp | 4 ++--
trunk/boost/xpressive/detail/static/transforms/as_action.hpp | 4 ++--
trunk/boost/xpressive/detail/static/transforms/as_set.hpp | 4 ++--
trunk/boost/xpressive/detail/static/transmogrify.hpp | 4 ++--
trunk/boost/xpressive/detail/static/width_of.hpp | 4 ++--
trunk/boost/xpressive/regex_actions.hpp | 12 ++++++------
8 files changed, 19 insertions(+), 19 deletions(-)
Modified: trunk/boost/xpressive/detail/core/linker.hpp
==============================================================================
--- trunk/boost/xpressive/detail/core/linker.hpp (original)
+++ trunk/boost/xpressive/detail/core/linker.hpp 2009-06-01 01:05:53 EDT (Mon, 01 Jun 2009)
@@ -77,9 +77,9 @@
typedef typename iterator_value<BidiIter>::type char_type;
// if Locale is std::locale, wrap it in a cpp_regex_traits<Char>
- typedef typename mpl::if_
+ typedef typename mpl::if_c
<
- is_same<Locale, std::locale>
+ is_same<Locale, std::locale>::value
, cpp_regex_traits<char_type>
, Locale
>::type type;
Modified: trunk/boost/xpressive/detail/core/matcher/simple_repeat_matcher.hpp
==============================================================================
--- trunk/boost/xpressive/detail/core/matcher/simple_repeat_matcher.hpp (original)
+++ trunk/boost/xpressive/detail/core/matcher/simple_repeat_matcher.hpp 2009-06-01 01:05:53 EDT (Mon, 01 Jun 2009)
@@ -38,7 +38,7 @@
template<typename Xpr, typename Greedy, typename Random>
struct simple_repeat_traits
{
- typedef typename mpl::if_<Greedy, greedy_slow_tag, non_greedy_tag>::type tag_type;
+ typedef typename mpl::if_c<Greedy::value, greedy_slow_tag, non_greedy_tag>::type tag_type;
};
template<>
Modified: trunk/boost/xpressive/detail/static/grammar.hpp
==============================================================================
--- trunk/boost/xpressive/detail/static/grammar.hpp (original)
+++ trunk/boost/xpressive/detail/static/grammar.hpp 2009-06-01 01:05:53 EDT (Mon, 01 Jun 2009)
@@ -33,8 +33,8 @@
#define BOOST_XPRESSIVE_CHECK_REGEX(Expr, Char)\
BOOST_MPL_ASSERT\
((\
- typename boost::mpl::if_<\
- boost::xpressive::is_valid_regex<Expr, Char>\
+ typename boost::mpl::if_c<\
+ boost::xpressive::is_valid_regex<Expr, Char>::value\
, boost::mpl::true_\
, boost::xpressive::INVALID_REGULAR_EXPRESSION\
>::type\
Modified: trunk/boost/xpressive/detail/static/transforms/as_action.hpp
==============================================================================
--- trunk/boost/xpressive/detail/static/transforms/as_action.hpp (original)
+++ trunk/boost/xpressive/detail/static/transforms/as_action.hpp 2009-06-01 01:05:53 EDT (Mon, 01 Jun 2009)
@@ -271,8 +271,8 @@
marked_expr_type;
typedef
- typename mpl::if_<
- proto::matches<action_type, CheckAssertion>
+ typename mpl::if_c<
+ proto::matches<action_type, CheckAssertion>::value
, detail::predicate_matcher<action_copy_type>
, detail::action_matcher<action_copy_type>
>::type
Modified: trunk/boost/xpressive/detail/static/transforms/as_set.hpp
==============================================================================
--- trunk/boost/xpressive/detail/static/transforms/as_set.hpp (original)
+++ trunk/boost/xpressive/detail/static/transforms/as_set.hpp 2009-06-01 01:05:53 EDT (Mon, 01 Jun 2009)
@@ -190,8 +190,8 @@
// if sizeof(char_type)==1, merge everything into a basic_chset
// BUGBUG this is not optimal.
typedef
- typename mpl::if_<
- detail::is_narrow_char<char_type>
+ typename mpl::if_c<
+ detail::is_narrow_char<char_type>::value
, detail::basic_chset<char_type>
, detail::compound_charset<typename data_type::traits_type>
>::type
Modified: trunk/boost/xpressive/detail/static/transmogrify.hpp
==============================================================================
--- trunk/boost/xpressive/detail/static/transmogrify.hpp (original)
+++ trunk/boost/xpressive/detail/static/transmogrify.hpp 2009-06-01 01:05:53 EDT (Mon, 01 Jun 2009)
@@ -41,9 +41,9 @@
typedef typename Traits::char_type char_type;
typedef typename Traits::string_type string_type;
- typedef typename mpl::if_
+ typedef typename mpl::if_c
<
- is_char_literal<Matcher, char_type>
+ is_char_literal<Matcher, char_type>::value
, literal_matcher<Traits, ICase, mpl::false_>
, string_matcher<Traits, ICase>
>::type type;
Modified: trunk/boost/xpressive/detail/static/width_of.hpp
==============================================================================
--- trunk/boost/xpressive/detail/static/width_of.hpp (original)
+++ trunk/boost/xpressive/detail/static/width_of.hpp 2009-06-01 01:05:53 EDT (Mon, 01 Jun 2009)
@@ -230,8 +230,8 @@
template<typename Expr, typename Char, uint_t Count>
struct width_of<Expr, Char, generic_quant_tag<Count, Count> >
- : mpl::if_<
- mpl::equal_to<unknown_width, width_of<typename remove_reference<typename Expr::proto_child0>::type::proto_base_expr, Char> >
+ : mpl::if_c<
+ mpl::equal_to<unknown_width, width_of<typename remove_reference<typename Expr::proto_child0>::type::proto_base_expr, Char> >::value
, unknown_width
, mpl::times<
width_of<typename remove_reference<typename Expr::proto_child0>::type::proto_base_expr, Char>
Modified: trunk/boost/xpressive/regex_actions.hpp
==============================================================================
--- trunk/boost/xpressive/regex_actions.hpp (original)
+++ trunk/boost/xpressive/regex_actions.hpp 2009-06-01 01:05:53 EDT (Mon, 01 Jun 2009)
@@ -271,8 +271,8 @@
{
typedef UNREF(Sequence) sequence_type;
typedef
- typename mpl::if_<
- is_const<sequence_type>
+ typename mpl::if_c<
+ is_const<sequence_type>::value
, typename sequence_type::const_reference
, typename sequence_type::reference
>::type
@@ -296,8 +296,8 @@
{
typedef UNREF(Sequence) sequence_type;
typedef
- typename mpl::if_<
- is_const<sequence_type>
+ typename mpl::if_c<
+ is_const<sequence_type>::value
, typename sequence_type::const_reference
, typename sequence_type::reference
>::type
@@ -321,8 +321,8 @@
{
typedef UNREF(Sequence) sequence_type;
typedef
- typename mpl::if_<
- is_const<sequence_type>
+ typename mpl::if_c<
+ is_const<sequence_type>::value
, typename sequence_type::value_type const &
, typename sequence_type::value_type &
>::type