Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r54476 - in sandbox/monotonic/boost: heterogenous ptr_container ptr_container/detail
From: christian.schladetsch_at_[hidden]
Date: 2009-06-28 17:45:17


Author: cschladetsch
Date: 2009-06-28 17:45:16 EDT (Sun, 28 Jun 2009)
New Revision: 54476
URL: http://svn.boost.org/trac/boost/changeset/54476

Log:
some fixes ffor GCC - still not working
Text files modified:
   sandbox/monotonic/boost/heterogenous/vector.hpp | 2 +-
   sandbox/monotonic/boost/ptr_container/detail/scoped_deleter.hpp | 4 ++--
   sandbox/monotonic/boost/ptr_container/ptr_sequence_adapter.hpp | 2 +-
   3 files changed, 4 insertions(+), 4 deletions(-)

Modified: sandbox/monotonic/boost/heterogenous/vector.hpp
==============================================================================
--- sandbox/monotonic/boost/heterogenous/vector.hpp (original)
+++ sandbox/monotonic/boost/heterogenous/vector.hpp 2009-06-28 17:45:16 EDT (Sun, 28 Jun 2009)
@@ -173,7 +173,7 @@
                         void push_back()
                         {
                                 U *ptr = construct_type<U>();
- base().push_back(ptr);
+ impl.push_back(ptr);
                         }
                         template <class U, class A0>
                         void push_back(A0 a0)

Modified: sandbox/monotonic/boost/ptr_container/detail/scoped_deleter.hpp
==============================================================================
--- sandbox/monotonic/boost/ptr_container/detail/scoped_deleter.hpp (original)
+++ sandbox/monotonic/boost/ptr_container/detail/scoped_deleter.hpp 2009-06-28 17:45:16 EDT (Sun, 28 Jun 2009)
@@ -61,8 +61,8 @@
 
 
             
- template< class InputIterator, class Alloc >
- scoped_deleter ( InputIterator first, InputIterator last, Alloc &a ) // strong
+ template< class InputIterator, class Alloc2 >
+ scoped_deleter ( InputIterator first, InputIterator last, Alloc2 &a ) // strong
                 : ptrs_( new T*[ std::distance(first,last) ] ),
                   stored_(0),
                   released_( false ), alloc(a)

Modified: sandbox/monotonic/boost/ptr_container/ptr_sequence_adapter.hpp
==============================================================================
--- sandbox/monotonic/boost/ptr_container/ptr_sequence_adapter.hpp (original)
+++ sandbox/monotonic/boost/ptr_container/ptr_sequence_adapter.hpp 2009-06-28 17:45:16 EDT (Sun, 28 Jun 2009)
@@ -245,7 +245,7 @@
         {
             this->enforce_null_policy( x, "Null pointer in 'push_back()'" );
 
- auto_type ptr( x, get_allocator() ); // notrow
+ auto_type ptr( x, this->base().get_allocator() ); // notrow
             this->base().push_back( x ); // strong, commit
             ptr.release(); // nothrow
         }


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