[Boost-commit] svn:boost r59938 - in sandbox/statistics/detail/serialization: boost/serialization/detail/inherit boost/serialization/detail/inherit/detail libs/serialization/detail/example

Subject: [Boost-commit] svn:boost r59938 - in sandbox/statistics/detail/serialization: boost/serialization/detail/inherit boost/serialization/detail/inherit/detail libs/serialization/detail/example
From: erwann.rogard_at_[hidden]
Date: 2010-02-25 21:44:16

Author: e_r
Date: 2010-02-25 21:44:15 EST (Thu, 25 Feb 2010)
New Revision: 59938
URL: http://svn.boost.org/trac/boost/changeset/59938

Log:
m
Text files modified: 
   sandbox/statistics/detail/serialization/boost/serialization/detail/inherit/detail/stream.hpp       |     2 +-                                      
   sandbox/statistics/detail/serialization/boost/serialization/detail/inherit/detail/test_wrapper.hpp |     2 +-                                      
   sandbox/statistics/detail/serialization/boost/serialization/detail/inherit/include.hpp             |     2 +-                                      
   sandbox/statistics/detail/serialization/boost/serialization/detail/inherit/inherit.hpp             |     5 +++--                                   
   sandbox/statistics/detail/serialization/boost/serialization/detail/inherit/inherit2.hpp            |    15 ++++++++++-----                         
   sandbox/statistics/detail/serialization/boost/serialization/detail/inherit/inherit_linearly.hpp    |     2 +-                                      
   sandbox/statistics/detail/serialization/libs/serialization/detail/example/inherit_linearly.cpp     |     3 ++-                                     
   7 files changed, 19 insertions(+), 12 deletions(-)

Modified: sandbox/statistics/detail/serialization/boost/serialization/detail/inherit/detail/stream.hpp
==============================================================================
--- sandbox/statistics/detail/serialization/boost/serialization/detail/inherit/detail/stream.hpp	(original)
+++ sandbox/statistics/detail/serialization/boost/serialization/detail/inherit/detail/stream.hpp	2010-02-25 21:44:15 EST (Thu, 25 Feb 2010)
@@ -32,7 +32,7 @@
         // Writes a comma separated list of the instances of the non-empty
         // "terminal types" within the nested structure inherit2<T1,T2>. A terminal 
     // type is one that is not an instance of inherit2.
-    // For example, if these type are A,B,C, with descriptions 'a, 'b' and 'c',
+    // For example, if these types are A,B,C, with descriptions 'a, 'b' and 'c',
     // "a,b,c" is written to os.
     template<typename A,typename B,typename T1,typename T2>
         std::basic_ostream<A,B>&

Modified: sandbox/statistics/detail/serialization/boost/serialization/detail/inherit/detail/test_wrapper.hpp
==============================================================================
--- sandbox/statistics/detail/serialization/boost/serialization/detail/inherit/detail/test_wrapper.hpp	(original)
+++ sandbox/statistics/detail/serialization/boost/serialization/detail/inherit/detail/test_wrapper.hpp	2010-02-25 21:44:15 EST (Thu, 25 Feb 2010)
@@ -38,7 +38,7 @@
     template<typename A,typename B,typename T>
         std::basic_ostream<A,B>&
     operator<<(std::basic_ostream<A,B>& os,const test_wrapper<T>& that){
-		return os << '(' << that.value << ')';
+		return os << that.value;
     }
 
 

Modified: sandbox/statistics/detail/serialization/boost/serialization/detail/inherit/include.hpp
==============================================================================
--- sandbox/statistics/detail/serialization/boost/serialization/detail/inherit/include.hpp	(original)
+++ sandbox/statistics/detail/serialization/boost/serialization/detail/inherit/include.hpp	2010-02-25 21:44:15 EST (Thu, 25 Feb 2010)
@@ -10,6 +10,6 @@
 #ifndef BOOST_SERIALIZATION_DETAIL_INHERIT_INCLUDE_HPP_ER_2010
 #define BOOST_SERIALIZATION_DETAIL_INHERIT_INCLUDE_HPP_ER_2010
 
-#include <boost/serialization/detail/inherit.hpp>
+#include <boost/serialization/detail/inherit_linearly.hpp>
 
 #endif
\ No newline at end of file

Modified: sandbox/statistics/detail/serialization/boost/serialization/detail/inherit/inherit.hpp
==============================================================================
--- sandbox/statistics/detail/serialization/boost/serialization/detail/inherit/inherit.hpp	(original)
+++ sandbox/statistics/detail/serialization/boost/serialization/detail/inherit/inherit.hpp	2010-02-25 21:44:15 EST (Thu, 25 Feb 2010)
@@ -11,13 +11,14 @@
 #define BOOST_SERIALIZATION_DETAIL_INHERIT_INHERIT_HPP_ER_2010
 #include <boost/mpl/empty_base.hpp>
 #include <boost/serialization/base_object.hpp>
-#include <boost/serialization/detail/inherit/inherit2.hpp>
+#include <boost/serialization/detail/inherit/detail/inherit2.hpp>
 
 namespace boost{
 namespace serialization{
 namespace detail{
           
-	// THIS CLASS IS PROBABLY SUPERSEDED BY inherit_linearly                                  
+	// Warning : this class is probably deprecated and superseded by 
+    // inherit_linearly. It is retained temporarily for testing purposes.                                  
     template<
             typename T1 = boost::mpl::empty_base,
         typename T2 = boost::mpl::empty_base,

Modified: sandbox/statistics/detail/serialization/boost/serialization/detail/inherit/inherit2.hpp
==============================================================================
--- sandbox/statistics/detail/serialization/boost/serialization/detail/inherit/inherit2.hpp	(original)
+++ sandbox/statistics/detail/serialization/boost/serialization/detail/inherit/inherit2.hpp	2010-02-25 21:44:15 EST (Thu, 25 Feb 2010)
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// serialization::detail::inherit::inherit2.hpp         					//
+// serialization::detail::inherit::detail::inherit2.hpp         			//
 //                                                                          //
 //                                                                          //
 //  (C) Copyright 2010 Erwann Rogard                                        //
@@ -7,8 +7,8 @@
 //  Boost Software License, Version 1.0. (See accompanying file             //
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)        //
 //////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_SERIALIZATION_DETAIL_INHERIT_INHERIT2_HPP_ER_2010
-#define BOOST_SERIALIZATION_DETAIL_INHERIT_INHERIT2_HPP_ER_2010
+#ifndef BOOST_SERIALIZATION_DETAIL_INHERIT_DETAIL_INHERIT2_HPP_ER_2010
+#define BOOST_SERIALIZATION_DETAIL_INHERIT_DETAIL_INHERIT2_HPP_ER_2010
 #include <boost/mpl/empty_base.hpp>
 #include <boost/concept/assert.hpp>
 #include <boost/accumulators/framework/accumulator_base.hpp>
@@ -20,8 +20,13 @@
 namespace serialization{
 namespace detail{
 
-	// Inherits from the non-empty base subset of {T1,T2} and implements 
-    // serialization and operator<<(ostream,)
+	// inherit2<T1,T2> innherits from the elements of {T1,T2} that are not of
+    // type mpl::empty_base, and for those, forwards an argument pack at
+    // construction, serialization.
+    //
+    // operator<<(ostream,) requires special formatting that is implemented in
+    // detail/stream.hpp
+
         template<typename T1,typename T2>
         struct inherit2 : T1, T2
         {

Modified: sandbox/statistics/detail/serialization/boost/serialization/detail/inherit/inherit_linearly.hpp
==============================================================================
--- sandbox/statistics/detail/serialization/boost/serialization/detail/inherit/inherit_linearly.hpp	(original)
+++ sandbox/statistics/detail/serialization/boost/serialization/detail/inherit/inherit_linearly.hpp	2010-02-25 21:44:15 EST (Thu, 25 Feb 2010)
@@ -15,7 +15,7 @@
 #include <boost/serialization/base_object.hpp>
 
 #include <boost/concept/assert.hpp>
-#include <boost/serialization/detail/inherit/inherit2.hpp>
+#include <boost/serialization/detail/inherit/detail/inherit2.hpp>
 
 namespace boost{
 namespace serialization{

Modified: sandbox/statistics/detail/serialization/libs/serialization/detail/example/inherit_linearly.cpp
==============================================================================
--- sandbox/statistics/detail/serialization/libs/serialization/detail/example/inherit_linearly.cpp	(original)
+++ sandbox/statistics/detail/serialization/libs/serialization/detail/example/inherit_linearly.cpp	2010-02-25 21:44:15 EST (Thu, 25 Feb 2010)
@@ -39,7 +39,7 @@
     template<typename A,typename B>
         std::basic_ostream<A,B>&
     operator<<(std::basic_ostream<A,B>& os,const foo& that){
-		return os << '(' << that.value << ')';
+		return os << that.value;
     }
 
 
@@ -82,6 +82,7 @@
 
         os << "description : ";
         {
+    	// prints (-1,1,-0.999,-1)
             os << inlin << std::endl;
     }
         os << "save" << std::endl;