X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=boost%2Fboost%2Flast_value.hpp;h=183a739eadcae3391856feccdebfe72a851d4392;hb=43c09d723435a5b203f2ac0c39e2086de836b386;hp=bca93057e3ede86903465aecd1aec3cd41870350;hpb=e1644a68eb123c267a7ef2e651c66b788c38f03a;p=lyx.git

diff --git a/boost/boost/last_value.hpp b/boost/boost/last_value.hpp
index bca93057e3..183a739ead 100644
--- a/boost/boost/last_value.hpp
+++ b/boost/boost/last_value.hpp
@@ -1,28 +1,23 @@
 // last_value function object (documented as part of Boost.Signals)
-//
-// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu)
-//
-// Permission to copy, use, sell and distribute this software is granted
-// provided this copyright notice appears in all copies.
-// Permission to modify the code and to distribute modified code is granted
-// provided this copyright notice appears in all copies, and a notice
-// that the code was modified is included with the copyright notice.
-//
-// This software is provided "as is" without express or implied warranty,
-// and with no claim as to its suitability for any purpose.
- 
+
+// Copyright Douglas Gregor 2001-2003. Use, modification and
+// distribution is subject to 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)
+
 // For more information, see http://www.boost.org/libs/signals
 
 #ifndef BOOST_LAST_VALUE_HPP
 #define BOOST_LAST_VALUE_HPP
 
 #include <cassert>
+#include <boost/config.hpp>
 
 namespace boost {
   template<typename T>
   struct last_value {
     typedef T result_type;
-    
+
     template<typename InputIterator>
     T operator()(InputIterator first, InputIterator last) const
     {
@@ -33,14 +28,19 @@ namespace boost {
       return value;
     }
   };
-  
+
   template<>
   struct last_value<void> {
+#ifdef BOOST_NO_VOID_RETURNS
     struct unusable {};
 
   public:
     typedef unusable result_type;
-    
+#else
+  public:
+    typedef void result_type;
+#endif // BOOST_NO_VOID_RETURNS
+
     template<typename InputIterator>
     result_type
     operator()(InputIterator first, InputIterator last) const