X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=boost%2Fboost%2Fscoped_array.hpp;h=667dfffcb6d780c0e7ebbdbc10a1f8b1431b1e33;hb=b01a9dc187d9cd396a57463ad27511379dcdc9cd;hp=8c7fdcc982ce790b087769034bb3ecd85cb1def6;hpb=69862d12f457dd5dbf509c4d46a0399d4b16cfc7;p=lyx.git

diff --git a/boost/boost/scoped_array.hpp b/boost/boost/scoped_array.hpp
index 8c7fdcc982..667dfffcb6 100644
--- a/boost/boost/scoped_array.hpp
+++ b/boost/boost/scoped_array.hpp
@@ -4,27 +4,38 @@
 //  (C) Copyright Greg Colvin and Beman Dawes 1998, 1999.
 //  Copyright (c) 2001, 2002 Peter Dimov
 //
-//  Permission to copy, use, modify, sell and distribute this software
-//  is granted provided this copyright notice appears in all copies.
-//  This software is provided "as is" without express or implied
-//  warranty, and with no claim as to its suitability for any purpose.
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 //
-//  See http://www.boost.org/libs/smart_ptr/scoped_array.htm for documentation.
+//  http://www.boost.org/libs/smart_ptr/scoped_array.htm
 //
 
 #include <boost/assert.hpp>
 #include <boost/checked_delete.hpp>
 #include <boost/config.hpp>   // in case ptrdiff_t not in std
+
+#include <boost/detail/workaround.hpp>
+
 #include <cstddef>            // for std::ptrdiff_t
 
 namespace boost
 {
 
+// Debug hooks
+
+#if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
+
+void sp_array_constructor_hook(void * p);
+void sp_array_destructor_hook(void * p);
+
+#endif
+
 //  scoped_array extends scoped_ptr to arrays. Deletion of the array pointed to
 //  is guaranteed, either on destruction of the scoped_array or via an explicit
 //  reset(). Use shared_array or std::vector if your needs are more complex.
 
-template<typename T> class scoped_array // noncopyable
+template<class T> class scoped_array // noncopyable
 {
 private:
 
@@ -41,20 +52,23 @@ public:
 
     explicit scoped_array(T * p = 0) : ptr(p) // never throws
     {
+#if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
+        boost::sp_array_constructor_hook(ptr);
+#endif
     }
 
     ~scoped_array() // never throws
     {
-        checked_array_delete(ptr);
+#if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
+        boost::sp_array_destructor_hook(ptr);
+#endif
+        boost::checked_array_delete(ptr);
     }
 
     void reset(T * p = 0) // never throws
     {
-        if (ptr != p)
-        {
-            checked_array_delete(ptr);
-            ptr = p;
-        }
+        BOOST_ASSERT(p == 0 || p != ptr); // catch self-reset errors
+        this_type(p).swap(*this);
     }
 
     T & operator[](std::ptrdiff_t i) const // never throws
@@ -71,13 +85,32 @@ public:
 
     // implicit conversion to "bool"
 
-    typedef T * (this_type::*unspecified_bool_type)() const;
+#if defined(__SUNPRO_CC) && BOOST_WORKAROUND(__SUNPRO_CC, <= 0x530)
+
+    operator bool () const
+    {
+        return ptr != 0;
+    }
 
+#elif defined(__MWERKS__) && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003))
+    typedef T * (this_type::*unspecified_bool_type)() const;
+    
     operator unspecified_bool_type() const // never throws
     {
         return ptr == 0? 0: &this_type::get;
     }
 
+#else 
+
+    typedef T * this_type::*unspecified_bool_type;
+
+    operator unspecified_bool_type() const // never throws
+    {
+        return ptr == 0? 0: &this_type::ptr;
+    }
+
+#endif
+
     bool operator! () const // never throws
     {
         return ptr == 0;