[Boost-commit] svn:boost r76089 - in branches/release/boost/signals2: . detail

Subject: [Boost-commit] svn:boost r76089 - in branches/release/boost/signals2: . detail
From: fmhess_at_[hidden]
Date: 2011-12-20 22:05:38

Author: fmhess
Date: 2011-12-20 22:05:37 EST (Tue, 20 Dec 2011)
New Revision: 76089
URL: http://svn.boost.org/trac/boost/changeset/76089

Log:
Merged from trunk.  Closes #6198.

Properties modified: 
   branches/release/boost/signals2/   (props changed)
Text files modified: 
   branches/release/boost/signals2/detail/auto_buffer.hpp |     2 +-                                      
   branches/release/boost/signals2/detail/foreign_ptr.hpp |     3 +++                                     
   2 files changed, 4 insertions(+), 1 deletions(-)

Modified: branches/release/boost/signals2/detail/auto_buffer.hpp
==============================================================================
--- branches/release/boost/signals2/detail/auto_buffer.hpp	(original)
+++ branches/release/boost/signals2/detail/auto_buffer.hpp	2011-12-20 22:05:37 EST (Tue, 20 Dec 2011)
@@ -562,7 +562,7 @@
               buffer_( allocate(members_.capacity_) ),
               size_( 0 )
         {
-            std::uninitialized_fill( buffer_, buffer_ + size, init_value );
+            std::uninitialized_fill( buffer_, buffer_ + size_arg, init_value );
             size_ = size_arg;
             BOOST_ASSERT( is_valid() );
         }

Modified: branches/release/boost/signals2/detail/foreign_ptr.hpp
==============================================================================
--- branches/release/boost/signals2/detail/foreign_ptr.hpp	(original)
+++ branches/release/boost/signals2/detail/foreign_ptr.hpp	2011-12-20 22:05:37 EST (Tue, 20 Dec 2011)
@@ -12,16 +12,19 @@
 #define BOOST_SIGNALS2_FOREIGN_PTR_HPP
 
 #include <algorithm>
+#include <boost/config.hpp>
 #include <boost/assert.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/smart_ptr/bad_weak_ptr.hpp>
 #include <boost/utility/swap.hpp>
 
+#if !defined(BOOST_INTEL_STDCXX0X)
 namespace std
 {
   template<typename T> class shared_ptr;
   template<typename T> class weak_ptr;
 }
+#endif
 
 namespace boost
 {