|
|
Boost-Commit : |
From: ramey_at_[hidden]
Date: 2007-11-22 00:56:29
Author: ramey
Date: 2007-11-22 00:56:28 EST (Thu, 22 Nov 2007)
New Revision: 41291
URL: http://svn.boost.org/trac/boost/changeset/41291
Log:
tested with statically loaded dlls
Text files modified:
branches/serialization_next_release/boost/boost/archive/codecvt_null.hpp | 5 +++--
branches/serialization_next_release/boost/boost/archive/detail/basic_iarchive.hpp | 4 ++--
branches/serialization_next_release/boost/boost/archive/detail/basic_iserializer.hpp | 4 ++--
branches/serialization_next_release/boost/boost/archive/detail/basic_serializer.hpp | 4 +++-
branches/serialization_next_release/boost/boost/archive/detail/iserializer.hpp | 15 +++++++++------
branches/serialization_next_release/boost/boost/archive/detail/oserializer.hpp | 27 ++++++++++++++++-----------
branches/serialization_next_release/boost/boost/archive/detail/utf8_codecvt_facet.hpp | 9 ++++-----
branches/serialization_next_release/boost/boost/archive/impl/archive_pointer_iserializer.ipp | 20 ++++++++++++--------
branches/serialization_next_release/boost/boost/archive/impl/archive_pointer_oserializer.ipp | 20 ++++++++++++--------
branches/serialization_next_release/boost/boost/archive/shared_ptr_helper.hpp | 2 +-
10 files changed, 64 insertions(+), 46 deletions(-)
Modified: branches/serialization_next_release/boost/boost/archive/codecvt_null.hpp
==============================================================================
--- branches/serialization_next_release/boost/boost/archive/codecvt_null.hpp (original)
+++ branches/serialization_next_release/boost/boost/archive/codecvt_null.hpp 2007-11-22 00:56:28 EST (Thu, 22 Nov 2007)
@@ -20,6 +20,7 @@
#include <cstddef>
#include <boost/config.hpp>
+#include <boost/archive/detail/auto_link_archive.hpp>
namespace std{
#if defined(__LIBCOMO__)
@@ -58,7 +59,7 @@
template<>
class codecvt_null<wchar_t> : public std::codecvt<wchar_t, char, std::mbstate_t>
{
- virtual std::codecvt_base::result
+ virtual BOOST_ARCHIVE_DECL(std::codecvt_base::result)
do_out(
std::mbstate_t & state,
const wchar_t * first1,
@@ -68,7 +69,7 @@
char * last2,
char * & next2
) const;
- virtual std::codecvt_base::result
+ virtual BOOST_ARCHIVE_DECL(std::codecvt_base::result)
do_in(
std::mbstate_t & state,
const char * first1,
Modified: branches/serialization_next_release/boost/boost/archive/detail/basic_iarchive.hpp
==============================================================================
--- branches/serialization_next_release/boost/boost/archive/detail/basic_iarchive.hpp (original)
+++ branches/serialization_next_release/boost/boost/archive/detail/basic_iarchive.hpp 2007-11-22 00:56:28 EST (Thu, 22 Nov 2007)
@@ -20,9 +20,9 @@
// #include <boost/scoped_ptr.hpp>
#include <boost/config.hpp>
-#include <boost/archive/basic_archive.hpp>
#include <boost/serialization/tracking_enum.hpp>
-
+#include <boost/archive/basic_archive.hpp>
+#include <boost/archive/detail/decl.hpp>
#include <boost/archive/detail/abi_prefix.hpp> // must be the last header
namespace boost {
Modified: branches/serialization_next_release/boost/boost/archive/detail/basic_iserializer.hpp
==============================================================================
--- branches/serialization_next_release/boost/boost/archive/detail/basic_iserializer.hpp (original)
+++ branches/serialization_next_release/boost/boost/archive/detail/basic_iserializer.hpp 2007-11-22 00:56:28 EST (Thu, 22 Nov 2007)
@@ -19,9 +19,9 @@
#include <cstdlib> // NULL
#include <boost/config.hpp>
-#include <boost/archive/detail/auto_link_archive.hpp>
+#include <boost/archive/detail/decl.hpp>
#include <boost/archive/detail/basic_serializer.hpp>
-
+#include <boost/archive/detail/auto_link_archive.hpp>
#include <boost/archive/detail/abi_prefix.hpp> // must be the last header
namespace boost {
Modified: branches/serialization_next_release/boost/boost/archive/detail/basic_serializer.hpp
==============================================================================
--- branches/serialization_next_release/boost/boost/archive/detail/basic_serializer.hpp (original)
+++ branches/serialization_next_release/boost/boost/archive/detail/basic_serializer.hpp 2007-11-22 00:56:28 EST (Thu, 22 Nov 2007)
@@ -34,7 +34,9 @@
const boost::serialization::extended_type_info & eti
) :
m_eti(eti)
- {}
+ {
+ assert(NULL != & eti);
+ }
public:
const boost::serialization::extended_type_info & get_eti() const {
return m_eti;
Modified: branches/serialization_next_release/boost/boost/archive/detail/iserializer.hpp
==============================================================================
--- branches/serialization_next_release/boost/boost/archive/detail/iserializer.hpp (original)
+++ branches/serialization_next_release/boost/boost/archive/detail/iserializer.hpp 2007-11-22 00:56:28 EST (Thu, 22 Nov 2007)
@@ -164,8 +164,9 @@
{
private:
virtual const basic_iserializer & get_basic_serializer() const {
- return boost::serialization::singleton<iserializer<Archive, T> >
- ::get_const_instance();
+ return boost::serialization::singleton<
+ iserializer<Archive, T>
+ >::get_const_instance();
}
virtual void load_object_ptr(
basic_iarchive & ar,
@@ -292,8 +293,9 @@
::get_const_instance()
)
{
- boost::serialization::singleton<iserializer<Archive, T> >
- ::get_mutable_instance().set_bpis(this);
+ boost::serialization::singleton<
+ iserializer<Archive, T>
+ >::get_mutable_instance().set_bpis(this);
}
template<class Archive, class T>
@@ -329,8 +331,9 @@
void * x = & const_cast<typex &>(t);
ar.load_object(
x,
- boost::serialization::singleton<iserializer<Archive, T> >
- ::get_const_instance()
+ boost::serialization::singleton<
+ iserializer<Archive, T>
+ >::get_const_instance()
);
}
};
Modified: branches/serialization_next_release/boost/boost/archive/detail/oserializer.hpp
==============================================================================
--- branches/serialization_next_release/boost/boost/archive/detail/oserializer.hpp (original)
+++ branches/serialization_next_release/boost/boost/archive/detail/oserializer.hpp 2007-11-22 00:56:28 EST (Thu, 22 Nov 2007)
@@ -155,8 +155,9 @@
{
private:
virtual const basic_oserializer & get_basic_serializer() const {
- return boost::serialization::singleton<oserializer<Archive, T> >
- ::get_const_instance();
+ return boost::serialization::singleton<
+ oserializer<Archive, T>
+ >::get_const_instance();
}
virtual void save_object_ptr(
basic_oarchive & ar,
@@ -193,8 +194,9 @@
)
{
// make sure appropriate member function is instantiated
- boost::serialization::singleton<oserializer<Archive, T> >
- ::get_mutable_instance().set_bpos(this);
+ boost::serialization::singleton<
+ oserializer<Archive, T>
+ >::get_mutable_instance().set_bpos(this);
}
template<class Archive, class T>
@@ -224,8 +226,9 @@
static void invoke(Archive &ar, const T & t){
ar.save_object(
& t,
- boost::serialization::singleton<oserializer<Archive, T> >
- ::get_const_instance()
+ boost::serialization::singleton<
+ oserializer<Archive, T>
+ >::get_const_instance()
);
}
};
@@ -344,16 +347,18 @@
const T & t,
const basic_pointer_oserializer * bpos_ptr
){
- const boost::serialization::extended_type_info * this_type
- = & boost::serialization::type_info_implementation<T>::type
+ const boost::serialization::type_info_implementation<T>::type & i
+ = boost::serialization::type_info_implementation<T>::type
::get_const_instance();
+
+ const boost::serialization::extended_type_info * this_type = & i;
+
// retrieve the true type of the object pointed to
// if this assertion fails its an error in this library
assert(NULL != this_type);
- const boost::serialization::extended_type_info * true_type
- = boost::serialization::type_info_implementation<T>::type
- ::get_const_instance().get_derived_extended_type_info(t);
+ const boost::serialization::extended_type_info * true_type =
+ i.get_derived_extended_type_info(t);
// note:if this exception is thrown, be sure that derived pointer
// is either registered or exported.
if(NULL == true_type){
Modified: branches/serialization_next_release/boost/boost/archive/detail/utf8_codecvt_facet.hpp
==============================================================================
--- branches/serialization_next_release/boost/boost/archive/detail/utf8_codecvt_facet.hpp (original)
+++ branches/serialization_next_release/boost/boost/archive/detail/utf8_codecvt_facet.hpp 2007-11-22 00:56:28 EST (Thu, 22 Nov 2007)
@@ -1,9 +1,8 @@
// Copyright © 2001 Ronald Garcia, Indiana University (garcia_at_[hidden])
-// Andrew Lumsdaine, Indiana University (lums_at_[hidden]). Permission to copy,
-// use, modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided "as is"
-// without express or implied warranty, and with no claim as to its suitability
-// for any purpose.
+// Andrew Lumsdaine, Indiana University (lums_at_[hidden]).
+// Distributed under 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)
#ifndef BOOST_ARCHIVE_DETAIL_UTF8_CODECVT_FACET_HPP
#define BOOST_ARCHIVE_DETAIL_UTF8_CODECVT_FACET_HPP
Modified: branches/serialization_next_release/boost/boost/archive/impl/archive_pointer_iserializer.ipp
==============================================================================
--- branches/serialization_next_release/boost/boost/archive/impl/archive_pointer_iserializer.ipp (original)
+++ branches/serialization_next_release/boost/boost/archive/impl/archive_pointer_iserializer.ipp 2007-11-22 00:56:28 EST (Thu, 22 Nov 2007)
@@ -36,8 +36,9 @@
basic_pointer_iserializer(eti)
{
std::pair<BOOST_DEDUCED_TYPENAME serializer_map<Archive>::iterator, bool> result;
- result = serialization::singleton<serializer_map<Archive> >
- ::get_mutable_instance().insert(this);
+ result = serialization::singleton<
+ serializer_map<Archive>
+ >::get_mutable_instance().insert(this);
assert(result.second);
}
@@ -48,13 +49,15 @@
){
const basic_serializer_arg bs(eti);
BOOST_DEDUCED_TYPENAME serializer_map<Archive>::const_iterator it;
- it = boost::serialization::singleton<serializer_map<Archive> >
- ::get_const_instance().find(& bs);
+ it = boost::serialization::singleton<
+ serializer_map<Archive>
+ >::get_const_instance().find(& bs);
assert(
it
!=
- boost::serialization::singleton<serializer_map<Archive> >
- ::get_const_instance().end()
+ boost::serialization::singleton<
+ serializer_map<Archive>
+ >::get_const_instance().end()
);
return static_cast<const basic_pointer_iserializer *>(*it);
}
@@ -65,8 +68,9 @@
// note: we need to check that the map still exists as we can't depend
// on static variables being constructed in a specific sequence
unsigned int count;
- count = serialization::singleton<serializer_map<Archive> >
- ::get_mutable_instance().erase(this);
+ count = serialization::singleton<
+ serializer_map<Archive>
+ >::get_mutable_instance().erase(this);
assert(count);
}
Modified: branches/serialization_next_release/boost/boost/archive/impl/archive_pointer_oserializer.ipp
==============================================================================
--- branches/serialization_next_release/boost/boost/archive/impl/archive_pointer_oserializer.ipp (original)
+++ branches/serialization_next_release/boost/boost/archive/impl/archive_pointer_oserializer.ipp 2007-11-22 00:56:28 EST (Thu, 22 Nov 2007)
@@ -38,8 +38,9 @@
BOOST_DEDUCED_TYPENAME serializer_map<Archive>::iterator,
bool
> result;
- result = serialization::singleton<serializer_map<Archive> >
- ::get_mutable_instance().insert(this);
+ result = serialization::singleton<
+ serializer_map<Archive>
+ >::get_mutable_instance().insert(this);
assert(result.second);
}
@@ -50,13 +51,15 @@
){
const basic_serializer_arg bs(eti);
basic_serializer_map::const_iterator it;
- it = boost::serialization::singleton<serializer_map<Archive> >
- ::get_const_instance().find(& bs);
+ it = boost::serialization::singleton<
+ serializer_map<Archive>
+ >::get_const_instance().find(& bs);
assert(
it
!=
- boost::serialization::singleton<serializer_map<Archive> >
- ::get_const_instance().end()
+ boost::serialization::singleton<
+ serializer_map<Archive>
+ >::get_const_instance().end()
);
return static_cast<const basic_pointer_oserializer *>(*it);
}
@@ -67,8 +70,9 @@
// note: we need to check that the map still exists as we can't depend
// on static variables being constructed in a specific sequence
unsigned int count;
- count = serialization::singleton<serializer_map<Archive> >
- ::get_mutable_instance().erase(this);
+ count = serialization::singleton<
+ serializer_map<Archive>
+ >::get_mutable_instance().erase(this);
assert(count);
}
Modified: branches/serialization_next_release/boost/boost/archive/shared_ptr_helper.hpp
==============================================================================
--- branches/serialization_next_release/boost/boost/archive/shared_ptr_helper.hpp (original)
+++ branches/serialization_next_release/boost/boost/archive/shared_ptr_helper.hpp 2007-11-22 00:56:28 EST (Thu, 22 Nov 2007)
@@ -99,7 +99,7 @@
);
const boost::serialization::extended_type_info * this_type
= & boost::serialization::type_info_implementation<T>::type
- ::get_const_instance();
+ ::get_const_instance();
void * vp = void_downcast(*true_type, *this_type, t);
return vp;
}
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