* lib/doc/Makefile.am:

[lyx.git] / boost / boost / shared_array.hpp

diff --git a/boost/boost/shared_array.hpp b/boost/boost/shared_array.hpp
index c60a85a089684aed3dfc687a1d8eff07c9e0ddc1..eb69c8ed67e25b2a64045c6c0036f160bad87250 100644 (file)
--- a/boost/boost/shared_array.hpp
+++ b/boost/boost/shared_array.hpp
@@ -7,10 +7,9 @@
 //  (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/shared_array.htm for documentation.
 //
@@ -21,10 +20,13 @@
 #include <boost/detail/shared_array_nmt.hpp>
 #else
 
+#include <memory>             // TR1 cyclic inclusion fix
+
 #include <boost/assert.hpp>
 #include <boost/checked_delete.hpp>
 
 #include <boost/detail/shared_count.hpp>
+#include <boost/detail/workaround.hpp>
 
 #include <cstddef>            // for std::ptrdiff_t
 #include <algorithm>          // for std::swap
@@ -41,7 +43,7 @@ namespace boost
 //  is destroyed or reset.
 //
 
-template<typename T> class shared_array
+template<class T> class shared_array
 {
 private:
 
@@ -63,7 +65,7 @@ public:
     // shared_array will release p by calling d(p)
     //
 
-    template<typename D> shared_array(T * p, D d): px(p), pn(p, d)
+    template<class D> shared_array(T * p, D d): px(p), pn(p, d)
     {
     }
 
@@ -75,7 +77,7 @@ public:
         this_type(p).swap(*this);
     }
 
-    template <typename D> void reset(T * p, D d)
+    template <class D> void reset(T * p, D d)
     {
         this_type(p, d).swap(*this);
     }
@@ -94,13 +96,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 px != 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 px == 0? 0: &this_type::get;
     }
 
+#else 
+
+    typedef T * this_type::*unspecified_bool_type;
+
+    operator unspecified_bool_type() const // never throws
+    {
+        return px == 0? 0: &this_type::px;
+    }
+
+#endif
+
     bool operator! () const // never throws
     {
         return px == 0;
@@ -129,22 +150,22 @@ private:
 
 };  // shared_array
 
-template<typename T> inline bool operator==(shared_array<T> const & a, shared_array<T> const & b) // never throws
+template<class T> inline bool operator==(shared_array<T> const & a, shared_array<T> const & b) // never throws
 {
     return a.get() == b.get();
 }
 
-template<typename T> inline bool operator!=(shared_array<T> const & a, shared_array<T> const & b) // never throws
+template<class T> inline bool operator!=(shared_array<T> const & a, shared_array<T> const & b) // never throws
 {
     return a.get() != b.get();
 }
 
-template<typename T> inline bool operator<(shared_array<T> const & a, shared_array<T> const & b) // never throws
+template<class T> inline bool operator<(shared_array<T> const & a, shared_array<T> const & b) // never throws
 {
     return std::less<T*>()(a.get(), b.get());
 }
 
-template<typename T> void swap(shared_array<T> & a, shared_array<T> & b) // never throws
+template<class T> void swap(shared_array<T> & a, shared_array<T> & b) // never throws
 {
     a.swap(b);
 }