From b42fdd86349e237187ecaddb31b7597e8d2cdcc7 Mon Sep 17 00:00:00 2001
From: Antony Polukhin <antoshkka@gmail.com>
Date: Sun, 15 Dec 2024 18:46:38 +0300
Subject: [PATCH] Remove remaining parts of Boost.Move

---
 .../dll/detail/posix/shared_library_impl.hpp  |  2 ++
 .../detail/windows/shared_library_impl.hpp    |  2 ++
 include/boost/dll/import_class.hpp            | 29 ++++++++++---------
 include/boost/dll/shared_library.hpp          |  2 ++
 include/boost/dll/smart_library.hpp           |  2 +-
 5 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/include/boost/dll/detail/posix/shared_library_impl.hpp b/include/boost/dll/detail/posix/shared_library_impl.hpp
index 5dd204cb..a4396735 100644
--- a/include/boost/dll/detail/posix/shared_library_impl.hpp
+++ b/include/boost/dll/detail/posix/shared_library_impl.hpp
@@ -16,6 +16,8 @@
 #include <boost/core/invoke_swap.hpp>
 #include <boost/predef/os.h>
 
+#include <utility>  // std::move
+
 #include <dlfcn.h>
 #include <cstring> // strncmp
 #if !BOOST_OS_MACOS && !BOOST_OS_IOS && !BOOST_OS_QNX
diff --git a/include/boost/dll/detail/windows/shared_library_impl.hpp b/include/boost/dll/detail/windows/shared_library_impl.hpp
index 4f64b834..9298bd6c 100644
--- a/include/boost/dll/detail/windows/shared_library_impl.hpp
+++ b/include/boost/dll/detail/windows/shared_library_impl.hpp
@@ -18,6 +18,8 @@
 
 #include <boost/winapi/dll.hpp>
 
+#include <utility>  // std::move
+
 #ifdef BOOST_HAS_PRAGMA_ONCE
 # pragma once
 #endif
diff --git a/include/boost/dll/import_class.hpp b/include/boost/dll/import_class.hpp
index f4cd3f8e..f5fa7704 100644
--- a/include/boost/dll/import_class.hpp
+++ b/include/boost/dll/import_class.hpp
@@ -15,6 +15,7 @@
 #include <boost/dll/smart_library.hpp>
 #include <boost/dll/import_mangled.hpp>
 #include <memory>
+#include <utility>  // std::move
 
 #if (__cplusplus < 201103L) && (!defined(_MSVC_LANG) || _MSVC_LANG < 201103L)
 #  error This file requires C++11 at least!
@@ -147,14 +148,14 @@ class imported_class
     static imported_class<T> make(smart_library&& lib,  Args...args)
     {
         typedef detail::sequence<Args...> *seq;
-        return imported_class(seq(), boost::move(lib), static_cast<Args>(args)...);
+        return imported_class(seq(), std::move(lib), static_cast<Args>(args)...);
     }
 
     template<typename ...Args>
     static imported_class<T> make(smart_library&& lib, std::size_t size,  Args...args)
     {
         typedef detail::sequence<Args...> *seq;
-        return imported_class(seq(), boost::move(lib), size, static_cast<Args>(args)...);
+        return imported_class(seq(), std::move(lib), size, static_cast<Args>(args)...);
     }
     template<typename ...Args>
     static imported_class<T> make(const smart_library& lib,  Args...args)
@@ -340,7 +341,7 @@ imported_class<T>::imported_class(detail::sequence<Args...> *, const smart_libra
 template<typename T>
 template<typename ...Args>
 imported_class<T>::imported_class(detail::sequence<Args...> *, smart_library && lib,  Args...args)
-    : _lib(boost::move(lib)),
+    : _lib(std::move(lib)),
       _data(make_data<Args...>(lib, static_cast<Args>(args)...)),
       _is_allocating(false),
       _size(0),
@@ -352,7 +353,7 @@ imported_class<T>::imported_class(detail::sequence<Args...> *, smart_library &&
 template<typename T>
 template<typename ...Args>
 imported_class<T>::imported_class(detail::sequence<Args...> *, smart_library && lib, std::size_t size,  Args...args)
-    : _lib(boost::move(lib)),
+    : _lib(std::move(lib)),
       _data(make_data<Args...>(lib, size, static_cast<Args>(args)...)),
       _is_allocating(true),
       _size(size),
@@ -427,7 +428,7 @@ import_class(const smart_library& lib_, std::size_t size, Args...args)
 {
     smart_library lib(lib_);
 
-    return imported_class<T>::template make<Args...>(boost::move(lib), size, static_cast<Args>(args)...);
+    return imported_class<T>::template make<Args...>(std::move(lib), size, static_cast<Args>(args)...);
 }
 
 //! \overload boost::dll::import_class(const smart_library& lib, std::size_t, Args...)
@@ -435,7 +436,7 @@ template<typename T, typename ... Args> imported_class<T>
 import_class(const smart_library& lib_, Args...args)
 {
     smart_library lib(lib_);
-    return imported_class<T>::template make<Args...>(boost::move(lib), static_cast<Args>(args)...);
+    return imported_class<T>::template make<Args...>(std::move(lib), static_cast<Args>(args)...);
 }
 
 //! \overload boost::dll::import_class(const smart_library& lib, std::size_t, Args...)
@@ -444,7 +445,7 @@ import_class(const smart_library& lib_, const std::string & alias_name, Args...a
 {
     smart_library lib(lib_);
     lib.add_type_alias<T>(alias_name);
-    return imported_class<T>::template make<Args...>(boost::move(lib), static_cast<Args>(args)...);
+    return imported_class<T>::template make<Args...>(std::move(lib), static_cast<Args>(args)...);
 }
 
 //! \overload boost::dll::import_class(const smart_library& lib, std::size_t, Args...)
@@ -454,7 +455,7 @@ import_class(const smart_library& lib_, std::size_t size, const std::string & al
     smart_library lib(lib_);
 
     lib.add_type_alias<T>(alias_name);
-    return imported_class<T>::template make<Args...>(boost::move(lib), size, static_cast<Args>(args)...);
+    return imported_class<T>::template make<Args...>(std::move(lib), size, static_cast<Args>(args)...);
 }
 
 //! \overload boost::dll::import_class(const smart_library& lib, std::size_t, Args...)
@@ -464,14 +465,14 @@ import_class(const smart_library& lib_, const std::string & alias_name, std::siz
     smart_library lib(lib_);
 
     lib.add_type_alias<T>(alias_name);
-    return imported_class<T>::template make<Args...>(boost::move(lib), size, static_cast<Args>(args)...);
+    return imported_class<T>::template make<Args...>(std::move(lib), size, static_cast<Args>(args)...);
 }
 
 //! \overload boost::dll::import_class(const smart_library& lib, std::size_t, Args...)
 template<typename T, typename ... Args> imported_class<T>
 import_class(smart_library && lib, Args...args)
 {
-    return imported_class<T>::template make<Args...>(boost::move(lib), static_cast<Args>(args)...);
+    return imported_class<T>::template make<Args...>(std::move(lib), static_cast<Args>(args)...);
 }
 
 //! \overload boost::dll::import_class(const smart_library& lib, std::size_t, Args...)
@@ -479,14 +480,14 @@ template<typename T, typename ... Args> imported_class<T>
 import_class(smart_library && lib, const std::string & alias_name, Args...args)
 {
     lib.add_type_alias<T>(alias_name);
-    return imported_class<T>::template make<Args...>(boost::move(lib), static_cast<Args>(args)...);
+    return imported_class<T>::template make<Args...>(std::move(lib), static_cast<Args>(args)...);
 }
 
 //! \overload boost::dll::import_class(const smart_library& lib, std::size_t, Args...)
 template<typename T, typename ... Args> imported_class<T>
 import_class(smart_library && lib, std::size_t size, Args...args)
 {
-    return imported_class<T>::template make<Args...>(boost::move(lib), size, static_cast<Args>(args)...);
+    return imported_class<T>::template make<Args...>(std::move(lib), size, static_cast<Args>(args)...);
 }
 
 //! \overload boost::dll::import_class(const smart_library& lib, std::size_t, Args...)
@@ -494,7 +495,7 @@ template<typename T, typename ... Args> imported_class<T>
 import_class(smart_library && lib, std::size_t size, const std::string & alias_name, Args...args)
 {
     lib.add_type_alias<T>(alias_name);
-    return imported_class<T>::template make<Args...>(boost::move(lib), size, static_cast<Args>(args)...);
+    return imported_class<T>::template make<Args...>(std::move(lib), size, static_cast<Args>(args)...);
 }
 
 //! \overload boost::dll::import_class(const smart_library& lib, std::size_t, Args...)
@@ -502,7 +503,7 @@ template<typename T, typename ... Args> imported_class<T>
 import_class(smart_library && lib, const std::string & alias_name, std::size_t size, Args...args)
 {
     lib.add_type_alias<T>(alias_name);
-    return imported_class<T>::template make<Args...>(boost::move(lib), size, static_cast<Args>(args)...);
+    return imported_class<T>::template make<Args...>(std::move(lib), size, static_cast<Args>(args)...);
 }
 
 
diff --git a/include/boost/dll/shared_library.hpp b/include/boost/dll/shared_library.hpp
index b1ccfa41..1021e047 100644
--- a/include/boost/dll/shared_library.hpp
+++ b/include/boost/dll/shared_library.hpp
@@ -26,6 +26,8 @@
 #   include <boost/dll/detail/posix/shared_library_impl.hpp>
 #endif
 
+#include <utility>  // std::move
+
 #ifdef BOOST_HAS_PRAGMA_ONCE
 # pragma once
 #endif
diff --git a/include/boost/dll/smart_library.hpp b/include/boost/dll/smart_library.hpp
index 6a8366fa..2be91bff 100644
--- a/include/boost/dll/smart_library.hpp
+++ b/include/boost/dll/smart_library.hpp
@@ -31,7 +31,7 @@
 #include <boost/type_traits/is_void.hpp>
 #include <boost/type_traits/is_function.hpp>
 
-
+#include <utility>  // std::move
 
 namespace boost {
 namespace dll {