Replace auto_ptr to prevent possible undefined behavior

diff --git a/simgear/canvas/Canvas.hxx b/simgear/canvas/Canvas.hxx
index f132a7cf7a60f6c9be6646b2e3112f98cfeba3be..08fbe40dc3a9f363596cf8fced67799f45fd45db 100644 (file)
--- a/simgear/canvas/Canvas.hxx
+++ b/simgear/canvas/Canvas.hxx
@@ -29,7 +29,7 @@
 #include <osg/NodeCallback>
 #include <osg/observer_ptr>
 
-#include <memory>
+#include <boost/scoped_ptr.hpp>
 #include <string>
 
 namespace simgear
@@ -168,7 +168,7 @@ namespace canvas
       SystemAdapterPtr  _system_adapter;
       CanvasMgr        *_canvas_mgr;
 
-      std::auto_ptr<EventManager>   _event_manager;
+      boost::scoped_ptr<EventManager> _event_manager;
 
       int _size_x,
           _size_y,

diff --git a/simgear/canvas/CanvasMgr.cxx b/simgear/canvas/CanvasMgr.cxx
index 3c087774c09670c9d02d8491e7b9471b666416b7..55ab24a2ecc13e43de0363c848b9fe30389d43f4 100644 (file)
--- a/simgear/canvas/CanvasMgr.cxx
+++ b/simgear/canvas/CanvasMgr.cxx
@@ -18,6 +18,7 @@
 
 #include "CanvasMgr.hxx"
 #include "Canvas.hxx"
+#include "CanvasEventManager.hxx"
 
 #include <boost/bind.hpp>