From 92f363926e58403b12b0cddbc57071786a1f622d Mon Sep 17 00:00:00 2001
From: Thomas Geymayer <tomgey@gmail.com>
Date: Thu, 4 Jul 2013 16:08:58 +0200
Subject: [PATCH] Replace auto_ptr to prevent possible undefined behavior

---
 simgear/canvas/Canvas.hxx    | 4 ++--
 simgear/canvas/CanvasMgr.cxx | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/simgear/canvas/Canvas.hxx b/simgear/canvas/Canvas.hxx
index f132a7cf..08fbe40d 100644
--- 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 3c087774..55ab24a2 100644
--- 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>