C++17 copy elision ifdefs

Author: zajo

include/boost/leaf/context.hpp

@@ -292,11 +292,13 @@ class context
             if( ctx_ )
                 ctx_->activate();
         }
+#if __cplusplus < 201703L
         BOOST_LEAF_CONSTEXPR BOOST_LEAF_ALWAYS_INLINE raii_deactivator( raii_deactivator && x ) noexcept:
             ctx_(x.ctx_)
         {
             x.ctx_ = nullptr;
         }
+#endif
         BOOST_LEAF_ALWAYS_INLINE ~raii_deactivator() noexcept
         {
             if( ctx_ && ctx_->is_active() )

include/boost/leaf/on_error.hpp

@@ -166,14 +166,14 @@ namespace detail
     template <class... Item>
     class preloaded
     {
-        preloaded & operator=( preloaded const & ) = delete;
-#if __cplusplus >= 201703L
         preloaded( preloaded const & ) = delete;
-#else
-        bool moved_ = false;
-#endif
+        preloaded & operator=( preloaded const & ) = delete;
+
         std::tuple<Item...> p_;
         error_monitor id_;
+#if __cplusplus < 201703L
+        bool moved_ = false;
+#endif
 
     public: