Mercurial > hg > orthanc-stone

diff Applications/Generic/GuiAdapter.cpp @ 1298:8a0a62189f46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 7def6ab2929f
children 257f2c9a02ac
line wrap: on
line diff
--- a/Applications/Generic/GuiAdapter.cpp	Sun Feb 23 15:25:49 2020 +0100
+++ b/Applications/Generic/GuiAdapter.cpp	Mon Mar 02 16:31:30 2020 +0100
@@ -34,6 +34,8 @@
 #  include "../../Framework/Messages/LockingEmitter.h"
 #endif
 
+#include <Core/Compatibility.h>
+
 namespace OrthancStone
 {
   std::ostream& operator<<(
@@ -195,7 +197,7 @@
     // userData is OnMouseWheelFuncAdapterPayload
     FuncAdapterPayload<GenericFunc>* payload =
       reinterpret_cast<FuncAdapterPayload<GenericFunc>*>(userData);
-    //std::auto_ptr< FuncAdapterPayload<GenericFunc> > deleter(payload);
+    //std::unique_ptr< FuncAdapterPayload<GenericFunc> > deleter(payload);
     bool ret = (*(payload->callback))(time, payload->userData);
     return static_cast<EM_BOOL>(ret);
   }
@@ -214,7 +216,7 @@
     // here
     FuncAdapterPayload<GenericFunc>* payload =
       new FuncAdapterPayload<GenericFunc>();
-    std::auto_ptr<FuncAdapterPayload<GenericFunc> > payloadP(payload);
+    std::unique_ptr<FuncAdapterPayload<GenericFunc> > payloadP(payload);
     payload->canvasId = canvasId;
     payload->callback = func;
     payload->userData = userData;
@@ -239,7 +241,7 @@
       EmscriptenSetCallbackFunc emFunc,
       std::string canvasId, void* userData, bool capture, GenericFunc func)
   {
-    std::auto_ptr<FuncAdapterPayload<GenericFunc> > payload(
+    std::unique_ptr<FuncAdapterPayload<GenericFunc> > payload(
       new FuncAdapterPayload<GenericFunc>()
     );
     payload->canvasId = canvasId;
@@ -262,7 +264,7 @@
       void* userData, GenericFunc func)
   {
     // LOG(ERROR) << "SetAnimationFrameCallback !!!!!! (RequestAnimationFrame)";
-    std::auto_ptr<FuncAdapterPayload<GenericFunc> > payload(
+    std::unique_ptr<FuncAdapterPayload<GenericFunc> > payload(
       new FuncAdapterPayload<GenericFunc>()
     );
     payload->canvasId = "UNDEFINED";