X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=boost%2Fboost%2Flast_value.hpp;h=183a739eadcae3391856feccdebfe72a851d4392;hb=9c375cb606d7950f8f6bd31e7a841399dc7bbfb2;hp=9554e1b08379bf1d31411165fccfd91394ecf4e0;hpb=786216c0899498434cab9f33780f9c178a0a4006;p=lyx.git

diff --git a/boost/boost/last_value.hpp b/boost/boost/last_value.hpp
index 9554e1b083..183a739ead 100644
--- a/boost/boost/last_value.hpp
+++ b/boost/boost/last_value.hpp
@@ -1,6 +1,6 @@
 // last_value function object (documented as part of Boost.Signals)
 
-// Copyright Doug Gregor 2001-2003. Use, modification and
+// 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)
@@ -11,6 +11,7 @@
 #define BOOST_LAST_VALUE_HPP
 
 #include <cassert>
+#include <boost/config.hpp>
 
 namespace boost {
   template<typename T>
@@ -30,10 +31,15 @@ namespace boost {
 
   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