X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=boost%2Fboost%2Fnone.hpp;h=e9fc0627fe94789997cd34de32a774399c1a0476;hb=43c09d723435a5b203f2ac0c39e2086de836b386;hp=0f5e31cce9e4ef47ee52fa502738dceafbdd2533;hpb=19fa02ff12689811eab10ce4e1cdc445f0a1ff21;p=lyx.git

diff --git a/boost/boost/none.hpp b/boost/boost/none.hpp
index 0f5e31cce9..e9fc0627fe 100755
--- a/boost/boost/none.hpp
+++ b/boost/boost/none.hpp
@@ -1,43 +1,28 @@
-// Copyright (C) 2003, Fernando Luis Cacciola Carballal.
-// Copyright (C) 2007, Anthony Williams
-// Copyright (C) 2007, Steven Watanabe, Richard Smith
-//
-// 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/lib/optional/ for documentation.
-//
-// You are welcome to contact the author at:
-// fernando.cacciola@gmail.com
-//
-#ifndef BOOST_NONE_17SEP2003_HPP
-#define BOOST_NONE_17SEP2003_HPP
-
-namespace boost
-{
-  namespace detail
-  {
-    class none_helper;
-  }
-
-  inline void none(detail::none_helper);
-
-  namespace detail
-  {
-    class none_helper
-    {
-    private:
-      
-      none_helper( none_helper const& ) {}
-      
-      friend void boost::none(none_helper);
-    };
-  }
-
-  typedef void (*none_t)(detail::none_helper);
-
-  inline void none(detail::none_helper) {}
-}
-
-#endif
+// Copyright (C) 2003, Fernando Luis Cacciola Carballal.
+//
+// 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/optional for documentation.
+//
+// You are welcome to contact the author at:
+//  fernando_cacciola@hotmail.com
+//
+#ifndef BOOST_NONE_17SEP2003_HPP
+#define BOOST_NONE_17SEP2003_HPP
+
+#include "boost/none_t.hpp"
+
+// NOTE: Borland users have to include this header outside any precompiled headers
+// (bcc<=5.64 cannot include instance data in a precompiled header)
+//  -- * To be verified, now that there's no unnamed namespace
+
+namespace boost {
+
+none_t const none = (static_cast<none_t>(0)) ;
+
+} // namespace boost
+
+#endif
+