# HG changeset patch # User Sebastien Jodogne # Date 1584356894 -3600 # Node ID 4edeef72de75160731a2a291511b0dd068b21b27 # Parent 875308321fa8a12fde8c3def34f80562f05b647f# Parent 89bd08fdd91b62640c929efa9ec6f58719a1d181 integration mainline->storage-commitment diff -r 875308321fa8 -r 4edeef72de75 Core/Compatibility.h --- 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 { public: - unique_ptr() : + explicit unique_ptr() : boost::movelib::unique_ptr() { } diff -r 875308321fa8 -r 4edeef72de75 Plugins/Samples/Common/OrthancPluginCppWrapper.cpp --- 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 +#include #include -#include #include #include @@ -2168,7 +2169,7 @@ static const char* KEY_ASYNCHRONOUS = "Asynchronous"; static const char* KEY_PRIORITY = "Priority"; - std::auto_ptr protection(job); + boost::movelib::unique_ptr protection(job); if (body.type() != Json::objectValue) { @@ -3059,7 +3060,7 @@ } else { - std::auto_ptr reader(PostHandler(url, request)); + boost::movelib::unique_ptr reader(PostHandler(url, request)); if (reader.get() == NULL) { ORTHANC_PLUGINS_THROW_EXCEPTION(Plugin); @@ -3092,7 +3093,7 @@ } else { - std::auto_ptr reader(PutHandler(url, request)); + boost::movelib::unique_ptr reader(PutHandler(url, request)); if (reader.get() == NULL) { ORTHANC_PLUGINS_THROW_EXCEPTION(Plugin); diff -r 875308321fa8 -r 4edeef72de75 Resources/CMake/BoostConfiguration.cmake --- 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})