Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r49077 - in sandbox/shifted_ptr: bits boost
From: phil_at_[hidden]
Date: 2008-10-01 02:50:14


Author: pbouchard
Date: 2008-10-01 02:50:13 EDT (Wed, 01 Oct 2008)
New Revision: 49077
URL: http://svn.boost.org/trac/boost/changeset/49077

Log:
Adjusted changes for GCC 4.3.0
Text files modified:
   sandbox/shifted_ptr/bits/stl_list.h | 6 ++++--
   sandbox/shifted_ptr/boost/shifted_ptr.hpp | 8 ++++----
   2 files changed, 8 insertions(+), 6 deletions(-)

Modified: sandbox/shifted_ptr/bits/stl_list.h
==============================================================================
--- sandbox/shifted_ptr/bits/stl_list.h (original)
+++ sandbox/shifted_ptr/bits/stl_list.h 2008-10-01 02:50:13 EDT (Wed, 01 Oct 2008)
@@ -603,7 +603,8 @@
         assign(_InputIterator __first, _InputIterator __last)
         {
           // Check whether it's an integral type. If so, it's not an iterator.
- typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
+ //typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
+ typedef typename __is_integer<_InputIterator>::__type _Integral;
           _M_assign_dispatch(__first, __last, _Integral());
         }
 
@@ -872,7 +873,8 @@
                _InputIterator __last)
         {
           // Check whether it's an integral type. If so, it's not an iterator.
- typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
+ //typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
+ typedef typename __is_integer<_InputIterator>::__type _Integral;
           _M_insert_dispatch(__position, __first, __last, _Integral());
         }
 

Modified: sandbox/shifted_ptr/boost/shifted_ptr.hpp
==============================================================================
--- sandbox/shifted_ptr/boost/shifted_ptr.hpp (original)
+++ sandbox/shifted_ptr/boost/shifted_ptr.hpp 2008-10-01 02:50:13 EDT (Wed, 01 Oct 2008)
@@ -217,7 +217,7 @@
                 if (ps_ && ! owned_base::pool_.is_from(ps_))
                 {
                     if (! owned_base::pool_.is_from(this))
- release();
+ release(false);
 
                     init(p);
                 }
@@ -232,7 +232,7 @@
                 if (ps_ && ! owned_base::pool_.is_from(ps_))
                     if (ps_->redir() != p.ps_->redir())
                     {
- release();
+ release(false);
                         ps_->redir(p.ps_);
                     }
                 base::operator = (p);
@@ -247,7 +247,7 @@
 
         void reset()
         {
- release();
+ release(false);
         }
 
         ~shifted_ptr()
@@ -256,7 +256,7 @@
         }
 
     private:
- void release(bool d = false)
+ void release(bool d)
         {
             if (! owned_base::pool_.is_from(this))
             {


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