* lib/doc/Makefile.am:

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

diff --git a/boost/boost/weak_ptr.hpp b/boost/boost/weak_ptr.hpp
index d44b20127a1db354ba02ff529785953d8babb2ad..8f4230fb02c17053f6ed06c7402912a039783f1d 100644 (file)
--- a/boost/boost/weak_ptr.hpp
+++ b/boost/boost/weak_ptr.hpp
@@ -6,14 +6,15 @@
 //
 //  Copyright (c) 2001, 2002, 2003 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/weak_ptr.htm for documentation.
 //
 
+#include <memory> // boost.TR1 include order fix
+#include <boost/detail/shared_count.hpp>
 #include <boost/shared_ptr.hpp>
 
 #ifdef BOOST_MSVC  // moved here to work around VC++ compiler crash
@@ -70,7 +71,7 @@ public:
     {
     }
 
-#if !defined(BOOST_MSVC) || (BOOST_MSVC > 1200)
+#if !defined(BOOST_MSVC) || (BOOST_MSVC >= 1300)
 
     template<class Y>
     weak_ptr & operator=(weak_ptr<Y> const & r) // never throws
@@ -140,7 +141,7 @@ public:
         pn.swap(other.pn);
     }
 
-    void _internal_assign(T * px2, detail::shared_count const & pn2)
+    void _internal_assign(T * px2, boost::detail::shared_count const & pn2)
     {
         px = px2;
         pn = pn2;
@@ -163,8 +164,8 @@ private:
 
 #endif
 
-    T * px;                     // contained pointer
-    detail::weak_count pn;      // reference counter
+    T * px;                       // contained pointer
+    boost::detail::weak_count pn; // reference counter
 
 };  // weak_ptr