From: ramey_at_[hidden]
Date: 2007-11-01 16:25:33
Author: ramey
Date: 2007-11-01 16:25:32 EDT (Thu, 01 Nov 2007)
New Revision: 40661
URL: http://svn.boost.org/trac/boost/changeset/40661
Log:
passing all msvc and gcc tests
except gcc(release) test_no_rtti and test_shared_ptr132
Text files modified:
branches/serialization_next_release/boost/libs/serialization/src/extended_type_info.cpp | 2
branches/serialization_next_release/boost/libs/serialization/src/extended_type_info_typeid.cpp | 3 +
branches/serialization_next_release/boost/libs/serialization/src/void_cast.cpp | 44 ++++++++++++++++++++--------------------
3 files changed, 25 insertions(+), 24 deletions(-)
Modified: branches/serialization_next_release/boost/libs/serialization/src/extended_type_info.cpp
==============================================================================
--- branches/serialization_next_release/boost/libs/serialization/src/extended_type_info.cpp (original)
+++ branches/serialization_next_release/boost/libs/serialization/src/extended_type_info.cpp 2007-11-01 16:25:32 EDT (Thu, 01 Nov 2007)
@@ -50,7 +50,7 @@
key_compare
> ktmap;
-template ktmap;
+//template ktmap;
class extended_type_info_arg : public extended_type_info
{
Modified: branches/serialization_next_release/boost/libs/serialization/src/extended_type_info_typeid.cpp
==============================================================================
--- branches/serialization_next_release/boost/libs/serialization/src/extended_type_info_typeid.cpp (original)
+++ branches/serialization_next_release/boost/libs/serialization/src/extended_type_info_typeid.cpp 2007-11-01 16:25:32 EDT (Thu, 01 Nov 2007)
@@ -42,7 +42,7 @@
type_compare
> tkmap;
-template tkmap;
+//template tkmap;
BOOST_SERIALIZATION_DECL(void)
extended_type_info_typeid_0::type_register(const std::type_info & ti){
@@ -63,6 +63,7 @@
unsigned int erase_count;
erase_count
= singleton<tkmap>::get_mutable_instance().erase(this);
+ assert(1 == erase_count);
}
}
Modified: branches/serialization_next_release/boost/libs/serialization/src/void_cast.cpp
==============================================================================
--- branches/serialization_next_release/boost/libs/serialization/src/void_cast.cpp (original)
+++ branches/serialization_next_release/boost/libs/serialization/src/void_cast.cpp 2007-11-01 16:25:32 EDT (Thu, 01 Nov 2007)
@@ -52,7 +52,7 @@
typedef std::set<const void_caster *, void_caster_compare> set_type;
typedef boost::serialization::singleton<set_type> void_caster_registry;
-template void_caster_registry;
+//template void_caster_registry;
// implementation of void caster base class
BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY())
@@ -64,7 +64,7 @@
m_base(base)
{}
-void
+BOOST_SERIALIZATION_DECL(void)
void_caster::static_register() const {
void_caster_registry::get_mutable_instance().insert(this);
// to do - add new void_caster_derived entries
@@ -78,7 +78,7 @@
*/
}
-void
+BOOST_SERIALIZATION_DECL(void)
void_caster::static_unregister() const {
void_cast_detail::set_type & st
= void_caster_registry::get_mutable_instance();
@@ -101,18 +101,18 @@
class void_caster_derived : public void_caster
{
std::ptrdiff_t difference;
- virtual void const*
- upcast( void const* t ) const{
- return static_cast<const char*> ( t ) + difference;
- }
- virtual void const*
- downcast( void const* t ) const{
- return static_cast<const char*> ( t ) - difference;
+ virtual void const *
+ upcast(void const * const t) const{
+ return static_cast<const char *> ( t ) + difference;
+ }
+ virtual void const *
+ downcast(void const * const t) const{
+ return static_cast<const char *> ( t ) - difference;
}
public:
void_caster_derived(
- const extended_type_info & derived,
- const extended_type_info & base,
+ extended_type_info const & derived,
+ extended_type_info const & base,
std::ptrdiff_t difference
) :
void_caster(derived, base),
@@ -128,20 +128,20 @@
// just used as a search key
class void_caster_argument : public void_caster
{
- virtual void const*
- upcast( void const* t ) const {
+ virtual void const *
+ upcast(void const * const t) const {
assert(false);
return NULL;
}
- virtual void const*
- downcast( void const* t ) const {
+ virtual void const *
+ downcast( void const * const t) const {
assert(false);
return NULL;
}
public:
void_caster_argument(
- const extended_type_info & derived,
- const extended_type_info & base
+ extended_type_info const & derived,
+ extended_type_info const & base
) :
void_caster(derived, base)
{}
@@ -156,9 +156,9 @@
// can transform from_type to to_type, return a NULL.
BOOST_SERIALIZATION_DECL(void const *)
void_upcast(
- const extended_type_info & derived,
- const extended_type_info & base,
- const void * t
+ extended_type_info const & derived,
+ extended_type_info const & base,
+ void const * const t
){
// same types - trivial case
if (derived == base)
@@ -200,7 +200,7 @@
void_downcast(
extended_type_info const & derived,
extended_type_info const & base,
- const void * const t
+ void const * const t
){
// same types - trivial case
if (derived == base)