passenger 6.0.26 → 6.1.0

data/src/cxx_supportlib/vendor-modified/boost/optional/optional.hpp

@@ -22,19 +22,13 @@
 #include <iosfwd>
 #endif // BOOST_NO_IOSTREAM
 
-#ifdef BOOST_OPTIONAL_DETAIL_USE_STD_TYPE_TRAITS
-#  include <type_traits>
-#endif
-
 #include <boost/assert.hpp>
 #include <boost/core/addressof.hpp>
 #include <boost/core/enable_if.hpp>
-#include <boost/core/explicit_operator_bool.hpp>
 #include <boost/core/invoke_swap.hpp>
+#include <boost/core/launder.hpp>
 #include <boost/optional/bad_optional_access.hpp>
-#include <boost/static_assert.hpp>
 #include <boost/throw_exception.hpp>
-#include <boost/type.hpp>
 #include <boost/type_traits/alignment_of.hpp>
 #include <boost/type_traits/conditional.hpp>
 #include <boost/type_traits/conjunction.hpp>
@@ -56,16 +50,14 @@
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/is_volatile.hpp>
 #include <boost/type_traits/is_scalar.hpp>
-#include <boost/move/utility.hpp>
 #include <boost/none.hpp>
-#include <boost/utility/compare_pointees.hpp>
-#include <boost/utility/result_of.hpp>
 
 #include <boost/optional/optional_fwd.hpp>
 #include <boost/optional/detail/optional_config.hpp>
 #include <boost/optional/detail/optional_factory_support.hpp>
 #include <boost/optional/detail/optional_aligned_storage.hpp>
 #include <boost/optional/detail/optional_hash.hpp>
+#include <boost/optional/detail/optional_utility.hpp>
 
 namespace boost { namespace optional_detail {
 
@@ -74,17 +66,34 @@ struct optional_value_type
 {
 };
 
+template <typename U>
+struct optional_value_type< ::boost::optional<U> >
+{
+  typedef U type;
+};
+
 template <typename T>
-struct optional_value_type< ::boost::optional<T> >
+T declval();
+
+
+// implementing my own result_of so that it works for C++11 (std::result_of)
+// and in C++20 (std::invoke_result).
+template <typename F, typename Ref, typename Rslt = decltype(declval<F>()(declval<Ref>()))>
+struct result_of
+{
+  typedef Rslt type;
+};
+
+template <typename F, typename Ref, typename Rslt = typename optional_value_type<typename result_of<F, Ref>::type>::type>
+struct result_value_type
 {
-  typedef T type;
+  typedef Rslt type;
 };
 
+// optional<typename optional_detail::optional_value_type<decltype(optional_detail::declval<F>()(optional_detail::declval<reference_type>()))>::type>
+
 }} // namespace boost::optional_detail
 
-#ifdef BOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL
-#include <boost/optional/detail/old_optional_implementation.hpp>
-#else
 namespace boost {
 
 namespace optional_ns {
@@ -93,17 +102,17 @@ namespace optional_ns {
 struct in_place_init_t
 {
   struct init_tag{};
-  explicit in_place_init_t(init_tag){}
+  BOOST_CONSTEXPR explicit in_place_init_t(init_tag){}
 };
-const in_place_init_t in_place_init ((in_place_init_t::init_tag()));
+BOOST_INLINE_CONSTEXPR in_place_init_t in_place_init ((in_place_init_t::init_tag()));
 
 // a tag for conditional in-place initialization of contained value
 struct in_place_init_if_t
 {
   struct init_tag{};
-  explicit in_place_init_if_t(init_tag){}
+  BOOST_CONSTEXPR explicit in_place_init_if_t(init_tag){}
 };
-const in_place_init_if_t in_place_init_if ((in_place_init_if_t::init_tag()));
+BOOST_INLINE_CONSTEXPR in_place_init_if_t in_place_init_if ((in_place_init_if_t::init_tag()));
 
 } // namespace optional_ns
 
@@ -135,10 +144,8 @@ class optional_base : public optional_tag
   protected:
     typedef T &       reference_type ;
     typedef T const&  reference_const_type ;
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     typedef T &&  rval_reference_type ;
     typedef T &&  reference_type_of_temporary_wrapper ;
-#endif
     typedef T *         pointer_type ;
     typedef T const*    pointer_const_type ;
     typedef T const&    argument_type ;
@@ -164,16 +171,14 @@ class optional_base : public optional_tag
         construct(val);
     }
 
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // move-construct an optional<T> initialized from an rvalue-ref to 'val'.
     // Can throw if T::T(T&&) does
     optional_base ( init_value_tag, rval_reference_type val )
       :
       m_initialized(false)
     {
-      construct( boost::move(val) );
+      construct( optional_detail::move(val) );
     }
-#endif
 
     // Creates an optional<T> initialized with 'val' IFF cond is true, otherwise creates an uninitialized optional<T>.
     // Can throw if T::T(T const&) does
@@ -185,7 +190,6 @@ class optional_base : public optional_tag
         construct(val);
     }
 
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Creates an optional<T> initialized with 'move(val)' IFF cond is true, otherwise creates an uninitialized optional<T>.
     // Can throw if T::T(T &&) does
     optional_base ( bool cond, rval_reference_type val )
@@ -193,9 +197,8 @@ class optional_base : public optional_tag
       m_initialized(false)
     {
       if ( cond )
-        construct(boost::move(val));
+        construct(optional_detail::move(val));
     }
-#endif
 
     // Creates a deep copy of another optional<T>
     // Can throw if T::T(T const&) does
@@ -207,7 +210,6 @@ class optional_base : public optional_tag
         construct(rhs.get_impl());
     }
 
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Creates a deep move of another optional<T>
     // Can throw if T::T(T&&) does
     optional_base ( optional_base&& rhs )
@@ -216,48 +218,30 @@ class optional_base : public optional_tag
       m_initialized(false)
     {
       if ( rhs.is_initialized() )
-        construct( boost::move(rhs.get_impl()) );
+        construct( optional_detail::move(rhs.get_impl()) );
     }
-#endif
 
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
 
     template<class Expr, class PtrExpr>
     explicit optional_base ( Expr&& expr, PtrExpr const* tag )
       :
       m_initialized(false)
     {
-      construct(boost::forward<Expr>(expr),tag);
-    }
-
-#else
-    // This is used for both converting and in-place constructions.
-    // Derived classes use the 'tag' to select the appropriate
-    // implementation (the correct 'construct()' overload)
-    template<class Expr>
-    explicit optional_base ( Expr const& expr, Expr const* tag )
-      :
-      m_initialized(false)
-    {
-      construct(expr,tag);
+      construct(optional_detail::forward<Expr>(expr),tag);
     }
 
-#endif
-
     optional_base& operator= ( optional_base const& rhs )
     {
       this->assign(rhs);
       return *this;
     }
 
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     optional_base& operator= ( optional_base && rhs )
     BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible<T>::value && ::boost::is_nothrow_move_assignable<T>::value)
     {
       this->assign(static_cast<optional_base&&>(rhs));
       return *this;
     }
-#endif
 
     // No-throw (assuming T::~T() doesn't)
     ~optional_base() { destroy() ; }
@@ -278,23 +262,21 @@ class optional_base : public optional_tag
       }
     }
 
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Assigns from another optional<T> (deep-moves the rhs value)
     void assign ( optional_base&& rhs )
     {
       if (is_initialized())
       {
         if ( rhs.is_initialized() )
-             assign_value( boost::move(rhs.get_impl()) );
+             assign_value( optional_detail::move(rhs.get_impl()) );
         else destroy();
       }
       else
       {
         if ( rhs.is_initialized() )
-          construct(boost::move(rhs.get_impl()));
+          construct(optional_detail::move(rhs.get_impl()));
       }
     }
-#endif
 
     // Assigns from another _convertible_ optional<U> (deep-copies the rhs value)
     template<class U>
@@ -322,7 +304,6 @@ class optional_base : public optional_tag
       }
     }
 
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // move-assigns from another _convertible_ optional<U> (deep-moves from the rhs value)
     template<class U>
     void assign ( optional<U>&& rhs )
@@ -340,7 +321,6 @@ class optional_base : public optional_tag
           construct(static_cast<ref_type>(rhs.get()));
       }
     }
-#endif
 
     // Assigns from a T (deep-copies the rhs value)
     void assign ( argument_type val )
@@ -350,15 +330,13 @@ class optional_base : public optional_tag
       else construct(val);
     }
 
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Assigns from a T (deep-moves the rhs value)
     void assign ( rval_reference_type val )
     {
       if (is_initialized())
-           assign_value( boost::move(val) );
-      else construct( boost::move(val) );
+           assign_value( optional_detail::move(val) );
+      else construct( optional_detail::move(val) );
     }
-#endif
 
     // Assigns from "none", destroying the current value, if any, leaving this UNINITIALIZED
     // No-throw (assuming T::~T() doesn't)
@@ -366,23 +344,13 @@ class optional_base : public optional_tag
 
 #ifndef BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT
 
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     template<class Expr, class ExprPtr>
     void assign_expr ( Expr&& expr, ExprPtr const* tag )
     {
       if (is_initialized())
-        assign_expr_to_initialized(boost::forward<Expr>(expr),tag);
-      else construct(boost::forward<Expr>(expr),tag);
-    }
-#else
-    template<class Expr>
-    void assign_expr ( Expr const& expr, Expr const* tag )
-    {
-      if (is_initialized())
-        assign_expr_to_initialized(expr,tag);
-      else construct(expr,tag);
+        assign_expr_to_initialized(optional_detail::forward<Expr>(expr),tag);
+      else construct(optional_detail::forward<Expr>(expr),tag);
     }
-#endif
 
 #endif
 
@@ -411,22 +379,19 @@ class optional_base : public optional_tag
        m_initialized = true ;
      }
 
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     void construct ( rval_reference_type val )
      {
-       ::new (m_storage.address()) unqualified_value_type( boost::move(val) ) ;
+       ::new (m_storage.address()) unqualified_value_type( optional_detail::move(val) ) ;
        m_initialized = true ;
      }
-#endif
 
 
-#if (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES) && (!defined BOOST_NO_CXX11_VARIADIC_TEMPLATES)
     // Constructs in-place
     // upon exception *this is always uninitialized
     template<class... Args>
     void construct ( in_place_init_t, Args&&... args )
     {
-      ::new (m_storage.address()) unqualified_value_type( boost::forward<Args>(args)... ) ;
+      ::new (m_storage.address()) unqualified_value_type( optional_detail::forward<Args>(args)... ) ;
       m_initialized = true ;
     }
 
@@ -434,7 +399,7 @@ class optional_base : public optional_tag
     void emplace_assign ( Args&&... args )
     {
       destroy();
-      construct(in_place_init, boost::forward<Args>(args)...);
+      construct(in_place_init, optional_detail::forward<Args>(args)...);
     }
 
     template<class... Args>
@@ -442,7 +407,7 @@ class optional_base : public optional_tag
       :
       m_initialized(false)
     {
-      construct(in_place_init, boost::forward<Args>(args)...);
+      construct(in_place_init, optional_detail::forward<Args>(args)...);
     }
 
     template<class... Args>
@@ -451,156 +416,11 @@ class optional_base : public optional_tag
       m_initialized(false)
     {
       if ( cond )
-        construct(in_place_init, boost::forward<Args>(args)...);
-    }
-#elif (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES)
-    template<class Arg>
-    void construct ( in_place_init_t, Arg&& arg )
-     {
-       ::new (m_storage.address()) unqualified_value_type( boost::forward<Arg>(arg) );
-       m_initialized = true ;
-     }
-
-    void construct ( in_place_init_t )
-     {
-       ::new (m_storage.address()) unqualified_value_type();
-       m_initialized = true ;
-     }
-
-    template<class Arg>
-    void emplace_assign ( Arg&& arg )
-     {
-       destroy();
-       construct(in_place_init, boost::forward<Arg>(arg)) ;
-     }
-
-    void emplace_assign ()
-     {
-       destroy();
-       construct(in_place_init) ;
-     }
-
-    template<class Arg>
-    explicit optional_base ( in_place_init_t, Arg&& arg )
-      :
-      m_initialized(false)
-    {
-      construct(in_place_init, boost::forward<Arg>(arg));
-    }
-
-    explicit optional_base ( in_place_init_t )
-      :
-      m_initialized(false)
-    {
-      construct(in_place_init);
-    }
-
-    template<class Arg>
-    explicit optional_base ( in_place_init_if_t, bool cond, Arg&& arg )
-      :
-      m_initialized(false)
-    {
-      if ( cond )
-        construct(in_place_init, boost::forward<Arg>(arg));
-    }
-
-    explicit optional_base ( in_place_init_if_t, bool cond )
-      :
-      m_initialized(false)
-    {
-      if ( cond )
-        construct(in_place_init);
-    }
-
-#else
-
-    template<class Arg>
-    void construct ( in_place_init_t, const Arg& arg )
-     {
-       ::new (m_storage.address()) unqualified_value_type( arg );
-       m_initialized = true ;
-     }
-
-    template<class Arg>
-    void construct ( in_place_init_t, Arg& arg )
-     {
-       ::new (m_storage.address()) unqualified_value_type( arg );
-       m_initialized = true ;
-     }
-
-    void construct ( in_place_init_t )
-     {
-       ::new (m_storage.address()) unqualified_value_type();
-       m_initialized = true ;
-     }
-
-    template<class Arg>
-    void emplace_assign ( const Arg& arg )
-    {
-      destroy();
-      construct(in_place_init, arg);
-    }
-
-    template<class Arg>
-    void emplace_assign ( Arg& arg )
-    {
-      destroy();
-      construct(in_place_init, arg);
-    }
-
-    void emplace_assign ()
-    {
-      destroy();
-      construct(in_place_init);
-    }
-
-    template<class Arg>
-    explicit optional_base ( in_place_init_t, const Arg& arg )
-      : m_initialized(false)
-    {
-      construct(in_place_init, arg);
-    }
-
-    template<class Arg>
-    explicit optional_base ( in_place_init_t, Arg& arg )
-      : m_initialized(false)
-    {
-      construct(in_place_init, arg);
-    }
-
-    explicit optional_base ( in_place_init_t )
-      : m_initialized(false)
-    {
-      construct(in_place_init);
-    }
-
-    template<class Arg>
-    explicit optional_base ( in_place_init_if_t, bool cond, const Arg& arg )
-      : m_initialized(false)
-    {
-      if ( cond )
-        construct(in_place_init, arg);
-    }
-
-    template<class Arg>
-    explicit optional_base ( in_place_init_if_t, bool cond, Arg& arg )
-      : m_initialized(false)
-    {
-      if ( cond )
-        construct(in_place_init, arg);
-    }
-
-    explicit optional_base ( in_place_init_if_t, bool cond )
-      : m_initialized(false)
-    {
-      if ( cond )
-        construct(in_place_init);
+        construct(in_place_init, optional_detail::forward<Args>(args)...);
     }
-#endif
 
 #ifndef BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT
 
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Constructs in-place using the given factory
     template<class Expr>
     void construct ( Expr&& factory, in_place_factory_base const* )
@@ -632,42 +452,8 @@ class optional_base : public optional_tag
        construct(factory,tag);
      }
 
-#else
-    // Constructs in-place using the given factory
-    template<class Expr>
-    void construct ( Expr const& factory, in_place_factory_base const* )
-     {
-       boost_optional_detail::construct<value_type>(factory, m_storage.address());
-       m_initialized = true ;
-     }
-
-    // Constructs in-place using the given typed factory
-    template<class Expr>
-    void construct ( Expr const& factory, typed_in_place_factory_base const* )
-     {
-       factory.apply(m_storage.address()) ;
-       m_initialized = true ;
-     }
-
-    template<class Expr>
-    void assign_expr_to_initialized ( Expr const& factory, in_place_factory_base const* tag )
-     {
-       destroy();
-       construct(factory,tag);
-     }
-
-    // Constructs in-place using the given typed factory
-    template<class Expr>
-    void assign_expr_to_initialized ( Expr const& factory, typed_in_place_factory_base const* tag )
-     {
-       destroy();
-       construct(factory,tag);
-     }
 #endif
 
-#endif
-
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Constructs using any expression implicitly convertible to the single argument
     // of a one-argument T constructor.
     // Converting constructions of optional<T> from optional<U> uses this function with
@@ -675,7 +461,7 @@ class optional_base : public optional_tag
     template<class Expr>
     void construct ( Expr&& expr, void const* )
     {
-      new (m_storage.address()) unqualified_value_type(boost::forward<Expr>(expr)) ;
+      new (m_storage.address()) unqualified_value_type(optional_detail::forward<Expr>(expr)) ;
       m_initialized = true ;
     }
 
@@ -686,31 +472,8 @@ class optional_base : public optional_tag
     template<class Expr>
     void assign_expr_to_initialized ( Expr&& expr, void const* )
     {
-      assign_value( boost::forward<Expr>(expr) );
+      assign_value( optional_detail::forward<Expr>(expr) );
     }
-#else
-    // Constructs using any expression implicitly convertible to the single argument
-    // of a one-argument T constructor.
-    // Converting constructions of optional<T> from optional<U> uses this function with
-    // 'Expr' being of type 'U' and relying on a converting constructor of T from U.
-    template<class Expr>
-    void construct ( Expr const& expr, void const* )
-     {
-       new (m_storage.address()) unqualified_value_type(expr) ;
-       m_initialized = true ;
-     }
-
-    // Assigns using a form any expression implicitly convertible to the single argument
-    // of a T's assignment operator.
-    // Converting assignments of optional<T> from optional<U> uses this function with
-    // 'Expr' being of type 'U' and relying on a converting assignment of T from U.
-    template<class Expr>
-    void assign_expr_to_initialized ( Expr const& expr, void const* )
-     {
-       assign_value(expr);
-     }
-
-#endif
 
 #ifdef BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION
     // BCB5.64 (and probably lower versions) workaround.
@@ -725,7 +488,7 @@ class optional_base : public optional_tag
     // For VC<=70 compilers this workaround doesn't work because the compiler issues and error
     // instead of choosing the wrong overload
     //
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
+
     // Notice that 'Expr' will be optional<T> or optional<U> (but not optional_base<..>)
     template<class Expr>
     void construct ( Expr&& expr, optional_tag const* )
@@ -734,30 +497,14 @@ class optional_base : public optional_tag
        {
          // An exception can be thrown here.
          // It it happens, THIS will be left uninitialized.
-         new (m_storage.address()) unqualified_value_type(boost::move(expr.get())) ;
-         m_initialized = true ;
-       }
-     }
-#else
-    // Notice that 'Expr' will be optional<T> or optional<U> (but not optional_base<..>)
-    template<class Expr>
-    void construct ( Expr const& expr, optional_tag const* )
-     {
-       if ( expr.is_initialized() )
-       {
-         // An exception can be thrown here.
-         // It it happens, THIS will be left uninitialized.
-         new (m_storage.address()) unqualified_value_type(expr.get()) ;
+         new (m_storage.address()) unqualified_value_type(optional_detail::move(expr.get())) ;
          m_initialized = true ;
        }
      }
-#endif
 #endif // defined BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION
 
     void assign_value ( argument_type val ) { get_impl() = val; }
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     void assign_value ( rval_reference_type val ) { get_impl() = static_cast<rval_reference_type>(val); }
-#endif
 
     void destroy()
     {
@@ -832,7 +579,6 @@ struct is_optional_constructible : boost::true_type
 #if !defined(BOOST_NO_CXX11_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, < 1800)
 // for is_assignable
 
-#if (!defined BOOST_NO_CXX11_RVALUE_REFERENCES)
 // On some initial rvalue reference implementations GCC does it in a strange way,
 // preferring perfect-forwarding constructor to implicit copy constructor.
 
@@ -843,15 +589,6 @@ struct is_opt_assignable
 
 #else
 
-template <typename T, typename U>
-struct is_opt_assignable
-  : boost::conjunction<boost::is_convertible<U, T>, boost::is_assignable<T&, U> >
-{};
-
-#endif
-
-#else
-
 template <typename T, typename U>
 struct is_opt_assignable : boost::is_convertible<U, T>
 {};
@@ -918,10 +655,8 @@ class optional
     typedef BOOST_DEDUCED_TYPENAME base::value_type           value_type ;
     typedef BOOST_DEDUCED_TYPENAME base::reference_type       reference_type ;
     typedef BOOST_DEDUCED_TYPENAME base::reference_const_type reference_const_type ;
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     typedef BOOST_DEDUCED_TYPENAME base::rval_reference_type  rval_reference_type ;
     typedef BOOST_DEDUCED_TYPENAME base::reference_type_of_temporary_wrapper reference_type_of_temporary_wrapper ;
-#endif
     typedef BOOST_DEDUCED_TYPENAME base::pointer_type         pointer_type ;
     typedef BOOST_DEDUCED_TYPENAME base::pointer_const_type   pointer_const_type ;
     typedef BOOST_DEDUCED_TYPENAME base::argument_type        argument_type ;
@@ -938,23 +673,19 @@ class optional
     // Can throw if T::T(T const&) does
     optional ( argument_type val ) : base(optional_detail::init_value_tag(), val) {}
 
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Creates an optional<T> initialized with 'move(val)'.
     // Can throw if T::T(T &&) does
-    optional ( rval_reference_type val ) : base(optional_detail::init_value_tag(), boost::forward<T>(val))
+    optional ( rval_reference_type val ) : base(optional_detail::init_value_tag(), optional_detail::forward<T>(val))
       {}
-#endif
 
     // Creates an optional<T> initialized with 'val' IFF cond is true, otherwise creates an uninitialized optional.
     // Can throw if T::T(T const&) does
     optional ( bool cond, argument_type val ) : base(cond,val) {}
 
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     /// Creates an optional<T> initialized with 'val' IFF cond is true, otherwise creates an uninitialized optional.
     // Can throw if T::T(T &&) does
-    optional ( bool cond, rval_reference_type val ) : base( cond, boost::forward<T>(val) )
+    optional ( bool cond, rval_reference_type val ) : base( cond, optional_detail::forward<T>(val) )
       {}
-#endif
 
     // NOTE: MSVC needs templated versions first
 
@@ -974,7 +705,6 @@ class optional
         this->construct(rhs.get());
     }
 
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Creates a deep move of another convertible optional<U>
     // Requires a valid conversion from U to T.
     // Can throw if T::T(U&&) does
@@ -988,9 +718,8 @@ class optional
       base()
     {
       if ( rhs.is_initialized() )
-        this->construct( boost::move(rhs.get()) );
+        this->construct( optional_detail::move(rhs.get()) );
     }
-#endif
 
 #ifndef BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT
     // Creates an optional<T> with an expression which can be either
@@ -1002,20 +731,15 @@ class optional
     //       even though explicit overloads are present for these.
     // Depending on the above some T ctor is called.
     // Can throw if the resolved T ctor throws.
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
 
 
   template<class Expr>
   explicit optional ( Expr&& expr,
                       BOOST_DEDUCED_TYPENAME boost::enable_if< optional_detail::is_optional_val_init_candidate<T, Expr>, bool>::type = true
   )
-    : base(boost::forward<Expr>(expr),boost::addressof(expr))
+    : base(optional_detail::forward<Expr>(expr),boost::addressof(expr))
     {}
 
-#else
-    template<class Expr>
-    explicit optional ( Expr const& expr ) : base(expr,boost::addressof(expr)) {}
-#endif // !defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
 #endif // !defined BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT
 
     // Creates a deep copy of another optional<T>
@@ -1026,20 +750,17 @@ class optional
     optional ( optional const& rhs ) : base( static_cast<base const&>(rhs) ) {}
 #endif
 
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Creates a deep move of another optional<T>
     // Can throw if T::T(T&&) does
-
 #ifndef BOOST_OPTIONAL_DETAIL_NO_DEFAULTED_MOVE_FUNCTIONS
     optional ( optional && ) = default;
 #else
     optional ( optional && rhs )
       BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible<T>::value)
-      : base( boost::move(rhs) )
+      : base( optional_detail::move(rhs) )
     {}
 #endif
 
-#endif
 
 #if BOOST_WORKAROUND(_MSC_VER, <= 1600)
     //  On old MSVC compilers the implicitly declared dtor is not called
@@ -1050,24 +771,15 @@ class optional
 #if !defined(BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT) && !defined(BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION)
     // Assigns from an expression. See corresponding constructor.
     // Basic Guarantee: If the resolved T ctor throws, this is left UNINITIALIZED
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
 
     template<class Expr>
     BOOST_DEDUCED_TYPENAME boost::enable_if<optional_detail::is_optional_val_assign_candidate<T, Expr>, optional&>::type
     operator= ( Expr&& expr )
       {
-        this->assign_expr(boost::forward<Expr>(expr),boost::addressof(expr));
+        this->assign_expr(optional_detail::forward<Expr>(expr),boost::addressof(expr));
         return *this ;
       }
 
-#else
-    template<class Expr>
-    optional& operator= ( Expr const& expr )
-      {
-        this->assign_expr(expr,boost::addressof(expr));
-        return *this ;
-      }
-#endif // !defined  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
 #endif // !defined(BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT) && !defined(BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION)
 
     // Copy-assigns from another convertible optional<U> (converts && deep-copies the rhs value)
@@ -1080,17 +792,15 @@ class optional
         return *this ;
       }
 
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Move-assigns from another convertible optional<U> (converts && deep-moves the rhs value)
     // Requires a valid conversion from U to T.
     // Basic Guarantee: If T::T( U && ) throws, this is left UNINITIALIZED
     template<class U>
     optional& operator= ( optional<U> && rhs )
       {
-        this->assign(boost::move(rhs));
+        this->assign(optional_detail::move(rhs));
         return *this ;
       }
-#endif
 
     // Assigns from another optional<T> (deep-copies the rhs value)
     // Basic Guarantee: If T::T( T const& ) throws, this is left UNINITIALIZED
@@ -1105,7 +815,6 @@ class optional
       }
 #endif
 
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Assigns from another optional<T> (deep-moves the rhs value)
 #ifndef BOOST_OPTIONAL_DETAIL_NO_DEFAULTED_MOVE_FUNCTIONS
     optional& operator= ( optional && ) = default;
@@ -1118,8 +827,6 @@ class optional
       }
 #endif
 
-#endif // BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-
 #ifndef BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
 
     // Assigns from a T (deep-moves/copies the rhs value)
@@ -1127,7 +834,7 @@ class optional
     BOOST_DEDUCED_TYPENAME boost::enable_if<boost::is_same<T, BOOST_DEDUCED_TYPENAME boost::decay<T_>::type>, optional&>::type
     operator= ( T_&& val )
       {
-        this->assign( boost::forward<T_>(val) ) ;
+        this->assign( optional_detail::forward<T_>(val) ) ;
         return *this ;
       }
 
@@ -1141,14 +848,12 @@ class optional
         return *this ;
       }
 
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
     // Assigns from a T (deep-moves the rhs value)
     optional& operator= ( rval_reference_type val )
       {
-        this->assign( boost::move(val) ) ;
+        this->assign( optional_detail::move(val) ) ;
         return *this ;
       }
-#endif
 
 #endif // BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
 
@@ -1161,101 +866,24 @@ class optional
         return *this ;
       }
 
-#if (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES) && (!defined BOOST_NO_CXX11_VARIADIC_TEMPLATES)
     // Constructs in-place
     // upon exception *this is always uninitialized
     template<class... Args>
     void emplace ( Args&&... args )
     {
-      this->emplace_assign( boost::forward<Args>(args)... );
+      this->emplace_assign( optional_detail::forward<Args>(args)... );
     }
 
     template<class... Args>
     explicit optional ( in_place_init_t, Args&&... args )
-    : base( in_place_init, boost::forward<Args>(args)... )
+    : base( in_place_init, optional_detail::forward<Args>(args)... )
     {}
 
     template<class... Args>
     explicit optional ( in_place_init_if_t, bool cond, Args&&... args )
-    : base( in_place_init_if, cond, boost::forward<Args>(args)... )
-    {}
-
-#elif (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES)
-    template<class Arg>
-    void emplace ( Arg&& arg )
-     {
-       this->emplace_assign( boost::forward<Arg>(arg) );
-     }
-
-    void emplace ()
-     {
-       this->emplace_assign();
-     }
-
-    template<class Args>
-    explicit optional ( in_place_init_t, Args&& args )
-    : base( in_place_init, boost::forward<Args>(args) )
+    : base( in_place_init_if, cond, optional_detail::forward<Args>(args)... )
     {}
 
-    explicit optional ( in_place_init_t )
-    : base( in_place_init )
-    {}
-
-    template<class Args>
-    explicit optional ( in_place_init_if_t, bool cond, Args&& args )
-    : base( in_place_init_if, cond, boost::forward<Args>(args) )
-    {}
-
-    explicit optional ( in_place_init_if_t, bool cond )
-    : base( in_place_init_if, cond )
-    {}
-#else
-    template<class Arg>
-    void emplace ( const Arg& arg )
-     {
-       this->emplace_assign( arg );
-     }
-
-    template<class Arg>
-    void emplace ( Arg& arg )
-     {
-       this->emplace_assign( arg );
-     }
-
-    void emplace ()
-     {
-       this->emplace_assign();
-     }
-
-    template<class Arg>
-    explicit optional ( in_place_init_t, const Arg& arg )
-    : base( in_place_init, arg )
-    {}
-
-    template<class Arg>
-    explicit optional ( in_place_init_t, Arg& arg )
-    : base( in_place_init, arg )
-    {}
-
-    explicit optional ( in_place_init_t )
-    : base( in_place_init )
-    {}
-
-    template<class Arg>
-    explicit optional ( in_place_init_if_t, bool cond, const Arg& arg )
-    : base( in_place_init_if, cond, arg )
-    {}
-
-    template<class Arg>
-    explicit optional ( in_place_init_if_t, bool cond, Arg& arg )
-    : base( in_place_init_if, cond, arg )
-    {}
-
-    explicit optional ( in_place_init_if_t, bool cond )
-    : base( in_place_init_if, cond )
-    {}
-#endif
-
     void swap( optional & arg )
       BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible<T>::value && ::boost::is_nothrow_move_assignable<T>::value)
       {
@@ -1283,42 +911,14 @@ class optional
     // Returns a reference to the value if this is initialized, otherwise,
     // the behaviour is UNDEFINED
     // No-throw
-#if (!defined BOOST_NO_CXX11_REF_QUALIFIERS) && (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES)
-    reference_const_type operator *() const& { return this->get() ; }
-    reference_type       operator *() &      { return this->get() ; }
-    reference_type_of_temporary_wrapper operator *() && { return boost::move(this->get()) ; }
-#else
-    reference_const_type operator *() const { return this->get() ; }
-    reference_type       operator *()       { return this->get() ; }
-#endif // !defined BOOST_NO_CXX11_REF_QUALIFIERS
+    reference_const_type operator *() BOOST_OPTIONAL_CONST_REF_QUAL { return this->get() ; }
+    reference_type       operator *() BOOST_OPTIONAL_REF_QUAL       { return this->get() ; }
 
-#if (!defined BOOST_NO_CXX11_REF_QUALIFIERS) && (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES)
-    reference_const_type value() const&
-      {
-        if (this->is_initialized())
-          return this->get() ;
-        else
-          throw_exception(bad_optional_access());
-      }
-
-    reference_type value() &
-      {
-        if (this->is_initialized())
-          return this->get() ;
-        else
-          throw_exception(bad_optional_access());
-      }
-
-    reference_type_of_temporary_wrapper value() &&
-      {
-        if (this->is_initialized())
-          return boost::move(this->get()) ;
-        else
-          throw_exception(bad_optional_access());
-      }
+#ifndef BOOST_NO_CXX11_REF_QUALIFIERS
+    reference_type_of_temporary_wrapper operator *() && { return optional_detail::move(this->get()) ; }
+#endif
 
-#else
-    reference_const_type value() const
+    reference_const_type value() BOOST_OPTIONAL_CONST_REF_QUAL
       {
         if (this->is_initialized())
           return this->get() ;
@@ -1326,112 +926,64 @@ class optional
           throw_exception(bad_optional_access());
       }
 
-    reference_type value()
+    reference_type value() BOOST_OPTIONAL_REF_QUAL
       {
         if (this->is_initialized())
           return this->get() ;
         else
           throw_exception(bad_optional_access());
       }
-#endif
-
 
-#ifndef BOOST_NO_CXX11_REF_QUALIFIERS
     template <class U>
-    value_type value_or ( U&& v ) const&
+    value_type value_or ( U&& v ) BOOST_OPTIONAL_CONST_REF_QUAL
       {
         if (this->is_initialized())
           return get();
         else
-          return boost::forward<U>(v);
+          return optional_detail::forward<U>(v);
       }
 
-    template <class U>
-    value_type value_or ( U&& v ) &&
-      {
-        if (this->is_initialized())
-          return boost::move(get());
-        else
-          return boost::forward<U>(v);
-      }
-#elif !defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
-    template <class U>
-    value_type value_or ( U&& v ) const
-      {
-        if (this->is_initialized())
-          return get();
-        else
-          return boost::forward<U>(v);
-      }
-#else
-    template <class U>
-    value_type value_or ( U const& v ) const
+    template <typename F>
+    value_type value_or_eval ( F f ) BOOST_OPTIONAL_CONST_REF_QUAL
       {
         if (this->is_initialized())
           return get();
         else
-          return v;
+          return f();
       }
 
-    template <class U>
-    value_type value_or ( U& v ) const
+#ifndef BOOST_NO_CXX11_REF_QUALIFIERS
+    reference_type_of_temporary_wrapper value() &&
       {
         if (this->is_initialized())
-          return get();
+          return optional_detail::move(this->get()) ;
         else
-          return v;
+          throw_exception(bad_optional_access());
       }
-#endif
-
 
-#if (!defined BOOST_NO_CXX11_REF_QUALIFIERS) && (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES)
-    template <typename F>
-    value_type value_or_eval ( F f ) const&
+    template <class U>
+    value_type value_or ( U&& v ) &&
       {
         if (this->is_initialized())
-          return get();
+          return optional_detail::move(get());
         else
-          return f();
+          return optional_detail::forward<U>(v);
       }
 
     template <typename F>
     value_type value_or_eval ( F f ) &&
       {
         if (this->is_initialized())
-          return boost::move(get());
+          return optional_detail::move(get());
         else
           return f();
       }
+#endif
 
-    template <typename F>
-    optional<typename boost::result_of<F(reference_type)>::type> map(F f) &
-      {
-        if (this->has_value())
-          return f(get());
-        else
-          return none;
-      }
-
-    template <typename F>
-    optional<typename boost::result_of<F(reference_const_type)>::type> map(F f) const&
-      {
-        if (this->has_value())
-          return f(get());
-        else
-          return none;
-      }
-
-    template <typename F>
-    optional<typename boost::result_of<F(reference_type_of_temporary_wrapper)>::type> map(F f) &&
-      {
-        if (this->has_value())
-          return f(boost::move(this->get()));
-        else
-          return none;
-      }
+// Monadic interface
 
     template <typename F>
-    optional<typename optional_detail::optional_value_type<typename boost::result_of<F(reference_type)>::type>::type> flat_map(F f) &
+    optional<typename optional_detail::result_of<F, reference_type>::type> map(F f) BOOST_OPTIONAL_REF_QUAL
       {
         if (this->has_value())
           return f(get());
@@ -1440,7 +992,7 @@ class optional
       }
 
     template <typename F>
-    optional<typename optional_detail::optional_value_type<typename boost::result_of<F(reference_const_type)>::type>::type> flat_map(F f) const&
+    optional<typename optional_detail::result_of<F, reference_const_type>::type> map(F f) BOOST_OPTIONAL_CONST_REF_QUAL
       {
         if (this->has_value())
           return f(get());
@@ -1448,36 +1000,20 @@ class optional
           return none;
       }
 
+#ifndef BOOST_NO_CXX11_REF_QUALIFIERS
     template <typename F>
-    optional<typename optional_detail::optional_value_type<typename boost::result_of<F(reference_type_of_temporary_wrapper)>::type>::type> flat_map(F f) &&
-      {
-        if (this->has_value())
-          return f(boost::move(get()));
-        else
-          return none;
-      }
-
-#else
-    template <typename F>
-    value_type value_or_eval ( F f ) const
-      {
-        if (this->is_initialized())
-          return get();
-        else
-          return f();
-      }
-
-    template <typename F>
-    optional<typename boost::result_of<F(reference_type)>::type> map(F f)
+    optional<typename optional_detail::result_of<F, reference_type_of_temporary_wrapper>::type> map(F f) &&
       {
         if (this->has_value())
-          return f(get());
+          return f(optional_detail::move(this->get()));
         else
           return none;
       }
+#endif
 
     template <typename F>
-    optional<typename boost::result_of<F(reference_const_type)>::type> map(F f) const
+    optional<typename optional_detail::result_value_type<F, reference_type>::type>
+    flat_map(F f) BOOST_OPTIONAL_REF_QUAL
       {
         if (this->has_value())
           return f(get());
@@ -1486,7 +1022,8 @@ class optional
       }
 
     template <typename F>
-    optional<typename optional_detail::optional_value_type<typename boost::result_of<F(reference_type)>::type>::type> flat_map(F f)
+    optional<typename optional_detail::result_value_type<F, reference_const_type>::type>
+    flat_map(F f) BOOST_OPTIONAL_CONST_REF_QUAL
       {
         if (this->has_value())
           return f(get());
@@ -1494,37 +1031,29 @@ class optional
           return none;
       }
 
+#ifndef BOOST_NO_CXX11_REF_QUALIFIERS
     template <typename F>
-    optional<typename optional_detail::optional_value_type<typename boost::result_of<F(reference_const_type)>::type>::type> flat_map(F f) const
+    optional<typename optional_detail::result_value_type<F, reference_type_of_temporary_wrapper>::type>
+    flat_map(F f) &&
       {
         if (this->has_value())
-          return f(get());
+          return f(optional_detail::move(get()));
         else
           return none;
       }
-
 #endif
 
     bool has_value() const BOOST_NOEXCEPT { return this->is_initialized() ; }
 
-    bool operator!() const BOOST_NOEXCEPT { return !this->is_initialized() ; }
-
-    BOOST_EXPLICIT_OPERATOR_BOOL_NOEXCEPT()
+    explicit operator bool() const BOOST_NOEXCEPT { return this->has_value() ; }
 } ;
 
-} // namespace boost
-
-#endif // BOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL
 
-namespace boost {
-
-#ifndef  BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
 template<class T>
 class optional<T&&>
 {
-  BOOST_STATIC_ASSERT_MSG(sizeof(T) == 0, "Optional rvalue references are illegal.");
+  static_assert(sizeof(T) == 0, "Optional rvalue references are illegal.");
 } ;
-#endif
 
 } // namespace boost
 
@@ -1534,13 +1063,12 @@ class optional<T&&>
 
 namespace boost {
 
-#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
 
 template<class T>
 inline
 optional<BOOST_DEDUCED_TYPENAME boost::decay<T>::type> make_optional ( T && v  )
 {
-  return optional<BOOST_DEDUCED_TYPENAME boost::decay<T>::type>(boost::forward<T>(v));
+  return optional<BOOST_DEDUCED_TYPENAME boost::decay<T>::type>(optional_detail::forward<T>(v));
 }
 
 // Returns optional<T>(cond,v)
@@ -1548,28 +1076,9 @@ template<class T>
 inline
 optional<BOOST_DEDUCED_TYPENAME boost::decay<T>::type> make_optional ( bool cond, T && v )
 {
-  return optional<BOOST_DEDUCED_TYPENAME boost::decay<T>::type>(cond,boost::forward<T>(v));
-}
-
-#else
-
-// Returns optional<T>(v)
-template<class T>
-inline
-optional<T> make_optional ( T const& v  )
-{
-  return optional<T>(v);
-}
-
-// Returns optional<T>(cond,v)
-template<class T>
-inline
-optional<T> make_optional ( bool cond, T const& v )
-{
-  return optional<T>(cond,v);
+  return optional<BOOST_DEDUCED_TYPENAME boost::decay<T>::type>(cond,optional_detail::forward<T>(v));
 }
 
-#endif // BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
 
 // Returns a reference to the value if this is initialized, otherwise, the behaviour is UNDEFINED.
 // No-throw
@@ -1653,7 +1162,7 @@ template<class CharType, class CharTrait>
 std::basic_ostream<CharType, CharTrait>&
 operator<<(std::basic_ostream<CharType, CharTrait>& os, optional_detail::optional_tag const&)
 {
-  BOOST_STATIC_ASSERT_MSG(sizeof(CharType) == 0, "If you want to output boost::optional, include header <boost/optional/optional_io.hpp>");
+  static_assert(sizeof(CharType) == 0, "If you want to output boost::optional, include header <boost/optional/optional_io.hpp>");
   return os;
 }