X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fboost%2Fboost%2Fdll%2Fimport.hpp;h=8e639548d823ec88d8e2a20edc2e2b517453624d;hb=92f5a8d42d07f9929ae4fa7e01342fe8d96808a8;hp=9b38a42c138e12e43aef4ff5e7f39e9ac1d176ed;hpb=a0324939f9d0e1905d5df8f57442f09dc70af83d;p=ceph.git

diff --git a/ceph/src/boost/boost/dll/import.hpp b/ceph/src/boost/boost/dll/import.hpp
index 9b38a42c1..8e639548d 100644
--- a/ceph/src/boost/boost/dll/import.hpp
+++ b/ceph/src/boost/boost/dll/import.hpp
@@ -1,5 +1,5 @@
 // Copyright 2014 Renato Tegon Forti, Antony Polukhin.
-// Copyright 2015-2016 Antony Polukhin.
+// Copyright 2015-2019 Antony Polukhin.
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
@@ -8,7 +8,7 @@
 #ifndef BOOST_DLL_IMPORT_HPP
 #define BOOST_DLL_IMPORT_HPP
 
-#include <boost/config.hpp>
+#include <boost/dll/config.hpp>
 #include <boost/core/addressof.hpp>
 #include <boost/core/enable_if.hpp>
 #include <boost/type_traits/is_object.hpp>
@@ -125,11 +125,11 @@ namespace detail {
 *
 * \return callable object if T is a function type, or boost::shared_ptr<T> if T is an object type.
 *
-* \throw boost::system::system_error if symbol does not exist or if the DLL/DSO was not loaded.
+* \throw \forcedlinkfs{system_error} if symbol does not exist or if the DLL/DSO was not loaded.
 *       Overload that accepts path also throws std::bad_alloc in case of insufficient memory.
 */
 template <class T>
-BOOST_DLL_IMPORT_RESULT_TYPE import(const boost::filesystem::path& lib, const char* name,
+BOOST_DLL_IMPORT_RESULT_TYPE import(const boost::dll::fs::path& lib, const char* name,
     load_mode::type mode = load_mode::default_mode)
 {
     typedef typename boost::dll::detail::import_type<T>::base_type type;
@@ -138,15 +138,15 @@ BOOST_DLL_IMPORT_RESULT_TYPE import(const boost::filesystem::path& lib, const ch
     return type(p, boost::addressof(p->get<T>(name)));
 }
 
-//! \overload boost::dll::import(const boost::filesystem::path& lib, const char* name, load_mode::type mode)
+//! \overload boost::dll::import(const boost::dll::fs::path& lib, const char* name, load_mode::type mode)
 template <class T>
-BOOST_DLL_IMPORT_RESULT_TYPE import(const boost::filesystem::path& lib, const std::string& name,
+BOOST_DLL_IMPORT_RESULT_TYPE import(const boost::dll::fs::path& lib, const std::string& name,
     load_mode::type mode = load_mode::default_mode)
 {
     return import<T>(lib, name.c_str(), mode);
 }
 
-//! \overload boost::dll::import(const boost::filesystem::path& lib, const char* name, load_mode::type mode)
+//! \overload boost::dll::import(const boost::dll::fs::path& lib, const char* name, load_mode::type mode)
 template <class T>
 BOOST_DLL_IMPORT_RESULT_TYPE import(const shared_library& lib, const char* name) {
     typedef typename boost::dll::detail::import_type<T>::base_type type;
@@ -155,13 +155,13 @@ BOOST_DLL_IMPORT_RESULT_TYPE import(const shared_library& lib, const char* name)
     return type(p, boost::addressof(p->get<T>(name)));
 }
 
-//! \overload boost::dll::import(const boost::filesystem::path& lib, const char* name, load_mode::type mode)
+//! \overload boost::dll::import(const boost::dll::fs::path& lib, const char* name, load_mode::type mode)
 template <class T>
 BOOST_DLL_IMPORT_RESULT_TYPE import(const shared_library& lib, const std::string& name) {
     return import<T>(lib, name.c_str());
 }
 
-//! \overload boost::dll::import(const boost::filesystem::path& lib, const char* name, load_mode::type mode)
+//! \overload boost::dll::import(const boost::dll::fs::path& lib, const char* name, load_mode::type mode)
 template <class T>
 BOOST_DLL_IMPORT_RESULT_TYPE import(BOOST_RV_REF(shared_library) lib, const char* name) {
     typedef typename boost::dll::detail::import_type<T>::base_type type;
@@ -172,7 +172,7 @@ BOOST_DLL_IMPORT_RESULT_TYPE import(BOOST_RV_REF(shared_library) lib, const char
     return type(p, boost::addressof(p->get<T>(name)));
 }
 
-//! \overload boost::dll::import(const boost::filesystem::path& lib, const char* name, load_mode::type mode)
+//! \overload boost::dll::import(const boost::dll::fs::path& lib, const char* name, load_mode::type mode)
 template <class T>
 BOOST_DLL_IMPORT_RESULT_TYPE import(BOOST_RV_REF(shared_library) lib, const std::string& name) {
     return import<T>(boost::move(lib), name.c_str());
@@ -215,11 +215,11 @@ BOOST_DLL_IMPORT_RESULT_TYPE import(BOOST_RV_REF(shared_library) lib, const std:
 *
 * \return callable object if T is a function type, or boost::shared_ptr<T> if T is an object type.
 *
-* \throw boost::system::system_error if symbol does not exist or if the DLL/DSO was not loaded.
+* \throw \forcedlinkfs{system_error} if symbol does not exist or if the DLL/DSO was not loaded.
 *       Overload that accepts path also throws std::bad_alloc in case of insufficient memory.
 */
 template <class T>
-BOOST_DLL_IMPORT_RESULT_TYPE import_alias(const boost::filesystem::path& lib, const char* name,
+BOOST_DLL_IMPORT_RESULT_TYPE import_alias(const boost::dll::fs::path& lib, const char* name,
     load_mode::type mode = load_mode::default_mode)
 {
     typedef typename boost::dll::detail::import_type<T>::base_type type;
@@ -228,15 +228,15 @@ BOOST_DLL_IMPORT_RESULT_TYPE import_alias(const boost::filesystem::path& lib, co
     return type(p, p->get<T*>(name));
 }
 
-//! \overload boost::dll::import_alias(const boost::filesystem::path& lib, const char* name, load_mode::type mode)
+//! \overload boost::dll::import_alias(const boost::dll::fs::path& lib, const char* name, load_mode::type mode)
 template <class T>
-BOOST_DLL_IMPORT_RESULT_TYPE import_alias(const boost::filesystem::path& lib, const std::string& name,
+BOOST_DLL_IMPORT_RESULT_TYPE import_alias(const boost::dll::fs::path& lib, const std::string& name,
     load_mode::type mode = load_mode::default_mode)
 {
     return import_alias<T>(lib, name.c_str(), mode);
 }
 
-//! \overload boost::dll::import_alias(const boost::filesystem::path& lib, const char* name, load_mode::type mode)
+//! \overload boost::dll::import_alias(const boost::dll::fs::path& lib, const char* name, load_mode::type mode)
 template <class T>
 BOOST_DLL_IMPORT_RESULT_TYPE import_alias(const shared_library& lib, const char* name) {
     typedef typename boost::dll::detail::import_type<T>::base_type type;
@@ -245,13 +245,13 @@ BOOST_DLL_IMPORT_RESULT_TYPE import_alias(const shared_library& lib, const char*
     return type(p, p->get<T*>(name));
 }
 
-//! \overload boost::dll::import_alias(const boost::filesystem::path& lib, const char* name, load_mode::type mode)
+//! \overload boost::dll::import_alias(const boost::dll::fs::path& lib, const char* name, load_mode::type mode)
 template <class T>
 BOOST_DLL_IMPORT_RESULT_TYPE import_alias(const shared_library& lib, const std::string& name) {
     return import_alias<T>(lib, name.c_str());
 }
 
-//! \overload boost::dll::import_alias(const boost::filesystem::path& lib, const char* name, load_mode::type mode)
+//! \overload boost::dll::import_alias(const boost::dll::fs::path& lib, const char* name, load_mode::type mode)
 template <class T>
 BOOST_DLL_IMPORT_RESULT_TYPE import_alias(BOOST_RV_REF(shared_library) lib, const char* name) {
     typedef typename boost::dll::detail::import_type<T>::base_type type;
@@ -262,7 +262,7 @@ BOOST_DLL_IMPORT_RESULT_TYPE import_alias(BOOST_RV_REF(shared_library) lib, cons
     return type(p, p->get<T*>(name));
 }
 
-//! \overload boost::dll::import_alias(const boost::filesystem::path& lib, const char* name, load_mode::type mode)
+//! \overload boost::dll::import_alias(const boost::dll::fs::path& lib, const char* name, load_mode::type mode)
 template <class T>
 BOOST_DLL_IMPORT_RESULT_TYPE import_alias(BOOST_RV_REF(shared_library) lib, const std::string& name) {
     return import_alias<T>(boost::move(lib), name.c_str());