Mercurial > hg > orthanc
changeset 3752:4edeef72de75 storage-commitment
integration mainline->storage-commitment
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 16 Mar 2020 12:08:14 +0100 |
| parents | 875308321fa8 (current diff) 89bd08fdd91b (diff) |
| children | 632cc0985276 ef625518c27c |
| files | Plugins/Samples/Common/OrthancPluginCppWrapper.cpp |
| diffstat | 3 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Core/Compatibility.h Fri Mar 13 08:31:39 2020 +0100 +++ b/Core/Compatibility.h Mon Mar 16 12:08:14 2020 +0100 @@ -88,7 +88,7 @@ class unique_ptr : public boost::movelib::unique_ptr<T> { public: - unique_ptr() : + explicit unique_ptr() : boost::movelib::unique_ptr<T>() { }
--- a/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp Fri Mar 13 08:31:39 2020 +0100 +++ b/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp Mon Mar 16 12:08:14 2020 +0100 @@ -33,8 +33,9 @@ #include "OrthancPluginCppWrapper.h" +#include <boost/algorithm/string/predicate.hpp> +#include <boost/move/unique_ptr.hpp> #include <boost/thread.hpp> -#include <boost/algorithm/string/predicate.hpp> #include <json/reader.h> #include <json/writer.h> @@ -2168,7 +2169,7 @@ static const char* KEY_ASYNCHRONOUS = "Asynchronous"; static const char* KEY_PRIORITY = "Priority"; - std::auto_ptr<OrthancJob> protection(job); + boost::movelib::unique_ptr<OrthancJob> protection(job); if (body.type() != Json::objectValue) { @@ -3059,7 +3060,7 @@ } else { - std::auto_ptr<IChunkedRequestReader> reader(PostHandler(url, request)); + boost::movelib::unique_ptr<IChunkedRequestReader> reader(PostHandler(url, request)); if (reader.get() == NULL) { ORTHANC_PLUGINS_THROW_EXCEPTION(Plugin); @@ -3092,7 +3093,7 @@ } else { - std::auto_ptr<IChunkedRequestReader> reader(PutHandler(url, request)); + boost::movelib::unique_ptr<IChunkedRequestReader> reader(PutHandler(url, request)); if (reader.get() == NULL) { ORTHANC_PLUGINS_THROW_EXCEPTION(Plugin);
--- a/Resources/CMake/BoostConfiguration.cmake Fri Mar 13 08:31:39 2020 +0100 +++ b/Resources/CMake/BoostConfiguration.cmake Mon Mar 16 12:08:14 2020 +0100 @@ -12,7 +12,7 @@ endif() list(APPEND ORTHANC_BOOST_COMPONENTS filesystem thread system date_time regex) - find_package(Boost COMPONENTS "${ORTHANC_BOOST_COMPONENTS}") + find_package(Boost COMPONENTS ${ORTHANC_BOOST_COMPONENTS}) if (NOT Boost_FOUND) foreach (item ${ORTHANC_BOOST_COMPONENTS})