MSVC 7.0 ETI fix

[SVN r26559]
2025-10-03 19:21:00 +02:00 · 2004-12-20 19:17:16 +00:00
parent b2d6399e81
commit c0f63bca9e
22 changed files with 91 additions and 7 deletions
--- a/include/boost/mpl/aux_/numeric_op.hpp
+++ b/include/boost/mpl/aux_/numeric_op.hpp
@@ -205,7 +205,11 @@ template<
    BOOST_MPL_PP_DEF_PARAMS_TAIL(2, typename N, na)
    >
 struct AUX778076_OP_NAME
+#if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
+    : aux::msvc_eti_base< typename if_<
+#else
    : if_<
+#endif
          is_na<N3>
        , BOOST_PP_CAT(AUX778076_OP_NAME,2)<N1,N2>
        , AUX778076_OP_NAME<
@@ -213,6 +217,9 @@ struct AUX778076_OP_NAME
            , BOOST_MPL_PP_EXT_PARAMS(3, BOOST_PP_INC(AUX778076_OP_ARITY), N)
            >
        >::type
+#if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
+    >
+#endif
 {
    BOOST_MPL_AUX_LAMBDA_SUPPORT(
          AUX778076_OP_ARITY
--- a/include/boost/mpl/aux_/preprocessed/msvc60/bitand.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/bitand.hpp
@@ -75,7 +75,9 @@ template<
    , typename N3 = na, typename N4 = na, typename N5 = na
    >
 struct bitand_
+
    : if_<
+
          is_na<N3>
        , bitand_2< N1,N2 >
        , bitand_<
@@ -83,6 +85,7 @@ struct bitand_
            , N3, N4, N5
            >
        >::type
+
 {
    BOOST_MPL_AUX_LAMBDA_SUPPORT(
          5
--- a/include/boost/mpl/aux_/preprocessed/msvc60/bitor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/bitor.hpp
@@ -75,7 +75,9 @@ template<
    , typename N3 = na, typename N4 = na, typename N5 = na
    >
 struct bitor_
+
    : if_<
+
          is_na<N3>
        , bitor_2< N1,N2 >
        , bitor_<
@@ -83,6 +85,7 @@ struct bitor_
            , N3, N4, N5
            >
        >::type
+
 {
    BOOST_MPL_AUX_LAMBDA_SUPPORT(
          5
--- a/include/boost/mpl/aux_/preprocessed/msvc60/bitxor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/bitxor.hpp
@@ -75,7 +75,9 @@ template<
    , typename N3 = na, typename N4 = na, typename N5 = na
    >
 struct bitxor_
+
    : if_<
+
          is_na<N3>
        , bitxor_2< N1,N2 >
        , bitxor_<
@@ -83,6 +85,7 @@ struct bitxor_
            , N3, N4, N5
            >
        >::type
+
 {
    BOOST_MPL_AUX_LAMBDA_SUPPORT(
          5
--- a/include/boost/mpl/aux_/preprocessed/msvc60/divides.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/divides.hpp
@@ -74,7 +74,9 @@ template<
    , typename N3 = na, typename N4 = na, typename N5 = na
    >
 struct divides
+
    : if_<
+
          is_na<N3>
        , divides2< N1,N2 >
        , divides<
@@ -82,6 +84,7 @@ struct divides
            , N3, N4, N5
            >
        >::type
+
 {
    BOOST_MPL_AUX_LAMBDA_SUPPORT(
          5
--- a/include/boost/mpl/aux_/preprocessed/msvc60/minus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/minus.hpp
@@ -74,7 +74,9 @@ template<
    , typename N3 = na, typename N4 = na, typename N5 = na
    >
 struct minus
+
    : if_<
+
          is_na<N3>
        , minus2< N1,N2 >
        , minus<
@@ -82,6 +84,7 @@ struct minus
            , N3, N4, N5
            >
        >::type
+
 {
    BOOST_MPL_AUX_LAMBDA_SUPPORT(
          5
--- a/include/boost/mpl/aux_/preprocessed/msvc60/plus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/plus.hpp
@@ -74,7 +74,9 @@ template<
    , typename N3 = na, typename N4 = na, typename N5 = na
    >
 struct plus
+
    : if_<
+
          is_na<N3>
        , plus2< N1,N2 >
        , plus<
@@ -82,6 +84,7 @@ struct plus
            , N3, N4, N5
            >
        >::type
+
 {
    BOOST_MPL_AUX_LAMBDA_SUPPORT(
          5
--- a/include/boost/mpl/aux_/preprocessed/msvc60/times.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/times.hpp
@@ -74,7 +74,9 @@ template<
    , typename N3 = na, typename N4 = na, typename N5 = na
    >
 struct times
+
    : if_<
+
          is_na<N3>
        , times2< N1,N2 >
        , times<
@@ -82,6 +84,7 @@ struct times
            , N3, N4, N5
            >
        >::type
+
 {
    BOOST_MPL_AUX_LAMBDA_SUPPORT(
          5
--- a/include/boost/mpl/aux_/preprocessed/msvc70/bitand.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/bitand.hpp
@@ -75,7 +75,9 @@ template<
    , typename N3 = na, typename N4 = na, typename N5 = na
    >
 struct bitand_
-    : if_<
+
+    : aux::msvc_eti_base< typename if_<
+
          is_na<N3>
        , bitand_2< N1,N2 >
        , bitand_<
@@ -83,6 +85,9 @@ struct bitand_
            , N3, N4, N5
            >
        >::type
+
+    >
+
 {
    BOOST_MPL_AUX_LAMBDA_SUPPORT(
          5
--- a/include/boost/mpl/aux_/preprocessed/msvc70/bitor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/bitor.hpp
@@ -75,7 +75,9 @@ template<
    , typename N3 = na, typename N4 = na, typename N5 = na
    >
 struct bitor_
-    : if_<
+
+    : aux::msvc_eti_base< typename if_<
+
          is_na<N3>
        , bitor_2< N1,N2 >
        , bitor_<
@@ -83,6 +85,9 @@ struct bitor_
            , N3, N4, N5
            >
        >::type
+
+    >
+
 {
    BOOST_MPL_AUX_LAMBDA_SUPPORT(
          5
--- a/include/boost/mpl/aux_/preprocessed/msvc70/bitxor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/bitxor.hpp
@@ -75,7 +75,9 @@ template<
    , typename N3 = na, typename N4 = na, typename N5 = na
    >
 struct bitxor_
-    : if_<
+
+    : aux::msvc_eti_base< typename if_<
+
          is_na<N3>
        , bitxor_2< N1,N2 >
        , bitxor_<
@@ -83,6 +85,9 @@ struct bitxor_
            , N3, N4, N5
            >
        >::type
+
+    >
+
 {
    BOOST_MPL_AUX_LAMBDA_SUPPORT(
          5
--- a/include/boost/mpl/aux_/preprocessed/msvc70/divides.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/divides.hpp
@@ -74,7 +74,9 @@ template<
    , typename N3 = na, typename N4 = na, typename N5 = na
    >
 struct divides
-    : if_<
+
+    : aux::msvc_eti_base< typename if_<
+
          is_na<N3>
        , divides2< N1,N2 >
        , divides<
@@ -82,6 +84,9 @@ struct divides
            , N3, N4, N5
            >
        >::type
+
+    >
+
 {
    BOOST_MPL_AUX_LAMBDA_SUPPORT(
          5
--- a/include/boost/mpl/aux_/preprocessed/msvc70/minus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/minus.hpp
@@ -74,7 +74,9 @@ template<
    , typename N3 = na, typename N4 = na, typename N5 = na
    >
 struct minus
-    : if_<
+
+    : aux::msvc_eti_base< typename if_<
+
          is_na<N3>
        , minus2< N1,N2 >
        , minus<
@@ -82,6 +84,9 @@ struct minus
            , N3, N4, N5
            >
        >::type
+
+    >
+
 {
    BOOST_MPL_AUX_LAMBDA_SUPPORT(
          5
--- a/include/boost/mpl/aux_/preprocessed/msvc70/plus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/plus.hpp
@@ -74,7 +74,9 @@ template<
    , typename N3 = na, typename N4 = na, typename N5 = na
    >
 struct plus
-    : if_<
+
+    : aux::msvc_eti_base< typename if_<
+
          is_na<N3>
        , plus2< N1,N2 >
        , plus<
@@ -82,6 +84,9 @@ struct plus
            , N3, N4, N5
            >
        >::type
+
+    >
+
 {
    BOOST_MPL_AUX_LAMBDA_SUPPORT(
          5
--- a/include/boost/mpl/aux_/preprocessed/msvc70/times.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/times.hpp
@@ -74,7 +74,9 @@ template<
    , typename N3 = na, typename N4 = na, typename N5 = na
    >
 struct times
-    : if_<
+
+    : aux::msvc_eti_base< typename if_<
+
          is_na<N3>
        , times2< N1,N2 >
        , times<
@@ -82,6 +84,9 @@ struct times
            , N3, N4, N5
            >
        >::type
+
+    >
+
 {
    BOOST_MPL_AUX_LAMBDA_SUPPORT(
          5
--- a/include/boost/mpl/aux_/preprocessed/no_ctps/bitand.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ctps/bitand.hpp
@@ -75,7 +75,9 @@ template<
    , typename N3 = na, typename N4 = na, typename N5 = na
    >
 struct bitand_
+
    : if_<
+
          is_na<N3>
        , bitand_2< N1,N2 >
        , bitand_<
@@ -83,6 +85,7 @@ struct bitand_
            , N3, N4, N5
            >
        >::type
+
 {
    BOOST_MPL_AUX_LAMBDA_SUPPORT(
          5
--- a/include/boost/mpl/aux_/preprocessed/no_ctps/bitor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ctps/bitor.hpp
@@ -75,7 +75,9 @@ template<
    , typename N3 = na, typename N4 = na, typename N5 = na
    >
 struct bitor_
+
    : if_<
+
          is_na<N3>
        , bitor_2< N1,N2 >
        , bitor_<
@@ -83,6 +85,7 @@ struct bitor_
            , N3, N4, N5
            >
        >::type
+
 {
    BOOST_MPL_AUX_LAMBDA_SUPPORT(
          5
--- a/include/boost/mpl/aux_/preprocessed/no_ctps/bitxor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ctps/bitxor.hpp
@@ -75,7 +75,9 @@ template<
    , typename N3 = na, typename N4 = na, typename N5 = na
    >
 struct bitxor_
+
    : if_<
+
          is_na<N3>
        , bitxor_2< N1,N2 >
        , bitxor_<
@@ -83,6 +85,7 @@ struct bitxor_
            , N3, N4, N5
            >
        >::type
+
 {
    BOOST_MPL_AUX_LAMBDA_SUPPORT(
          5
--- a/include/boost/mpl/aux_/preprocessed/no_ctps/divides.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ctps/divides.hpp
@@ -74,7 +74,9 @@ template<
    , typename N3 = na, typename N4 = na, typename N5 = na
    >
 struct divides
+
    : if_<
+
          is_na<N3>
        , divides2< N1,N2 >
        , divides<
@@ -82,6 +84,7 @@ struct divides
            , N3, N4, N5
            >
        >::type
+
 {
    BOOST_MPL_AUX_LAMBDA_SUPPORT(
          5
--- a/include/boost/mpl/aux_/preprocessed/no_ctps/minus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ctps/minus.hpp
@@ -74,7 +74,9 @@ template<
    , typename N3 = na, typename N4 = na, typename N5 = na
    >
 struct minus
+
    : if_<
+
          is_na<N3>
        , minus2< N1,N2 >
        , minus<
@@ -82,6 +84,7 @@ struct minus
            , N3, N4, N5
            >
        >::type
+
 {
    BOOST_MPL_AUX_LAMBDA_SUPPORT(
          5
--- a/include/boost/mpl/aux_/preprocessed/no_ctps/plus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ctps/plus.hpp
@@ -74,7 +74,9 @@ template<
    , typename N3 = na, typename N4 = na, typename N5 = na
    >
 struct plus
+
    : if_<
+
          is_na<N3>
        , plus2< N1,N2 >
        , plus<
@@ -82,6 +84,7 @@ struct plus
            , N3, N4, N5
            >
        >::type
+
 {
    BOOST_MPL_AUX_LAMBDA_SUPPORT(
          5
--- a/include/boost/mpl/aux_/preprocessed/no_ctps/times.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ctps/times.hpp
@@ -74,7 +74,9 @@ template<
    , typename N3 = na, typename N4 = na, typename N5 = na
    >
 struct times
+
    : if_<
+
          is_na<N3>
        , times2< N1,N2 >
        , times<
@@ -82,6 +84,7 @@ struct times
            , N3, N4, N5
            >
        >::type
+
 {
    BOOST_MPL_AUX_LAMBDA_SUPPORT(
          5