Merge branch 'timoore/ptrfix'

[flightgear.git] / src / Systems / electrical.hxx

diff --git a/src/Systems/electrical.hxx b/src/Systems/electrical.hxx
index 1e660e471a0738b3bf6beb7888e828c46bd65481..f6f21a4534a653f958f86dd73ab6ae1de2d8af43 100644 (file)
--- a/src/Systems/electrical.hxx
+++ b/src/Systems/electrical.hxx
@@ -35,8 +35,8 @@
 #include <string>
 #include <vector>
 
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::string;
+using std::vector;
 
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
@@ -251,7 +251,7 @@ public:
     virtual void unbind ();
     virtual void update (double dt);
 
-    bool build ();
+    bool build (SGPropertyNode* config_props);
     float propagate( FGElectricalComponent *node, double dt,
                      float input_volts, float input_amps,
                      string s = "" );
@@ -266,7 +266,6 @@ private:
     string name;
     int num;
     string path;
-    SGPropertyNode *config_props;
 
     bool enabled;