Don't allow newline characters in document settings.

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

diff --git a/boost/boost/smart_ptr.hpp b/boost/boost/smart_ptr.hpp
index 4ff62e73f7009788fb8bb974f80aa29d9b58986c..b5e569d8d36780fbd3970bc58e267a450c904d83 100644 (file)
--- a/boost/boost/smart_ptr.hpp
+++ b/boost/boost/smart_ptr.hpp
@@ -1,20 +1,31 @@
+#ifndef BOOST_SMART_PTR_HPP_INCLUDED
+#define BOOST_SMART_PTR_HPP_INCLUDED
+
 //
 //  smart_ptr.hpp
 //
-//  For compatibility, this header includes the headers for the four "classic"
-//  smart pointer class templates.
-//
-//  Copyright (c) 1998-2002 boost.org
+//  For convenience, this header includes the rest of the smart
+//  pointer library headers.
 //
-//  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.
+//  Copyright (c) 2003 Peter Dimov  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)
 //
 //  http://www.boost.org/libs/smart_ptr/smart_ptr.htm
 //
 
-#include <boost/scoped_ptr.hpp> 
+#include <boost/config.hpp>
+
+#include <boost/scoped_ptr.hpp>
 #include <boost/scoped_array.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/shared_array.hpp>
+
+#if !defined(BOOST_NO_MEMBER_TEMPLATES) || defined(BOOST_MSVC6_MEMBER_TEMPLATES)
+# include <boost/weak_ptr.hpp>
+# include <boost/intrusive_ptr.hpp>
+# include <boost/enable_shared_from_this.hpp>
+# include <boost/make_shared.hpp>
+#endif
+
+#endif // #ifndef BOOST_SMART_PTR_HPP_INCLUDED