X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FGUI%2Fmenubar.hxx;h=eab4b7ff8c6d939b700fe5d1a71e6615fb45d100;hb=1ae2b59333dc914d10bcc726bc94e71cbf3e411e;hp=4d21903a580a778d9bdfb748f9c1ee298679c494;hpb=98081d9243fba9bf01dd827b9036efedfb842cb8;p=flightgear.git diff --git a/src/GUI/menubar.hxx b/src/GUI/menubar.hxx index 4d21903a5..eab4b7ff8 100644 --- a/src/GUI/menubar.hxx +++ b/src/GUI/menubar.hxx @@ -8,19 +8,20 @@ #endif #include // for SG_USING_STD +#include
#include #include -SG_USING_STD(map); +using std::map; #include -SG_USING_STD(vector); +using std::vector; class puMenuBar; class puObject; -class FGBinding; +class SGBinding; /** @@ -123,7 +124,7 @@ private: puMenuBar * _menuBar; // A map of bindings for the menubar. - map > _bindings; + map > _bindings; // These are hoops that we have to jump through because PUI doesn't // do memory management for lists. We have to allocate the arrays,