Mercurial > hg > orthanc-stone
diff Framework/Deprecated/Widgets/SliceViewerWidget.cpp @ 1298:8a0a62189f46
replacing std::auto_ptr by std::unique_ptr
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 02 Mar 2020 16:31:30 +0100 |
parents | 2d8ab34c8c91 |
children | 257f2c9a02ac |
line wrap: on
line diff
--- a/Framework/Deprecated/Widgets/SliceViewerWidget.cpp Sun Feb 23 15:25:49 2020 +0100 +++ b/Framework/Deprecated/Widgets/SliceViewerWidget.cpp Mon Mar 02 16:31:30 2020 +0100 @@ -327,7 +327,7 @@ { LOG(INFO) << "Updating layer " << index; - std::auto_ptr<ILayerRenderer> tmp(renderer); + std::unique_ptr<ILayerRenderer> tmp(renderer); if (renderer == NULL) { @@ -357,7 +357,12 @@ !currentScene_->IsComplete() || pendingScene_->IsComplete()) { - currentScene_ = pendingScene_; +#if __cplusplus < 201103L + currentScene_.reset(pendingScene_.release()); +#else + currentScene_ = std::move(pendingScene_); +#endif + NotifyContentChanged(); } } @@ -518,7 +523,11 @@ (pendingScene_.get() != NULL && pendingScene_->IsComplete())) { - currentScene_ = pendingScene_; +#if __cplusplus < 201103L + currentScene_.reset(pendingScene_.release()); +#else + currentScene_ = std::move(pendingScene_); +#endif } plane_ = plane;