de.po

[lyx.git] / 3rdparty / boost / boost / none_t.hpp

diff --git a/3rdparty/boost/boost/none_t.hpp b/3rdparty/boost/boost/none_t.hpp
index 13ce455b168948afded3cf33a732e6b4a515274f..008f369d1cda0a28971645413d2fb6e7a082cf56 100644 (file)
--- a/3rdparty/boost/boost/none_t.hpp
+++ b/3rdparty/boost/boost/none_t.hpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2003, Fernando Luis Cacciola Carballal.
-// Copyright (C) 2014 Andrzej Krzemienski.
+// Copyright (C) 2014, 2015 Andrzej Krzemienski.
 //
 // Use, modification, and distribution is subject to the Boost Software
 // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -16,13 +16,24 @@
 namespace boost {
 
 #ifdef BOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE
+
 namespace detail { struct none_helper{}; }
 typedef int detail::none_helper::*none_t ;
-#else
+
+#elif defined BOOST_OPTIONAL_USE_SINGLETON_DEFINITION_OF_NONE
+
 class none_t {};
-#endif
 
-} // namespace boost
+#else
+
+struct none_t
+{
+  struct init_tag{};
+  explicit none_t(init_tag){} // to disable default constructor
+};
 
-#endif
+#endif // old implementation workarounds
+
+} // namespace boost
 
+#endif // header guard