|
|
Boost-Commit : |
From: troyer_at_[hidden]
Date: 2008-07-08 02:06:55
Author: troyer
Date: 2008-07-08 02:06:53 EDT (Tue, 08 Jul 2008)
New Revision: 47210
URL: http://svn.boost.org/trac/boost/changeset/47210
Log:
Merged laste changes from the trunk
Text files modified:
branches/release/boost/archive/basic_binary_iprimitive.hpp | 8 ++++----
branches/release/boost/archive/basic_binary_oprimitive.hpp | 4 ++--
branches/release/boost/archive/detail/oserializer.hpp | 10 +++++++---
branches/release/boost/archive/impl/xml_wiarchive_impl.ipp | 2 +-
branches/release/boost/archive/impl/xml_woarchive_impl.ipp | 7 ++++---
branches/release/boost/archive/shared_ptr_helper.hpp | 12 ++++++++----
branches/release/boost/serialization/export.hpp | 12 +++++++++---
branches/release/libs/serialization/doc/headers.html | 13 +++++++------
branches/release/libs/serialization/doc/performance_status.html | 2 +-
branches/release/libs/serialization/doc/special.html | 4 ++--
branches/release/libs/serialization/doc/style.css | 7 +++++++
branches/release/libs/serialization/doc/todo.html | 2 +-
branches/release/libs/serialization/example/portable_binary_archive.hpp | 5 +++++
branches/release/libs/serialization/test/A.hpp | 6 ++----
branches/release/libs/serialization/test/test_codecvt_null.cpp | 4 ++--
branches/release/libs/serialization/test/test_exported.cpp | 4 ++--
branches/release/libs/serialization/test/test_set.cpp | 7 ++++++-
branches/release/libs/serialization/vc7ide/readme.txt | 7 ++++++-
18 files changed, 76 insertions(+), 40 deletions(-)
Modified: branches/release/boost/archive/basic_binary_iprimitive.hpp
==============================================================================
--- branches/release/boost/archive/basic_binary_iprimitive.hpp (original)
+++ branches/release/boost/archive/basic_binary_iprimitive.hpp 2008-07-08 02:06:53 EDT (Tue, 08 Jul 2008)
@@ -120,11 +120,11 @@
~basic_binary_iprimitive();
public:
// we provide an optimized load for all fundamental types
- //typedef serialization::is_bitwise_serializable<mpl::_1>
- // use_array_optimization;
+ // typedef serialization::is_bitwise_serializable<mpl::_1>
+ // use_array_optimization;
struct use_array_optimization {
- template <class T>
- struct apply : public serialization::is_bitwise_serializable<T> {};
+ template <class T>
+ struct apply : public serialization::is_bitwise_serializable<T> {};
};
// the optimized load_array dispatches to load_binary
Modified: branches/release/boost/archive/basic_binary_oprimitive.hpp
==============================================================================
--- branches/release/boost/archive/basic_binary_oprimitive.hpp (original)
+++ branches/release/boost/archive/basic_binary_oprimitive.hpp 2008-07-08 02:06:53 EDT (Tue, 08 Jul 2008)
@@ -120,13 +120,13 @@
// workaround without using mpl lambdas
struct use_array_optimization {
template <class T>
- struct apply : public serialization::is_bitwise_serializable<T> {};
+ struct apply : public boost::serialization::is_bitwise_serializable<T> {};
};
// the optimized save_array dispatches to save_binary
template <class ValueType>
- void save_array(serialization::array<ValueType> const& a, unsigned int)
+ void save_array(boost::serialization::array<ValueType> const& a, unsigned int)
{
save_binary(a.address(),a.count()*sizeof(ValueType));
}
Modified: branches/release/boost/archive/detail/oserializer.hpp
==============================================================================
--- branches/release/boost/archive/detail/oserializer.hpp (original)
+++ branches/release/boost/archive/detail/oserializer.hpp 2008-07-08 02:06:53 EDT (Tue, 08 Jul 2008)
@@ -353,8 +353,8 @@
T & t
){
BOOST_DEDUCED_TYPENAME
- boost::serialization::type_info_implementation<T>::type
- const & i = boost::serialization::type_info_implementation<T>::type
+ boost::serialization::type_info_implementation<T>::type const
+ & i = boost::serialization::type_info_implementation<T>::type
::get_const_instance();
boost::serialization::extended_type_info const * const this_type = & i;
@@ -383,7 +383,11 @@
}
// convert pointer to more derived type. if this is thrown
// it means that the base/derived relationship hasn't be registered
- vp = serialization::void_downcast(*true_type, *this_type, &t);
+ vp = serialization::void_downcast(
+ *true_type,
+ *this_type,
+ static_cast<const void *>(&t)
+ );
if(NULL == vp){
boost::throw_exception(
archive_exception(archive_exception::unregistered_cast)
Modified: branches/release/boost/archive/impl/xml_wiarchive_impl.ipp
==============================================================================
--- branches/release/boost/archive/impl/xml_wiarchive_impl.ipp (original)
+++ branches/release/boost/archive/impl/xml_wiarchive_impl.ipp 2008-07-08 02:06:53 EDT (Tue, 08 Jul 2008)
@@ -166,7 +166,7 @@
archive_locale.reset(
add_facet(
std::locale::classic(),
- new detail::utf8_codecvt_facet
+ new boost::archive::detail::utf8_codecvt_facet
)
);
is.imbue(* archive_locale);
Modified: branches/release/boost/archive/impl/xml_woarchive_impl.ipp
==============================================================================
--- branches/release/boost/archive/impl/xml_woarchive_impl.ipp (original)
+++ branches/release/boost/archive/impl/xml_woarchive_impl.ipp 2008-07-08 02:06:53 EDT (Tue, 08 Jul 2008)
@@ -139,12 +139,13 @@
// we can hack around this by using a static codecvt that never
// gets destroyed.
if(0 == (flags & no_codecvt)){
- detail::utf8_codecvt_facet *pfacet;
+ boost::archive::detail::utf8_codecvt_facet *pfacet;
#if defined(__SGI_STL_PORT)
- static detail::utf8_codecvt_facet facet(static_cast<size_t>(1));
+ static boost::archive::detail::utf8_codecvt_facet
+ facet(static_cast<size_t>(1));
pfacet = & facet;
#else
- pfacet = new detail::utf8_codecvt_facet;
+ pfacet = new boost::archive::detail::utf8_codecvt_facet;
#endif
archive_locale.reset(add_facet(std::locale::classic(), pfacet));
os.imbue(* archive_locale);
Modified: branches/release/boost/archive/shared_ptr_helper.hpp
==============================================================================
--- branches/release/boost/archive/shared_ptr_helper.hpp (original)
+++ branches/release/boost/archive/shared_ptr_helper.hpp 2008-07-08 02:06:53 EDT (Tue, 08 Jul 2008)
@@ -54,7 +54,7 @@
// a common class for holding various types of shared pointers
class shared_ptr_helper {
- typedef std::map<void*, shared_ptr<void> > collection_type;
+ typedef std::map<const void *, shared_ptr<void> > collection_type;
typedef collection_type::const_iterator iterator_type;
// list of shared_pointers create accessable by raw pointer. This
// is used to "match up" shared pointers loaded at different
@@ -86,7 +86,7 @@
// return a void pointer to the most derived type
template<class T>
- void * object_identifier(T * t) const {
+ const void * object_identifier(T * t) const {
const boost::serialization::extended_type_info * true_type
= boost::serialization::type_info_implementation<T>::type
::get_const_instance().get_derived_extended_type_info(*t);
@@ -101,7 +101,11 @@
const boost::serialization::extended_type_info * this_type
= & boost::serialization::type_info_implementation<T>::type
::get_const_instance();
- void * vp = void_downcast(*true_type, *this_type, t);
+ const void * vp = void_downcast(
+ *true_type,
+ *this_type,
+ static_cast<const void *>(t)
+ );
return vp;
}
public:
@@ -113,7 +117,7 @@
}
// get pointer to the most derived object. This is effectively
// the object identifer
- void * od = object_identifier(r);
+ const void * od = object_identifier(r);
if(NULL == m_pointers)
m_pointers = new collection_type;
Modified: branches/release/boost/serialization/export.hpp
==============================================================================
--- branches/release/boost/serialization/export.hpp (original)
+++ branches/release/boost/serialization/export.hpp 2008-07-08 02:06:53 EDT (Tue, 08 Jul 2008)
@@ -104,18 +104,24 @@
ptr_serialization_support<Archive,Serializable>::instantiate()
{
export_impl<Archive,Serializable>::enable_save(
- BOOST_DEDUCED_TYPENAME Archive::is_saving()
+ #if ! defined(__BORLANDC__)
+ BOOST_DEDUCED_TYPENAME
+ #endif
+ Archive::is_saving()
);
export_impl<Archive,Serializable>::enable_load(
- BOOST_DEDUCED_TYPENAME Archive::is_loading()
+ #if ! defined(__BORLANDC__)
+ BOOST_DEDUCED_TYPENAME
+ #endif
+ Archive::is_loading()
);
}
template<class T>
struct guid_initializer
{
- const guid_initializer & export_guid(char const* key, mpl::false_){
+ const guid_initializer & export_guid(char const* /* key */, mpl::false_){
// generates the statically-initialized objects whose constructors
// register the information allowing serialization of T objects
// through pointers to their base classes.
Modified: branches/release/libs/serialization/doc/headers.html
==============================================================================
--- branches/release/libs/serialization/doc/headers.html (original)
+++ branches/release/libs/serialization/doc/headers.html 2008-07-08 02:06:53 EDT (Tue, 08 Jul 2008)
@@ -161,13 +161,14 @@
</a>
<dd>For serialization of pointers to derived classes via key export.</dd>
-<dt><a target="is_abstract" href="../../../boost/serialization/is_abstract.hpp">
-boost/serialization/is_abstract.hpp
+<dt><a target="assume_abstract" href="../../../boost/serialization/assume_abstract.hpp">
+boost/serialization/assume_abstract.hpp
</a>
-<dd>For serialization of pointers to abstract base classes. A generic implementation
-of this is functional only on the most modern compilers. This one is just
-a thin wrapper which permits one to specify "by hand" whether or not a base class
-is abstract or not.</dd>
+<dd>This is just a thin wrapper which permits one to explicitly specify that a
+particular type is an abstract base class. It is necessary to use this
+for compilers which don't support the boost type traits implementation of
+is_abstact.
+</dd>
</dl>
Modified: branches/release/libs/serialization/doc/performance_status.html
==============================================================================
--- branches/release/libs/serialization/doc/performance_status.html (original)
+++ branches/release/libs/serialization/doc/performance_status.html 2008-07-08 02:06:53 EDT (Tue, 08 Jul 2008)
@@ -5,7 +5,7 @@
<body bgcolor="#ffffff" text="#000000">
<table border="0">
<tr>
-<td><img border="0" src="C:/BoostTrunk/boost.png" width="277" height="86"></td>
+<td><img border="0" src="../../../boost.png" width="277" height="86"></td>
<td>
<h1>Library Status: serialization</h1>
<b>Run Date:</b> 02:42:48 UTC, Tuesday 10 June 2008
Modified: branches/release/libs/serialization/doc/special.html
==============================================================================
--- branches/release/libs/serialization/doc/special.html (original)
+++ branches/release/libs/serialization/doc/special.html 2008-07-08 02:06:53 EDT (Tue, 08 Jul 2008)
@@ -416,8 +416,8 @@
<code style="white-space: normal">test_dll_simple</code>
</a>,
and
-<a href = "../test/dll_A.cpp" target="dll_A">
-<code style="white-space: normal">dll_A.cpp</code>
+<a href = "../test/dll_a.cpp" target="dll_a">
+<code style="white-space: normal">dll_a.cpp</code>
</a>
where implementation of serializaton is also completely separate
from the main program but the code is loaded at runtime. In this
Modified: branches/release/libs/serialization/doc/style.css
==============================================================================
--- branches/release/libs/serialization/doc/style.css (original)
+++ branches/release/libs/serialization/doc/style.css 2008-07-08 02:06:53 EDT (Tue, 08 Jul 2008)
@@ -6,3 +6,10 @@
MARGIN-LEFT: 0pt;
background-color: #EEEEEE;
}
+
+/*
+(C) Copyright 2008 Robert Ramey - http://www.rrsd.com .
+Use, modification and distribution is subject to the Boost Software
+License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+http://www.boost.org/LICENSE_1_0.txt)
+*/
\ No newline at end of file
Modified: branches/release/libs/serialization/doc/todo.html
==============================================================================
--- branches/release/libs/serialization/doc/todo.html (original)
+++ branches/release/libs/serialization/doc/todo.html 2008-07-08 02:06:53 EDT (Tue, 08 Jul 2008)
@@ -30,7 +30,7 @@
<dt>Performance Testing and Profiling</dt>
<dt>Back Versioning</dt>
<dt>Testing for Environments with No RTTI</dt>
- <dt>Additional Case Studies</dt>
+ <dt>Additional Case Studies</dt>
</dl>
These are enhancements that the serialization library needs but have not been done.
Modified: branches/release/libs/serialization/example/portable_binary_archive.hpp
==============================================================================
--- branches/release/libs/serialization/example/portable_binary_archive.hpp (original)
+++ branches/release/libs/serialization/example/portable_binary_archive.hpp 2008-07-08 02:06:53 EDT (Tue, 08 Jul 2008)
@@ -1,6 +1,11 @@
#ifndef PORTABLE_BINARY_ARCHIVE_HPP
#define PORTABLE_BINARY_ARCHIVE_HPP
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
// MS compatible compilers support #pragma once
#if defined(_MSC_VER) && (_MSC_VER >= 1020)
# pragma once
Modified: branches/release/libs/serialization/test/A.hpp
==============================================================================
--- branches/release/libs/serialization/test/A.hpp (original)
+++ branches/release/libs/serialization/test/A.hpp 2008-07-08 02:06:53 EDT (Tue, 08 Jul 2008)
@@ -16,18 +16,16 @@
// See http://www.boost.org for updates, documentation, and revision history.
-#include <cstddef> // size_t
#include <ostream> // for friend output operators
-
+#include <cstddef> // size_t
#include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
-
#if defined(BOOST_NO_STDC_NAMESPACE)
namespace std{
using ::size_t;
}
#endif
+#include <boost/detail/workaround.hpp>
#include <boost/limits.hpp>
#include <boost/cstdint.hpp>
Modified: branches/release/libs/serialization/test/test_codecvt_null.cpp
==============================================================================
--- branches/release/libs/serialization/test/test_codecvt_null.cpp (original)
+++ branches/release/libs/serialization/test/test_codecvt_null.cpp 2008-07-08 02:06:53 EDT (Tue, 08 Jul 2008)
@@ -16,9 +16,9 @@
#include <iterator>
#include <locale>
#include <vector>
-#include <cstddef> // NULL
-
#include <cstdio> // remove
+#include <cstddef> // NULL, size_t
+
#include <boost/config.hpp>
#if defined(BOOST_NO_STDC_NAMESPACE)
namespace std{
Modified: branches/release/libs/serialization/test/test_exported.cpp
==============================================================================
--- branches/release/libs/serialization/test/test_exported.cpp (original)
+++ branches/release/libs/serialization/test/test_exported.cpp 2008-07-08 02:06:53 EDT (Tue, 08 Jul 2008)
@@ -30,7 +30,7 @@
template<class Archive>
void polymorphic_base::serialize(
- Archive &ar,
+ Archive & /* ar */,
const unsigned int /* file_version */){
}
@@ -38,7 +38,7 @@
{
friend class boost::serialization::access;
template<class Archive>
- void serialize(Archive &ar, const unsigned int /* file_version */){
+ void serialize(Archive & ar, const unsigned int /* file_version */){
ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(polymorphic_base);
}
public:
Modified: branches/release/libs/serialization/test/test_set.cpp
==============================================================================
--- branches/release/libs/serialization/test/test_set.cpp (original)
+++ branches/release/libs/serialization/test/test_set.cpp 2008-07-08 02:06:53 EDT (Tue, 08 Jul 2008)
@@ -8,7 +8,7 @@
// should pass compilation and execution
-#include <cstddef> // NULL
+#include <cstddef> // NULLsize_t
#include <cstdio> // remove
#include <fstream>
@@ -16,6 +16,11 @@
#include <vector>
#include <boost/config.hpp>
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{
+ using ::size_t;
+}
+#endif
#include <boost/detail/workaround.hpp>
#if defined(BOOST_NO_STDC_NAMESPACE)
Modified: branches/release/libs/serialization/vc7ide/readme.txt
==============================================================================
--- branches/release/libs/serialization/vc7ide/readme.txt (original)
+++ branches/release/libs/serialization/vc7ide/readme.txt 2008-07-08 02:06:53 EDT (Tue, 08 Jul 2008)
@@ -21,4 +21,9 @@
After each test is built, it is run and the ouput is shown in the IDE Output window.
Note that the fact that all configurations are not valid for all tests precludes building
-the all the tests from withing the IDE in one batch.
\ No newline at end of file
+the all the tests from withing the IDE in one batch.
+
+(C) Copyright 2008 Robert Ramey - http://www.rrsd.com .
+Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+http://www.boost.org/LICENSE_1_0.txt)
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk