Mercurial > hg > orthanc
diff OrthancServer/Database/Compatibility/SetOfResources.cpp @ 3712:2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 02 Mar 2020 15:32:45 +0100 |
parents | 94f4a18a79cc |
children |
line wrap: on
line diff
--- a/OrthancServer/Database/Compatibility/SetOfResources.cpp Fri Feb 28 13:23:11 2020 +0100 +++ b/OrthancServer/Database/Compatibility/SetOfResources.cpp Mon Mar 02 15:32:45 2020 +0100 @@ -55,7 +55,7 @@ } else { - std::auto_ptr<Resources> filtered(new Resources); + std::unique_ptr<Resources> filtered(new Resources); for (std::list<int64_t>::const_iterator it = resources.begin(); it != resources.end(); ++it) @@ -66,7 +66,11 @@ } } - resources_ = filtered; +#if __cplusplus < 201103L + resources_.reset(filtered.release()); +#else + resources_ = std::move(filtered); +#endif } } @@ -80,7 +84,7 @@ if (resources_.get() != NULL) { - std::auto_ptr<Resources> children(new Resources); + std::unique_ptr<Resources> children(new Resources); for (Resources::const_iterator it = resources_->begin(); it != resources_->end(); ++it) @@ -95,7 +99,11 @@ } } - resources_ = children; +#if __cplusplus < 201103L + resources_.reset(children.release()); +#else + resources_ = std::move(children); +#endif } switch (level_)