* 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 2009efdfd47ec6a28007f8aa56e0c074b8009cf8..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,6 +20,8 @@
 #include <boost/detail/shared_array_nmt.hpp>
 #else
 
+#include <memory>             // TR1 cyclic inclusion fix
+
 #include <boost/assert.hpp>
 #include <boost/checked_delete.hpp>
 
@@ -102,15 +103,23 @@ public:
         return px != 0;
     }
 
-#else
-
+#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