Merge branch 'maint2' into next

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

diff --git a/src/AIModel/AICarrier.hxx b/src/AIModel/AICarrier.hxx
index d76e1ed0eae8525aac7bac9a608bcdabae1b384a..c359c3fcb35f4b5aba7dd373507650f45a9f6ef3 100644 (file)
--- a/src/AIModel/AICarrier.hxx
+++ b/src/AIModel/AICarrier.hxx
@@ -29,8 +29,8 @@
 
 #include <simgear/compiler.h>
 
-SG_USING_STD(string);
-SG_USING_STD(list);
+using std::string;
+using std::list;
 
 #include "AIShip.hxx"
 
@@ -102,7 +102,8 @@ public:
     void ReturnToBox();
     bool OutsideBox();
 
-    bool init();
+    bool init(bool search_in_AI_path=false);
+    void initModel(osg::Node *node);
 
     virtual const char* getTypeString(void) const { return "carrier"; }