Merge branch 'merge-requests/1555' into next

[flightgear.git] / src / GUI / new_gui.hxx

diff --git a/src/GUI/new_gui.hxx b/src/GUI/new_gui.hxx
index 422503a1a1d98b923f9f04f3b21134c5fdb83d96..dfc1ad812855279369b2e790c6f6ebb693cbad09 100644 (file)
--- a/src/GUI/new_gui.hxx
+++ b/src/GUI/new_gui.hxx
@@ -7,9 +7,11 @@
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/misc/sg_path.hxx>
 
+#include <string.h>
 #include <functional>
 #include <vector>
 #include <map>
+#include <memory> // for auto_ptr on some systems
 
 class SGBinding;
 
@@ -218,7 +220,7 @@ private:
     // Read all the configuration files in a directory.
     void readDir (const SGPath& path);
 
-    FGMenuBar * _menubar;
+    std::auto_ptr<FGMenuBar> _menubar;
     FGDialog * _active_dialog;
     std::map<std::string,FGDialog *> _active_dialogs;
     std::map<std::string,SGPropertyNode_ptr> _dialog_props;