X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fstructure%2Fsubsystem_mgr.hxx;h=63cad43e769121515d3b0c6321365a2cd57bff77;hb=ff7e70f4d570c472bbc6fe4198483d927914a35e;hp=171e4665d4515705bab7c6274231d9148fa4fc23;hpb=733e6fa14ff507a1022ecab8d55cc9bf587bee40;p=simgear.git diff --git a/simgear/structure/subsystem_mgr.hxx b/simgear/structure/subsystem_mgr.hxx index 171e4665..63cad43e 100644 --- a/simgear/structure/subsystem_mgr.hxx +++ b/simgear/structure/subsystem_mgr.hxx @@ -25,25 +25,13 @@ #include -#if 0 -#ifdef HAVE_WINDOWS_H -# include -# include -#endif - -#include -SG_USING_STD(string); - -#include -SG_USING_STD(vector); -#endif - #include #include #include -SG_USING_STD(map); -SG_USING_STD(vector); -SG_USING_STD(string); + +using std::map; +using std::vector; +using std::string; #include #include @@ -329,10 +317,12 @@ public: private: - struct Member { + class Member { - Member (); + private: Member (const Member &member); + public: + Member (); virtual ~Member (); virtual void update (double delta_time_sec);