lambda support bug fix

[SVN r26547]
2025-08-03 14:54:30 +02:00 · 2004-12-17 19:26:47 +00:00
parent abc3e73052
commit a1a43e3c08
22 changed files with 30 additions and 108 deletions
--- a/include/boost/mpl/aux_/numeric_op.hpp
+++ b/include/boost/mpl/aux_/numeric_op.hpp
@@ -255,14 +255,20 @@ struct AUX778076_OP_NAME
        >::type >::type
 #endif
 {
-#if AUX778076_OP_ARITY == 2
-    BOOST_MPL_AUX_LAMBDA_SUPPORT(2, AUX778076_OP_NAME, (N1, N2))
-#else
+#if AUX778076_OP_ARITY != 2
+
+#   if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(
          AUX778076_OP_ARITY
        , AUX778076_OP_NAME
        , ( BOOST_MPL_PP_PARTIAL_SPEC_PARAMS(2, N, na) )
        )
+#   else
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(2, BOOST_PP_CAT(AUX778076_OP_NAME,2), (N1, N2))
+#   endif
+
+#else
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(2, AUX778076_OP_NAME, (N1, N2))
 #endif
 };

--- a/include/boost/mpl/aux_/preprocessed/msvc60/bitand.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/bitand.hpp
@@ -106,11 +106,7 @@ struct bitand_2
        >::type >::type

 {
-    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(
-          5
-        , bitand_
-        , ( N1, N2, na, na, na )
-        )
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(2, bitand_2, (N1, N2))

 };

--- a/include/boost/mpl/aux_/preprocessed/msvc60/bitor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/bitor.hpp
@@ -106,11 +106,7 @@ struct bitor_2
        >::type >::type

 {
-    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(
-          5
-        , bitor_
-        , ( N1, N2, na, na, na )
-        )
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(2, bitor_2, (N1, N2))

 };

--- a/include/boost/mpl/aux_/preprocessed/msvc60/bitxor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/bitxor.hpp
@@ -106,11 +106,7 @@ struct bitxor_2
        >::type >::type

 {
-    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(
-          5
-        , bitxor_
-        , ( N1, N2, na, na, na )
-        )
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(2, bitxor_2, (N1, N2))

 };

--- a/include/boost/mpl/aux_/preprocessed/msvc60/divides.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/divides.hpp
@@ -105,11 +105,7 @@ struct divides2
        >::type >::type

 {
-    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(
-          5
-        , divides
-        , ( N1, N2, na, na, na )
-        )
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(2, divides2, (N1, N2))

 };

--- a/include/boost/mpl/aux_/preprocessed/msvc60/minus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/minus.hpp
@@ -105,11 +105,7 @@ struct minus2
        >::type >::type

 {
-    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(
-          5
-        , minus
-        , ( N1, N2, na, na, na )
-        )
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(2, minus2, (N1, N2))

 };

--- a/include/boost/mpl/aux_/preprocessed/msvc60/plus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/plus.hpp
@@ -105,11 +105,7 @@ struct plus2
        >::type >::type

 {
-    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(
-          5
-        , plus
-        , ( N1, N2, na, na, na )
-        )
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(2, plus2, (N1, N2))

 };

--- a/include/boost/mpl/aux_/preprocessed/msvc60/times.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/times.hpp
@@ -105,11 +105,7 @@ struct times2
        >::type >::type

 {
-    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(
-          5
-        , times
-        , ( N1, N2, na, na, na )
-        )
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(2, times2, (N1, N2))

 };

--- a/include/boost/mpl/aux_/preprocessed/msvc70/bitand.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/bitand.hpp
@@ -106,11 +106,7 @@ struct bitand_2
        >::type >::type

 {
-    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(
-          5
-        , bitand_
-        , ( N1, N2, na, na, na )
-        )
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(2, bitand_2, (N1, N2))

 };

--- a/include/boost/mpl/aux_/preprocessed/msvc70/bitor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/bitor.hpp
@@ -106,11 +106,7 @@ struct bitor_2
        >::type >::type

 {
-    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(
-          5
-        , bitor_
-        , ( N1, N2, na, na, na )
-        )
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(2, bitor_2, (N1, N2))

 };

--- a/include/boost/mpl/aux_/preprocessed/msvc70/bitxor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/bitxor.hpp
@@ -106,11 +106,7 @@ struct bitxor_2
        >::type >::type

 {
-    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(
-          5
-        , bitxor_
-        , ( N1, N2, na, na, na )
-        )
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(2, bitxor_2, (N1, N2))

 };

--- a/include/boost/mpl/aux_/preprocessed/msvc70/divides.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/divides.hpp
@@ -105,11 +105,7 @@ struct divides2
        >::type >::type

 {
-    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(
-          5
-        , divides
-        , ( N1, N2, na, na, na )
-        )
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(2, divides2, (N1, N2))

 };

--- a/include/boost/mpl/aux_/preprocessed/msvc70/minus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/minus.hpp
@@ -105,11 +105,7 @@ struct minus2
        >::type >::type

 {
-    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(
-          5
-        , minus
-        , ( N1, N2, na, na, na )
-        )
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(2, minus2, (N1, N2))

 };

--- a/include/boost/mpl/aux_/preprocessed/msvc70/plus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/plus.hpp
@@ -105,11 +105,7 @@ struct plus2
        >::type >::type

 {
-    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(
-          5
-        , plus
-        , ( N1, N2, na, na, na )
-        )
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(2, plus2, (N1, N2))

 };

--- a/include/boost/mpl/aux_/preprocessed/msvc70/times.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/times.hpp
@@ -105,11 +105,7 @@ struct times2
        >::type >::type

 {
-    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(
-          5
-        , times
-        , ( N1, N2, na, na, na )
-        )
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(2, times2, (N1, N2))

 };

--- a/include/boost/mpl/aux_/preprocessed/no_ctps/bitand.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ctps/bitand.hpp
@@ -101,11 +101,7 @@ struct bitand_2
        , typename bitand_tag<N2>::type
        >::template apply< N1,N2 >::type
 {
-    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(
-          5
-        , bitand_
-        , ( N1, N2, na, na, na )
-        )
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(2, bitand_2, (N1, N2))

 };

--- a/include/boost/mpl/aux_/preprocessed/no_ctps/bitor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ctps/bitor.hpp
@@ -101,11 +101,7 @@ struct bitor_2
        , typename bitor_tag<N2>::type
        >::template apply< N1,N2 >::type
 {
-    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(
-          5
-        , bitor_
-        , ( N1, N2, na, na, na )
-        )
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(2, bitor_2, (N1, N2))

 };

--- a/include/boost/mpl/aux_/preprocessed/no_ctps/bitxor.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ctps/bitxor.hpp
@@ -101,11 +101,7 @@ struct bitxor_2
        , typename bitxor_tag<N2>::type
        >::template apply< N1,N2 >::type
 {
-    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(
-          5
-        , bitxor_
-        , ( N1, N2, na, na, na )
-        )
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(2, bitxor_2, (N1, N2))

 };

--- a/include/boost/mpl/aux_/preprocessed/no_ctps/divides.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ctps/divides.hpp
@@ -100,11 +100,7 @@ struct divides2
        , typename divides_tag<N2>::type
        >::template apply< N1,N2 >::type
 {
-    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(
-          5
-        , divides
-        , ( N1, N2, na, na, na )
-        )
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(2, divides2, (N1, N2))

 };

--- a/include/boost/mpl/aux_/preprocessed/no_ctps/minus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ctps/minus.hpp
@@ -100,11 +100,7 @@ struct minus2
        , typename minus_tag<N2>::type
        >::template apply< N1,N2 >::type
 {
-    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(
-          5
-        , minus
-        , ( N1, N2, na, na, na )
-        )
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(2, minus2, (N1, N2))

 };

--- a/include/boost/mpl/aux_/preprocessed/no_ctps/plus.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ctps/plus.hpp
@@ -100,11 +100,7 @@ struct plus2
        , typename plus_tag<N2>::type
        >::template apply< N1,N2 >::type
 {
-    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(
-          5
-        , plus
-        , ( N1, N2, na, na, na )
-        )
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(2, plus2, (N1, N2))

 };

--- a/include/boost/mpl/aux_/preprocessed/no_ctps/times.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ctps/times.hpp
@@ -100,11 +100,7 @@ struct times2
        , typename times_tag<N2>::type
        >::template apply< N1,N2 >::type
 {
-    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(
-          5
-        , times
-        , ( N1, N2, na, na, na )
-        )
+    BOOST_MPL_AUX_LAMBDA_SUPPORT(2, times2, (N1, N2))

 };