Added support for <condition> elements under <enable> elements.

[flightgear.git] / src / Autopilot / xmlauto.hxx

diff --git a/src/Autopilot/xmlauto.hxx b/src/Autopilot/xmlauto.hxx
index b325302790dcb0d381f089d6cde10a0bc952286d..f9b0a62b74c0a7ccd01e323371a39284a77a8ff2 100644 (file)
--- a/src/Autopilot/xmlauto.hxx
+++ b/src/Autopilot/xmlauto.hxx
@@ -34,16 +34,17 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 #include <vector>
 #include <deque>
 
-SG_USING_STD(string);
-SG_USING_STD(vector);
-SG_USING_STD(deque);
+using std::string;
+using std::vector;
+using std::deque;
 
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
+#include <simgear/props/condition.hxx>
 
 #include <Main/fg_props.hxx>
 
@@ -68,6 +69,7 @@ protected:
     SGPropertyNode_ptr r_n_prop;
     double r_n_value;
     vector <SGPropertyNode_ptr> output_list;
+    SGSharedPtr<const SGCondition> _condition;
 
 public:
 
@@ -79,7 +81,8 @@ public:
       enabled( false ),
       input_prop( NULL ),
       r_n_prop( NULL ),
-      r_n_value( 0.0 )
+      r_n_value( 0.0 ),
+      _condition( NULL )
     { }
 
     virtual ~FGXMLAutoComponent() {}