merge numeric protocol fixes from the main trunk

[SVN r25846]
2025-08-03 14:54:30 +02:00 · 2004-10-24 06:31:11 +00:00
parent 3db141ecbb
commit 63f9743547
161 changed files with 485 additions and 485 deletions
--- a/include/boost/mpl/aux_/numeric_op.hpp
+++ b/include/boost/mpl/aux_/numeric_op.hpp
@@ -20,7 +20,7 @@
 #if !defined(BOOST_MPL_PREPROCESSING_MODE)
 #   include <boost/mpl/numeric_cast.hpp>
 #   include <boost/mpl/apply_wrap.hpp>
-#   include <boost/mpl/if.hpp>
+#   include <boost/mpl/eval_if.hpp>
 #   include <boost/mpl/tag.hpp>
 #   include <boost/mpl/aux_/na.hpp>
 #   include <boost/mpl/aux_/na_spec.hpp>
@@ -80,18 +80,18 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value 
    >
 struct AUX778076_OP_IMPL_NAME
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
 #else
    >
 struct AUX778076_OP_IMPL_NAME
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )
 #endif
-        , aux::cast2nd_impl< AUX778076_OP_IMPL_NAME<Tag1,Tag2>,Tag1,Tag2 >
-        , aux::cast1st_impl< AUX778076_OP_IMPL_NAME<Tag1,Tag2>,Tag1,Tag2 >
+        , aux::cast2nd_impl< AUX778076_OP_IMPL_NAME<Tag1,Tag1>,Tag1,Tag2 >
+        , aux::cast1st_impl< AUX778076_OP_IMPL_NAME<Tag2,Tag2>,Tag1,Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc/bitand.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/bitand.hpp
@@ -17,13 +17,13 @@ template<
    , typename Tag2
    >
 struct bitand_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< bitand_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< bitand_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< bitand_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< bitand_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc/bitor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/bitor.hpp
@@ -17,13 +17,13 @@ template<
    , typename Tag2
    >
 struct bitor_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< bitor_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< bitor_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< bitor_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< bitor_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc/bitxor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/bitxor.hpp
@@ -17,13 +17,13 @@ template<
    , typename Tag2
    >
 struct bitxor_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< bitxor_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< bitxor_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< bitxor_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< bitxor_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc/divides.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/divides.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct divides_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< divides_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< divides_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< divides_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< divides_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc/equal_to.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/equal_to.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct equal_to_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< equal_to_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< equal_to_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< equal_to_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< equal_to_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc/greater.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/greater.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct greater_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< greater_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< greater_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< greater_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< greater_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc/greater_equal.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/greater_equal.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct greater_equal_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< greater_equal_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< greater_equal_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< greater_equal_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< greater_equal_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc/less.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/less.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct less_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< less_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< less_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< less_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< less_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc/less_equal.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/less_equal.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct less_equal_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< less_equal_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< less_equal_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< less_equal_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< less_equal_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc/minus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/minus.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct minus_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< minus_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< minus_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< minus_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< minus_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc/modulus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/modulus.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct modulus_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< modulus_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< modulus_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< modulus_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< modulus_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc/not_equal_to.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/not_equal_to.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct not_equal_to_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< not_equal_to_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< not_equal_to_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< not_equal_to_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< not_equal_to_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc/plus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/plus.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct plus_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< plus_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< plus_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< plus_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< plus_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc/shift_left.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/shift_left.hpp
@@ -17,13 +17,13 @@ template<
    , typename Tag2
    >
 struct shift_left_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< shift_left_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< shift_left_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< shift_left_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< shift_left_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc/shift_right.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/shift_right.hpp
@@ -17,13 +17,13 @@ template<
    , typename Tag2
    >
 struct shift_right_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< shift_right_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< shift_right_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< shift_right_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< shift_right_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc/times.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/times.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct times_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< times_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< times_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< times_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< times_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc551/bitand.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/bitand.hpp
@@ -17,13 +17,13 @@ template<
    , typename Tag2
    >
 struct bitand_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< bitand_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< bitand_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< bitand_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< bitand_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc551/bitor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/bitor.hpp
@@ -17,13 +17,13 @@ template<
    , typename Tag2
    >
 struct bitor_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< bitor_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< bitor_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< bitor_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< bitor_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc551/bitxor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/bitxor.hpp
@@ -17,13 +17,13 @@ template<
    , typename Tag2
    >
 struct bitxor_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< bitxor_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< bitxor_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< bitxor_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< bitxor_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc551/divides.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/divides.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct divides_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< divides_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< divides_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< divides_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< divides_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc551/equal_to.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/equal_to.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct equal_to_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< equal_to_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< equal_to_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< equal_to_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< equal_to_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc551/greater.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/greater.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct greater_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< greater_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< greater_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< greater_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< greater_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc551/greater_equal.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/greater_equal.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct greater_equal_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< greater_equal_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< greater_equal_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< greater_equal_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< greater_equal_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc551/less.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/less.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct less_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< less_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< less_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< less_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< less_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc551/less_equal.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/less_equal.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct less_equal_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< less_equal_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< less_equal_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< less_equal_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< less_equal_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc551/minus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/minus.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct minus_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< minus_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< minus_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< minus_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< minus_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc551/modulus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/modulus.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct modulus_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< modulus_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< modulus_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< modulus_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< modulus_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc551/not_equal_to.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/not_equal_to.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct not_equal_to_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< not_equal_to_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< not_equal_to_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< not_equal_to_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< not_equal_to_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc551/plus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/plus.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct plus_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< plus_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< plus_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< plus_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< plus_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc551/shift_left.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/shift_left.hpp
@@ -17,13 +17,13 @@ template<
    , typename Tag2
    >
 struct shift_left_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< shift_left_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< shift_left_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< shift_left_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< shift_left_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc551/shift_right.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/shift_right.hpp
@@ -17,13 +17,13 @@ template<
    , typename Tag2
    >
 struct shift_right_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< shift_right_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< shift_right_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< shift_right_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< shift_right_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/bcc551/times.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/times.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct times_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< times_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< times_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< times_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< times_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/dmc/bitand.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/bitand.hpp
@@ -17,13 +17,13 @@ template<
    , typename Tag2
    >
 struct bitand_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< bitand_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< bitand_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< bitand_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< bitand_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/dmc/bitor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/bitor.hpp
@@ -17,13 +17,13 @@ template<
    , typename Tag2
    >
 struct bitor_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< bitor_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< bitor_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< bitor_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< bitor_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/dmc/bitxor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/bitxor.hpp
@@ -17,13 +17,13 @@ template<
    , typename Tag2
    >
 struct bitxor_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< bitxor_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< bitxor_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< bitxor_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< bitxor_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/dmc/divides.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/divides.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct divides_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< divides_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< divides_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< divides_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< divides_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/dmc/equal_to.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/equal_to.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct equal_to_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< equal_to_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< equal_to_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< equal_to_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< equal_to_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/dmc/greater.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/greater.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct greater_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< greater_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< greater_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< greater_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< greater_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/dmc/greater_equal.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/greater_equal.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct greater_equal_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< greater_equal_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< greater_equal_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< greater_equal_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< greater_equal_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/dmc/less.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/less.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct less_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< less_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< less_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< less_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< less_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/dmc/less_equal.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/less_equal.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct less_equal_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< less_equal_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< less_equal_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< less_equal_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< less_equal_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/dmc/minus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/minus.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct minus_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< minus_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< minus_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< minus_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< minus_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/dmc/modulus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/modulus.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct modulus_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< modulus_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< modulus_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< modulus_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< modulus_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/dmc/not_equal_to.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/not_equal_to.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct not_equal_to_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< not_equal_to_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< not_equal_to_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< not_equal_to_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< not_equal_to_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/dmc/plus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/plus.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct plus_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< plus_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< plus_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< plus_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< plus_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/dmc/shift_left.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/shift_left.hpp
@@ -17,13 +17,13 @@ template<
    , typename Tag2
    >
 struct shift_left_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< shift_left_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< shift_left_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< shift_left_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< shift_left_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/dmc/shift_right.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/shift_right.hpp
@@ -17,13 +17,13 @@ template<
    , typename Tag2
    >
 struct shift_right_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< shift_right_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< shift_right_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< shift_right_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< shift_right_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/dmc/times.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/times.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct times_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< times_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< times_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< times_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< times_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/gcc/bitand.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/bitand.hpp
@@ -17,13 +17,13 @@ template<
    , typename Tag2
    >
 struct bitand_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< bitand_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< bitand_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< bitand_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< bitand_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/gcc/bitor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/bitor.hpp
@@ -17,13 +17,13 @@ template<
    , typename Tag2
    >
 struct bitor_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< bitor_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< bitor_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< bitor_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< bitor_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/gcc/bitxor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/bitxor.hpp
@@ -17,13 +17,13 @@ template<
    , typename Tag2
    >
 struct bitxor_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< bitxor_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< bitxor_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< bitxor_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< bitxor_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/gcc/divides.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/divides.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct divides_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< divides_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< divides_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< divides_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< divides_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/gcc/equal_to.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/equal_to.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct equal_to_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< equal_to_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< equal_to_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< equal_to_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< equal_to_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/gcc/greater.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/greater.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct greater_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< greater_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< greater_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< greater_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< greater_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/gcc/greater_equal.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/greater_equal.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct greater_equal_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< greater_equal_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< greater_equal_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< greater_equal_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< greater_equal_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/gcc/less.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/less.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct less_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< less_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< less_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< less_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< less_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/gcc/less_equal.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/less_equal.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct less_equal_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< less_equal_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< less_equal_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< less_equal_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< less_equal_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/gcc/minus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/minus.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct minus_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< minus_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< minus_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< minus_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< minus_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/gcc/modulus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/modulus.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct modulus_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< modulus_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< modulus_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< modulus_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< modulus_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/gcc/not_equal_to.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/not_equal_to.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct not_equal_to_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< not_equal_to_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< not_equal_to_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< not_equal_to_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< not_equal_to_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/gcc/plus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/plus.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct plus_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< plus_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< plus_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< plus_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< plus_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/gcc/shift_left.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/shift_left.hpp
@@ -17,13 +17,13 @@ template<
    , typename Tag2
    >
 struct shift_left_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< shift_left_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< shift_left_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< shift_left_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< shift_left_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/gcc/shift_right.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/shift_right.hpp
@@ -17,13 +17,13 @@ template<
    , typename Tag2
    >
 struct shift_right_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< shift_right_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< shift_right_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< shift_right_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< shift_right_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/gcc/times.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/times.hpp
@@ -16,13 +16,13 @@ template<
    , typename Tag2
    >
 struct times_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< times_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< times_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< times_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< times_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc60/bitand.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/bitand.hpp
@@ -20,10 +20,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct bitand_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< bitand_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< bitand_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< bitand_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< bitand_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc60/bitor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/bitor.hpp
@@ -20,10 +20,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct bitor_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< bitor_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< bitor_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< bitor_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< bitor_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc60/bitxor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/bitxor.hpp
@@ -20,10 +20,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct bitxor_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< bitxor_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< bitxor_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< bitxor_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< bitxor_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc60/divides.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/divides.hpp
@@ -19,10 +19,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct divides_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< divides_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< divides_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< divides_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< divides_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc60/equal_to.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/equal_to.hpp
@@ -19,10 +19,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct equal_to_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< equal_to_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< equal_to_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< equal_to_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< equal_to_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc60/greater.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/greater.hpp
@@ -19,10 +19,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct greater_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< greater_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< greater_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< greater_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< greater_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc60/greater_equal.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/greater_equal.hpp
@@ -19,10 +19,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct greater_equal_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< greater_equal_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< greater_equal_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< greater_equal_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< greater_equal_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc60/less.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/less.hpp
@@ -19,10 +19,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct less_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< less_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< less_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< less_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< less_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc60/less_equal.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/less_equal.hpp
@@ -19,10 +19,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct less_equal_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< less_equal_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< less_equal_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< less_equal_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< less_equal_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc60/minus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/minus.hpp
@@ -19,10 +19,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct minus_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< minus_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< minus_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< minus_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< minus_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc60/modulus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/modulus.hpp
@@ -19,10 +19,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct modulus_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< modulus_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< modulus_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< modulus_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< modulus_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc60/not_equal_to.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/not_equal_to.hpp
@@ -19,10 +19,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct not_equal_to_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< not_equal_to_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< not_equal_to_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< not_equal_to_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< not_equal_to_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc60/plus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/plus.hpp
@@ -19,10 +19,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct plus_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< plus_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< plus_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< plus_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< plus_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc60/shift_left.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/shift_left.hpp
@@ -20,10 +20,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct shift_left_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< shift_left_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< shift_left_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< shift_left_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< shift_left_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc60/shift_right.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/shift_right.hpp
@@ -20,10 +20,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct shift_right_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< shift_right_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< shift_right_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< shift_right_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< shift_right_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc60/times.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/times.hpp
@@ -19,10 +19,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct times_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< times_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< times_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< times_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< times_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc70/bitand.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/bitand.hpp
@@ -20,10 +20,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct bitand_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< bitand_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< bitand_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< bitand_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< bitand_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc70/bitor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/bitor.hpp
@@ -20,10 +20,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct bitor_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< bitor_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< bitor_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< bitor_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< bitor_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc70/bitxor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/bitxor.hpp
@@ -20,10 +20,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct bitxor_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< bitxor_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< bitxor_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< bitxor_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< bitxor_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc70/divides.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/divides.hpp
@@ -19,10 +19,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct divides_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< divides_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< divides_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< divides_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< divides_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc70/equal_to.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/equal_to.hpp
@@ -19,10 +19,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct equal_to_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< equal_to_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< equal_to_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< equal_to_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< equal_to_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc70/greater.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/greater.hpp
@@ -19,10 +19,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct greater_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< greater_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< greater_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< greater_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< greater_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc70/greater_equal.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/greater_equal.hpp
@@ -19,10 +19,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct greater_equal_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< greater_equal_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< greater_equal_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< greater_equal_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< greater_equal_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc70/less.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/less.hpp
@@ -19,10 +19,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct less_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< less_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< less_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< less_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< less_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc70/less_equal.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/less_equal.hpp
@@ -19,10 +19,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct less_equal_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< less_equal_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< less_equal_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< less_equal_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< less_equal_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc70/minus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/minus.hpp
@@ -19,10 +19,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct minus_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< minus_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< minus_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< minus_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< minus_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc70/modulus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/modulus.hpp
@@ -19,10 +19,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct modulus_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< modulus_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< modulus_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< modulus_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< modulus_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc70/not_equal_to.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/not_equal_to.hpp
@@ -19,10 +19,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct not_equal_to_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< not_equal_to_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< not_equal_to_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< not_equal_to_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< not_equal_to_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc70/plus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/plus.hpp
@@ -19,10 +19,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct plus_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< plus_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< plus_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< plus_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< plus_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc70/shift_left.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/shift_left.hpp
@@ -20,10 +20,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct shift_left_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< shift_left_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< shift_left_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< shift_left_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< shift_left_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc70/shift_right.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/shift_right.hpp
@@ -20,10 +20,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct shift_right_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< shift_right_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< shift_right_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< shift_right_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< shift_right_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/msvc70/times.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/times.hpp
@@ -19,10 +19,10 @@ template<
    , BOOST_MPL_AUX_NTTP_DECL(int, tag2_)  = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
    >
 struct times_impl
-    : if_c<
+    : eval_if_c<
          ( tag1_ > tag2_ )
-        , aux::cast2nd_impl< times_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< times_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< times_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< times_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/mwcw/bitand.hpp
+++ b/include/boost/mpl/aux_/preprocessed/mwcw/bitand.hpp
@@ -17,13 +17,13 @@ template<
    , typename Tag2
    >
 struct bitand_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< bitand_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< bitand_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< bitand_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< bitand_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/mwcw/bitor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/mwcw/bitor.hpp
@@ -17,13 +17,13 @@ template<
    , typename Tag2
    >
 struct bitor_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< bitor_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< bitor_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< bitor_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< bitor_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/include/boost/mpl/aux_/preprocessed/mwcw/bitxor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/mwcw/bitxor.hpp
@@ -17,13 +17,13 @@ template<
    , typename Tag2
    >
 struct bitxor_impl
-    : if_c<
+    : eval_if_c<
          ( BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag1)
              > BOOST_MPL_AUX_NESTED_VALUE_WKND(int, Tag2)
            )

-        , aux::cast2nd_impl< bitxor_impl< Tag1,Tag2 >,Tag1, Tag2 >
-        , aux::cast1st_impl< bitxor_impl< Tag1,Tag2 >,Tag1, Tag2 >
+        , aux::cast2nd_impl< bitxor_impl< Tag1,Tag1 >,Tag1, Tag2 >
+        , aux::cast1st_impl< bitxor_impl< Tag2,Tag2 >,Tag1, Tag2 >
        >
 {
 };
--- a/Show More
+++ b/Show More