Boost logo

Boost-Commit :

From: ramey_at_[hidden]
Date: 2008-07-06 13:06:18


Author: ramey
Date: 2008-07-06 13:06:18 EDT (Sun, 06 Jul 2008)
New Revision: 47135
URL: http://svn.boost.org/trac/boost/changeset/47135

Log:
fixed ripple effect from previous fix
Text files modified:
   trunk/boost/archive/shared_ptr_helper.hpp | 8 ++++----
   1 files changed, 4 insertions(+), 4 deletions(-)

Modified: trunk/boost/archive/shared_ptr_helper.hpp
==============================================================================
--- trunk/boost/archive/shared_ptr_helper.hpp (original)
+++ trunk/boost/archive/shared_ptr_helper.hpp 2008-07-06 13:06:18 EDT (Sun, 06 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,7 @@
         const boost::serialization::extended_type_info * this_type
             = & boost::serialization::type_info_implementation<T>::type
                     ::get_const_instance();
- void * vp = void_downcast(
+ const void * vp = void_downcast(
             *true_type,
             *this_type,
             static_cast<const void *>(t)
@@ -117,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;


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