[Boost-commit] svn:boost r63521 - branches/release/libs/mpl/doc/src/refmanual

Subject: [Boost-commit] svn:boost r63521 - branches/release/libs/mpl/doc/src/refmanual
From: agurtovoy_at_[hidden]
Date: 2010-07-02 14:57:30

Author: agurtovoy
Date: 2010-07-02 05:26:29 EDT (Fri, 02 Jul 2010)
New Revision: 63521
URL: http://svn.boost.org/trac/boost/changeset/63521

Log:
Manually merge changesets @55858 and @58111 from the trunk (svnmerge.py refuses to)
Text files modified: 
   branches/release/libs/mpl/doc/src/refmanual/for_each.rst |     4 ++--                                    
   branches/release/libs/mpl/doc/src/refmanual/protect.rst  |    21 +++++++++------------                   
   2 files changed, 11 insertions(+), 14 deletions(-)

Modified: branches/release/libs/mpl/doc/src/refmanual/for_each.rst
==============================================================================
--- branches/release/libs/mpl/doc/src/refmanual/for_each.rst	(original)
+++ branches/release/libs/mpl/doc/src/refmanual/for_each.rst	2010-07-02 05:26:29 EDT (Fri, 02 Jul 2010)
@@ -103,7 +103,7 @@
         
     .. parsed-literal::
 
-        for_each< tranform_view<s,op> >( f );
+        for_each< transform_view<s,op> >( f );
 
 
 Complexity
@@ -121,7 +121,7 @@
     {
         template< typename U > void operator()(U x)
         {
-            std::cout << x << '\n';
+            std::cout << x << '\\n';
         }
     };
 

Modified: branches/release/libs/mpl/doc/src/refmanual/protect.rst
==============================================================================
--- branches/release/libs/mpl/doc/src/refmanual/protect.rst	(original)
+++ branches/release/libs/mpl/doc/src/refmanual/protect.rst	2010-07-02 05:26:29 EDT (Fri, 02 Jul 2010)
@@ -81,25 +81,22 @@
 
 .. parsed-literal::
     
-    FIXME
-    
     struct f
     {
         template< typename T1, typename T2 > struct apply
         {
-            // |...|
+            typedef T2 type;
         };
     };
-    
-    typedef bind<_1, protect< bind<f,_1,_2> > >
-    
-    typedef apply_wrap0< f0 >::type r1;
-    typedef apply_wrap0< g0 >::type r2;
-    typedef apply_wrap2< f2,int,char >::type r3;
-
+     
+    typedef bind< quote\ ``3``\<if\_>,_1,_2,bind<f,_1,_2> > b1;
+    typedef bind< quote\ ``3``\<if\_>,_1,_2,protect< bind<f,_1,_2> > > b2;
+     
+    typedef apply_wrap\ ``2``\< b1,false\_,char >::type r1;
+    typedef apply_wrap\ ``2``\< b2,false\_,char >::type r2;
+     
     BOOST_MPL_ASSERT(( is_same<r1,char> ));
-    BOOST_MPL_ASSERT(( is_same<r2,char> ));
-    BOOST_MPL_ASSERT(( is_same<r3,char> ));
+    BOOST_MPL_ASSERT(( is_same<r2,protect< bind<f,_1,_2> > > ));
 
 
 See also