[Boost-commit] svn:boost r59214 - in sandbox/statistics/detail/fusion: boost/statistics/detail/fusion/joint_view libs/statistics/detail/fusion/doc libs/statistics/detail/fusion/example libs/statistics/detail/fusion/src

Subject: [Boost-commit] svn:boost r59214 - in sandbox/statistics/detail/fusion: boost/statistics/detail/fusion/joint_view libs/statistics/detail/fusion/doc libs/statistics/detail/fusion/example libs/statistics/detail/fusion/src
From: erwann.rogard_at_[hidden]
Date: 2010-01-21 19:41:25

Author: e_r
Date: 2010-01-21 19:41:24 EST (Thu, 21 Jan 2010)
New Revision: 59214
URL: http://svn.boost.org/trac/boost/changeset/59214

Log:
m
Text files modified: 
   sandbox/statistics/detail/fusion/boost/statistics/detail/fusion/joint_view/binder.hpp          |     4 ++++                                    
   sandbox/statistics/detail/fusion/boost/statistics/detail/fusion/joint_view/binder_iterator.hpp |    34 +++++++++++++++++-----------------      
   sandbox/statistics/detail/fusion/libs/statistics/detail/fusion/doc/readme.txt                  |     7 ++++++-                                 
   sandbox/statistics/detail/fusion/libs/statistics/detail/fusion/example/joint_view_binder.cpp   |     3 ++-                                     
   sandbox/statistics/detail/fusion/libs/statistics/detail/fusion/src/main.cpp                    |     4 ++--                                    
   5 files changed, 31 insertions(+), 21 deletions(-)

Modified: sandbox/statistics/detail/fusion/boost/statistics/detail/fusion/joint_view/binder.hpp
==============================================================================
--- sandbox/statistics/detail/fusion/boost/statistics/detail/fusion/joint_view/binder.hpp	(original)
+++ sandbox/statistics/detail/fusion/boost/statistics/detail/fusion/joint_view/binder.hpp	2010-01-21 19:41:24 EST (Thu, 21 Jan 2010)
@@ -26,6 +26,8 @@
 namespace fusion{
 namespace joint_view{
 
+
+	// binds a sequence of type Seq1 to a sequence of arbitrary type. 
         template<
             typename Seq1, 
         bool is_left = true
@@ -54,6 +56,8 @@
     
                 public:
 
+		typedef Seq1 seq1_type;
+
                 template<typename S>
         struct result{};
 

Modified: sandbox/statistics/detail/fusion/boost/statistics/detail/fusion/joint_view/binder_iterator.hpp
==============================================================================
--- sandbox/statistics/detail/fusion/boost/statistics/detail/fusion/joint_view/binder_iterator.hpp	(original)
+++ sandbox/statistics/detail/fusion/boost/statistics/detail/fusion/joint_view/binder_iterator.hpp	2010-01-21 19:41:24 EST (Thu, 21 Jan 2010)
@@ -20,10 +20,10 @@
 namespace fusion{
 namespace joint_view{
 
-	template<typename Seq1, bool is_left = true>
+	template<typename Binder, bool is_left = true>
     struct binder_iterator
     {
-		typedef binder<Seq1,is_left> binder_;
+		typedef Binder binder_;
 
         template<typename It>
                 struct apply{
@@ -33,36 +33,36 @@
             typedef typename boost::result_of<binder_(cref_)>::type res_;
             typedef boost::function<res_(cref_)> 					fun_; 
             typedef boost::transform_iterator<fun_,It>  			type;
-			static type call(const Seq1& seq1,It it)
+			static type call(const binder_& binder,It it)
             {
-            	return type(it,binder_(seq1));
+            	return type(it,binder);
             }
 
                         typedef boost::iterator_range<type> range_type;
-            static range_type call(const Seq1& seq1,It b,It e){
+            static range_type call(const binder_& binder,It b,It e){
                     return range_type(
-                	call(seq1,b),
-                    call(seq1,e)
+                	call(binder,b),
+                    call(binder,e)
                 );
             }
 
                 };
     };
     
-    template<typename Seq1,typename It>
-    typename binder_iterator<Seq1>::template apply<It>::type
-    make_binder_iterator(const Seq1& seq1,It it)
+    template<typename Binder,typename It>
+    typename binder_iterator<Binder>::template apply<It>::type
+    make_binder_iterator(const Binder& binder,It it)
     {
-    	typedef binder_iterator<Seq1> meta_;
-    	return meta_::template apply<It>::call(seq1,it);
+    	typedef binder_iterator<Binder> meta_;
+    	return meta_::template apply<It>::call(binder,it);
     }
 
-    template<typename Seq1,typename It>
-    typename binder_iterator<Seq1>::template apply<It>::range_type
-    make_binder_range(const Seq1& seq1,It b,It e)
+    template<typename Binder,typename It>
+    typename binder_iterator<Binder>::template apply<It>::range_type
+    make_binder_range(const Binder& binder,It b,It e)
     {
-    	typedef binder_iterator<Seq1> meta_;
-    	return meta_::template apply<It>::call(seq1,b,e);
+    	typedef binder_iterator<Binder> meta_;
+    	return meta_::template apply<It>::call(binder,b,e);
     }
 
     

Modified: sandbox/statistics/detail/fusion/libs/statistics/detail/fusion/doc/readme.txt
==============================================================================
--- sandbox/statistics/detail/fusion/libs/statistics/detail/fusion/doc/readme.txt	(original)
+++ sandbox/statistics/detail/fusion/libs/statistics/detail/fusion/doc/readme.txt	2010-01-21 19:41:24 EST (Thu, 21 Jan 2010)
@@ -16,13 +16,18 @@
 These are small C++ tools that exploit Boost.Fusion and are used throughout the 
 sandbox/statistics package 
 
+[ Note ]
+
+The functionality in joint_view necessitates a patch (that eventually will be 
+part of the release).  See boost.user mailing 9/19/09.
+
 [ Compiler ]
 
 gcc version i686-apple-darwin9-gcc-4.0.1 (GCC) 4.0.1
 
 [ Dependencies ]
 
-boost_1_39_0
+boost_1_40_0
 
 [ Related ]
 

Modified: sandbox/statistics/detail/fusion/libs/statistics/detail/fusion/example/joint_view_binder.cpp
==============================================================================
--- sandbox/statistics/detail/fusion/libs/statistics/detail/fusion/example/joint_view_binder.cpp	(original)
+++ sandbox/statistics/detail/fusion/libs/statistics/detail/fusion/example/joint_view_binder.cpp	2010-01-21 19:41:24 EST (Thu, 21 Jan 2010)
@@ -8,9 +8,10 @@
 #include <vector>
 #include <fstream>
 #include <string>
-#include <boost/typeof/typeof.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/int.hpp>
+
+#include <boost/typeof/typeof.hpp>
 #include <boost/utility/result_of.hpp>
 #include <boost/assert.hpp>
 #include <boost/range.hpp>

Modified: sandbox/statistics/detail/fusion/libs/statistics/detail/fusion/src/main.cpp
==============================================================================
--- sandbox/statistics/detail/fusion/libs/statistics/detail/fusion/src/main.cpp	(original)
+++ sandbox/statistics/detail/fusion/libs/statistics/detail/fusion/src/main.cpp	2010-01-21 19:41:24 EST (Thu, 21 Jan 2010)
@@ -12,9 +12,9 @@
 
 int main(){
 
-    // example_at_key_iterator(std::cout);
+    example_at_key_iterator(std::cout);
     example_serialize(std::cout);
-    // example_joint_view_binder(std::cout);
+    example_joint_view_binder(std::cout);
 
     return 0;
 }