Work around G++ 2.95 bug by removing use of STL find() function.

[flightgear.git] / src / Model / modelmgr.cxx

diff --git a/src/Model/modelmgr.cxx b/src/Model/modelmgr.cxx
index 6129923011dd0e6d55031193a20b194bee7fcb6c..29693ecf1e11ef2218fa28c2966cbcf99242733e 100644 (file)
--- a/src/Model/modelmgr.cxx
+++ b/src/Model/modelmgr.cxx
@@ -11,8 +11,6 @@
 #include "modelmgr.hxx"
 #include "model.hxx"
 
-SG_USING_STD(find);
-
 
 FGModelMgr::FGModelMgr ()
   : _selector(new ssgSelector)
@@ -135,8 +133,14 @@ FGModelMgr::add_instance (Instance * instance)
 void
 FGModelMgr::remove_instance (Instance * instance)
 {
-    _instances.erase(find(_instances.begin(), _instances.end(), instance));
-    delete instance;
+    vector<Instance *>::iterator it;
+    for (it = _instances.begin(); it != _instances.end(); it++) {
+        if (*it == instance) {
+            _instances.erase(it);
+            delete instance;
+            return;
+        }
+    }
 }
 
 void