Merge branch 'timoore/ptrfix'

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

diff --git a/src/Systems/pitot.hxx b/src/Systems/pitot.hxx
index e606fe4e622cd51ff600e4f4ed0ef8929e8fce12..9d97dee40a307f561b3938d39a000e82cd20ce21 100644 (file)
--- a/src/Systems/pitot.hxx
+++ b/src/Systems/pitot.hxx
@@ -13,8 +13,8 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
-SG_USING_STD(string);
+#include <string>
+using std::string;
 
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
@@ -43,7 +43,6 @@ class PitotSystem : public SGSubsystem
 public:
 
     PitotSystem ( SGPropertyNode *node );
-    PitotSystem ( int i );
     virtual ~PitotSystem ();
 
     virtual void init ();
@@ -53,14 +52,14 @@ public:
 
 private:
 
-    int num;
-    string name;
+    string _name;
+    int _num;
     SGPropertyNode_ptr _serviceable_node;
     SGPropertyNode_ptr _pressure_node;
     SGPropertyNode_ptr _density_node;
     SGPropertyNode_ptr _velocity_node;
+    SGPropertyNode_ptr _slip_angle;
     SGPropertyNode_ptr _total_pressure_node;
-    
 };
 
 #endif // __SYSTEMS_PITOT_HXX