X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fstructure%2Fsubsystem_mgr.hxx;h=63cad43e769121515d3b0c6321365a2cd57bff77;hb=ff7e70f4d570c472bbc6fe4198483d927914a35e;hp=c5823e9a25bfc23939897069bc73de880c1a6b1a;hpb=240ed6f0b11d8b7ff84ca101078ef17ac6123784;p=simgear.git

diff --git a/simgear/structure/subsystem_mgr.hxx b/simgear/structure/subsystem_mgr.hxx
index c5823e9a..63cad43e 100644
--- a/simgear/structure/subsystem_mgr.hxx
+++ b/simgear/structure/subsystem_mgr.hxx
@@ -25,25 +25,13 @@
 
 #include <simgear/compiler.h>
 
-#if 0
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#  include <float.h>
-#endif
-
-#include STL_STRING
-SG_USING_STD(string);
-
-#include <vector>
-SG_USING_STD(vector);
-#endif
-
 #include <string>
 #include <map>
 #include <vector>
-SG_USING_STD(map);
-SG_USING_STD(vector);
-SG_USING_STD(string);
+
+using std::map;
+using std::vector;
+using std::string;
 
 #include <simgear/props/props.hxx>
 #include <simgear/timing/timestamp.hxx>
@@ -135,7 +123,7 @@ typedef vector<TimingInfo>::iterator eventTimeVecIterator;
  * subsystems may also override the suspend() and resume() methods to
  * take different actions.</p>
  */
-class SGSubsystem
+class SGSubsystem : public SGReferenced
 {
 public:
 
@@ -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);