From d4cedca95ed134d31d3667a07e4755babc011a19 Mon Sep 17 00:00:00 2001
From: Aleksey Gurtovoy <agurtovoy@meta-comm.com>
Date: Thu, 18 Sep 2003 07:39:27 +0000
Subject: [PATCH] gcc ADL fix for if_

[SVN r20093]
---
 include/boost/mpl/if.hpp | 194 ++++++++++++++++++++-------------------
 1 file changed, 99 insertions(+), 95 deletions(-)

diff --git a/include/boost/mpl/if.hpp b/include/boost/mpl/if.hpp
index 65906a7..26b1aff 100644
--- a/include/boost/mpl/if.hpp
+++ b/include/boost/mpl/if.hpp
@@ -3,7 +3,7 @@
 #define BOOST_MPL_IF_HPP_INCLUDED
 
 // + file: boost/mpl/if.hpp
-// + last modified: 10/mar/03
+// + last modified: 17/sep/03
 
 // Copyright (c) 2000-03 Boost.org
 //
@@ -25,8 +25,8 @@
 #include "boost/mpl/aux_/config/workaround.hpp"
 #include "boost/config.hpp"
 
-#ifndef BOOST_MPL_NO_FULL_LAMBDA_SUPPORT
-# include "boost/mpl/arg_fwd.hpp"
+#if !defined(BOOST_MPL_NO_FULL_LAMBDA_SUPPORT)
+#   include "boost/mpl/arg_fwd.hpp"
 #endif
 
 namespace boost {
@@ -34,6 +34,8 @@ namespace mpl {
 
 #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
 
+BOOST_MPL_AUX_AGLORITHM_NAMESPACE_BEGIN
+
 template<
       bool C
     , typename T1
@@ -78,97 +80,6 @@ struct if_
     BOOST_MPL_AUX_LAMBDA_SUPPORT(3,if_,(C,T1,T2))
 };
 
-
-#ifndef BOOST_MPL_NO_FULL_LAMBDA_SUPPORT
-
-// Aleksey, check it out: lazy if_ evaluation in lambdas!
-// I think this doesn't handle the case of
-//
-//    _1<foo<_2>, bar<_2>, baz<_2> >
-//
-// (or however it is that you express that... when the ordinary bind3
-// computes the function based on the actual arguments). That leads me
-// to think that some kind of true currying might be a better
-// approach, e.g.:
-//
-//
-//  boost::mpl::bind3<
-//         boost::mpl::quote3<boost::mpl::if_>
-//       , boost::mpl::bind1<boost::mpl::quote1<boost::is_reference>, boost::mpl::arg<1> >
-//       , boost::mpl::arg<1>
-//       , boost::mpl::bind1<boost::mpl::quote1<add_ptr>, boost::mpl::arg<1> > 
-//  >::apply<...>
-//
-// becomes:
-//
-//  boost::mpl::bind<
-//         boost::mpl::quote3<boost::mpl::if_>
-//  >::bind<
-//       , boost::mpl::bind1<boost::mpl::quote1<boost::is_reference>,
-//         boost::mpl::arg<1> >
-//  >::bind<
-//         boost::mpl::arg<1>
-//  >::bind<
-//       boost::mpl::bind1<boost::mpl::quote1<add_ptr>, boost::mpl::arg<1> > 
-//  >::apply<...>
-//
-// so that after the 2nd bind we have a different function depending
-// on the result of is_reference.
-
-template <class T1, class T2, class T3, class T4> struct bind3;
-template <template <class T1, class T2, class T3> class F, class tag> struct quote3;
-
-namespace aux
-{
-  template <
-      typename T
-    , BOOST_MPL_PP_PARAMS(BOOST_MPL_METAFUNCTION_MAX_ARITY, typename U)
-  > struct resolve_bind_arg;
-
-  template<
-        typename T
-      , typename Arg
-      >
-  struct replace_unnamed_arg;
-}
-
-template<
-      typename T1, typename T2, typename T3
-    >
-struct bind3<quote3<if_, void_>, T1, T2, T3>
-{
-    template<
-          typename U1 = void_, typename U2 = void_, typename U3 = void_
-        , typename U4 = void_, typename U5 = void_
-        >
-    struct apply
-    {
-     private:
-        typedef quote3<if_, void_> a0;
-        typedef mpl::arg< 1> n1;
-        
-        typedef aux::replace_unnamed_arg< T1,n1 > r1;
-        typedef typename r1::type a1;
-        typedef typename r1::next_arg n2;
-        typedef typename aux::resolve_bind_arg< a1,U1,U2,U3,U4,U5 >::type t1;
-
-        typedef aux::replace_unnamed_arg< T2,n2 > r2;
-        typedef typename r2::type a2;
-        typedef typename r2::next_arg n3;
-        typedef typename aux::resolve_bind_arg< a2,U1,U2,U3,U4,U5 > f2;
-
-        typedef aux::replace_unnamed_arg< T3,n3 > r3;
-        typedef typename r3::type a3;
-        typedef typename r3::next_arg n4;
-        typedef typename aux::resolve_bind_arg< a3,U1,U2,U3,U4,U5 > f3;
-
-        typedef typename if_<t1,f2,f3>::type f_;
-     public:
-        typedef typename f_::type type;
-    };
-};
-#endif
-
 #elif defined(BOOST_MSVC) && (BOOST_MSVC <= 1300)
 
 // MSVC6.5-specific version
@@ -265,7 +176,100 @@ struct if_
 
 #endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 
-BOOST_MPL_AUX_VOID_SPEC(3, if_)
+BOOST_MPL_AUX_AGLORITHM_NAMESPACE_END
+
+BOOST_MPL_AUX_ALGORITHM_VOID_SPEC(3, if_)
+
+
+#if !defined(BOOST_MPL_NO_FULL_LAMBDA_SUPPORT)
+
+// Aleksey, check it out: lazy if_ evaluation in lambdas!
+// I think this doesn't handle the case of
+//
+//    _1<foo<_2>, bar<_2>, baz<_2> >
+//
+// (or however it is that you express that... when the ordinary bind3
+// computes the function based on the actual arguments). That leads me
+// to think that some kind of true currying might be a better
+// approach, e.g.:
+//
+//
+//  boost::mpl::bind3<
+//         boost::mpl::quote3<boost::mpl::if_>
+//       , boost::mpl::bind1<boost::mpl::quote1<boost::is_reference>, boost::mpl::arg<1> >
+//       , boost::mpl::arg<1>
+//       , boost::mpl::bind1<boost::mpl::quote1<add_ptr>, boost::mpl::arg<1> > 
+//  >::apply<...>
+//
+// becomes:
+//
+//  boost::mpl::bind<
+//         boost::mpl::quote3<boost::mpl::if_>
+//  >::bind<
+//       , boost::mpl::bind1<boost::mpl::quote1<boost::is_reference>,
+//         boost::mpl::arg<1> >
+//  >::bind<
+//         boost::mpl::arg<1>
+//  >::bind<
+//       boost::mpl::bind1<boost::mpl::quote1<add_ptr>, boost::mpl::arg<1> > 
+//  >::apply<...>
+//
+// so that after the 2nd bind we have a different function depending
+// on the result of is_reference.
+
+template <class T1, class T2, class T3, class T4> struct bind3;
+template <template <class T1, class T2, class T3> class F, class tag> struct quote3;
+
+namespace aux
+{
+  template <
+      typename T
+    , BOOST_MPL_PP_PARAMS(BOOST_MPL_METAFUNCTION_MAX_ARITY, typename U)
+  > struct resolve_bind_arg;
+
+  template<
+        typename T
+      , typename Arg
+      >
+  struct replace_unnamed_arg;
+}
+
+template<
+      typename T1, typename T2, typename T3
+    >
+struct bind3<quote3<if_, void_>, T1, T2, T3>
+{
+    template<
+          typename U1 = void_, typename U2 = void_, typename U3 = void_
+        , typename U4 = void_, typename U5 = void_
+        >
+    struct apply
+    {
+     private:
+        typedef quote3<if_, void_> a0;
+        typedef mpl::arg< 1> n1;
+        
+        typedef aux::replace_unnamed_arg< T1,n1 > r1;
+        typedef typename r1::type a1;
+        typedef typename r1::next_arg n2;
+        typedef typename aux::resolve_bind_arg< a1,U1,U2,U3,U4,U5 >::type t1;
+
+        typedef aux::replace_unnamed_arg< T2,n2 > r2;
+        typedef typename r2::type a2;
+        typedef typename r2::next_arg n3;
+        typedef typename aux::resolve_bind_arg< a2,U1,U2,U3,U4,U5 > f2;
+
+        typedef aux::replace_unnamed_arg< T3,n3 > r3;
+        typedef typename r3::type a3;
+        typedef typename r3::next_arg n4;
+        typedef typename aux::resolve_bind_arg< a3,U1,U2,U3,U4,U5 > f3;
+
+        typedef typename if_<t1,f2,f3>::type f_;
+     public:
+        typedef typename f_::type type;
+    };
+};
+#endif
 
 } // namespace mpl
 } // namespace boost