[Boost-commit] svn:boost r49434 - trunk/libs/serialization/doc

Subject: [Boost-commit] svn:boost r49434 - trunk/libs/serialization/doc
From: ramey_at_[hidden]
Date: 2008-10-22 13:27:32

Author: ramey
Date: 2008-10-22 13:27:31 EDT (Wed, 22 Oct 2008)
New Revision: 49434
URL: http://svn.boost.org/trac/boost/changeset/49434

Log:
Fixed svn merge repeated paragraph
Text files modified: 
   trunk/libs/serialization/doc/traits.html |    30 ------------------------------          
   1 files changed, 0 insertions(+), 30 deletions(-)

Modified: trunk/libs/serialization/doc/traits.html
==============================================================================
--- trunk/libs/serialization/doc/traits.html	(original)
+++ trunk/libs/serialization/doc/traits.html	2008-10-22 13:27:31 EDT (Wed, 22 Oct 2008)
@@ -468,8 +468,6 @@
 <tr><td><code>IsWrapper</code></td><td><code></code>is the type a wrapper?</td><td><code>mpl::false_<br>mpl::true_</code></td><td><code>mpl::false_</code></td></tr>
 </table>
 
-<<<<<<< .working
-
 <h3><a name="tracking">Bitwise serialization</a></h3>
 Some simple classes could be serialized just by directly copying all bits
 of the class. This is, in particular, the case for POD data types containing
@@ -495,34 +493,6 @@
 BOOST_IS_BITWISE_SERIALIZABLE(my_class)
 </code></pre>
 
-=======
-
-<h3><a name="tracking">Bitwise serialization</a></h3>
-Some simple classes could be serialized just by directly copying all bits
-of the class. This is, in particular, the case for POD data types containing
-no pointer members, and which are neither versioned nor tracked. Some archives, 
-such as non-portable binary archives can make us of this information to 
-substantially speed up Serialization.
-
-To indicate the possibility of bitwise serialization the type trait defined 
-in the header
-file is_bitwise_serializable.hpp
-is used:
-<pre><code>
-namespace boost { namespace serialization {
-    template<class T>
-    struct is_bitwise_serializable
-     : public is_arithmetic<T>
-    {};
-} }
-</code></pre>
-is used, and can be specialized for other classes. The specialization
-is made easy by the corresponding macro:
-<pre><code>
-BOOST_IS_BITWISE_SERIALIZABLE(my_class)
-</code></pre>
-
->>>>>>> .merge-right.r41077
 <hr>
 <p><i>&copy; Copyright Robert Ramey 2002-2004 and Matthias Troyer 2006. 
 Distributed under the Boost Software License, Version 1.0. (See