diff Framework/Viewport/WebAssemblyViewport.h @ 1308:adf234ecaa00 broker

Merge
author Benjamin Golinvaux <bgo@osimis.io>
date Wed, 04 Mar 2020 10:21:54 +0100
parents 257f2c9a02ac
children cbfdba08e039
line wrap: on
line diff
--- a/Framework/Viewport/WebAssemblyViewport.h	Wed Mar 04 10:07:37 2020 +0100
+++ b/Framework/Viewport/WebAssemblyViewport.h	Wed Mar 04 10:21:54 2020 +0100
@@ -43,9 +43,9 @@
     
     std::string                            shortCanvasId_;
     std::string                            fullCanvasId_;
-    std::auto_ptr<ICompositor>             compositor_;
+    std::unique_ptr<ICompositor>             compositor_;
     boost::shared_ptr<ViewportController>  controller_;
-    std::auto_ptr<IViewportInteractor>     interactor_;
+    std::unique_ptr<IViewportInteractor>     interactor_;
 
     static EM_BOOL OnRequestAnimationFrame(double time, void *userData);