Merge branch 'next' of git://gitorious.org/fg/flightgear into next

[flightgear.git] / src / AIModel / AIManager.hxx

diff --git a/src/AIModel/AIManager.hxx b/src/AIModel/AIManager.hxx
index 19303fc34a21070458288f0b70ca46caac16bdf5..8f582801afee5880e9060b7992b3ff7e6ac78929 100644 (file)
--- a/src/AIModel/AIManager.hxx
+++ b/src/AIModel/AIManager.hxx
@@ -36,7 +36,7 @@
 #include <Traffic/SchedFlight.hxx>
 #include <Traffic/Schedule.hxx>
 
-SG_USING_STD(list);
+using std::list;
 
 class FGAIThermal;
 
@@ -46,7 +46,7 @@ class FGAIManager : public SGSubsystem
 public:
 
     // A list of pointers to AI objects
-    typedef list <osg::ref_ptr<FGAIBase> > ai_list_type;
+    typedef list <SGSharedPtr<FGAIBase> > ai_list_type;
     typedef ai_list_type::iterator ai_list_iterator;
     typedef ai_list_type::const_iterator ai_list_const_iterator;
 
@@ -100,7 +100,7 @@ private:
     double calcRange(double lat, double lon, double lat2, double lon2)const;
 
     SGPropertyNode_ptr root;
-    SGPropertyNode_ptr wind_from_down_node;
+    SGPropertyNode_ptr thermal_lift_node;
     SGPropertyNode_ptr user_latitude_node;
     SGPropertyNode_ptr user_longitude_node;
     SGPropertyNode_ptr user_altitude_node;