Fix Const iterator for msvc 2003 .net

Geo/GModel.cpp

-// $Id: GModel.cpp,v 1.56 2008-01-22 16:57:36 geuzaine Exp $
+// $Id: GModel.cpp,v 1.57 2008-02-06 09:50:37 miegroet Exp $
 //
 // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 //
@@ -104,7 +104,7 @@ void GModel::destroy()
 GRegion *GModel::regionByTag(int n) const
 {
   GEntity tmp((GModel*)this, n);
-  riter it = regions.find((GRegion*)&tmp);
+  std::set<GRegion*,GEntityLessThan>::const_iterator it =regions.find((GRegion*)&tmp);
   if(it != regions.end())
     return *it;
   else
@@ -114,7 +114,7 @@ GRegion *GModel::regionByTag(int n) const
 GFace *GModel::faceByTag(int n) const
 {
   GEntity tmp((GModel*)this, n);
-  fiter it = faces.find((GFace*)&tmp);
+  std::set<GFace*,GEntityLessThan>::const_iterator it = faces.find((GFace*)&tmp);
   if(it != faces.end())
     return *it;
   else
@@ -124,7 +124,7 @@ GFace *GModel::faceByTag(int n) const
 GEdge *GModel::edgeByTag(int n) const
 {
   GEntity tmp((GModel*)this, n);
-  eiter it = edges.find((GEdge*)&tmp);
+  std::set<GEdge*,GEntityLessThan>::const_iterator  it = edges.find((GEdge*)&tmp);
   if(it != edges.end())
     return *it;
   else
@@ -134,7 +134,7 @@ GEdge *GModel::edgeByTag(int n) const
 GVertex *GModel::vertexByTag(int n) const
 {
   GEntity tmp((GModel*)this, n);
-  viter it = vertices.find((GVertex*)&tmp);
+ std::set<GVertex*,GEntityLessThan>::const_iterator  it = vertices.find((GVertex*)&tmp);
   if(it != vertices.end())
     return *it;
   else
@@ -144,7 +144,8 @@ GVertex *GModel::vertexByTag(int n) const
 void GModel::remove(GRegion *r)
 {
   riter it = std::find(firstRegion(), lastRegion(), r);
-  if(it != regions.end()) regions.erase(it);
+  if(it != (riter)regions.end())
+  	regions.erase(it);
 }
 
 void GModel::remove(GFace *f)

Geo/GModel.h

@@ -66,11 +66,11 @@ class GModel
   // returns the current model
   static GModel *current();
 
-  typedef std::set<GRegion*, GEntityLessThan>::const_iterator riter;
-  typedef std::set<GFace*, GEntityLessThan>::const_iterator fiter;
-  typedef std::set<GEdge*, GEntityLessThan>::const_iterator eiter;
-  typedef std::set<GVertex*, GEntityLessThan>::const_iterator viter;
-  typedef std::map<int, std::string>::const_iterator piter;
+  typedef std::set<GRegion*, GEntityLessThan>::iterator riter;
+  typedef std::set<GFace*, GEntityLessThan>::iterator fiter;
+  typedef std::set<GEdge*, GEntityLessThan>::iterator eiter;
+  typedef std::set<GVertex*, GEntityLessThan>::iterator viter;
+  typedef std::map<int, std::string>::iterator piter;
 
   // Deletes everything in a GModel
   void destroy();