[Gmsh] gmsh edits for Visual Studio 2010

[Christophe Geuzaine]

Nigel - Thanks ; fixed in SVN

> On 14 Nov 2014, at 12:41, Nigel Nunn <nnnunnn at gmail.com> wrote:
> 
> Dear Christophe,
> Here are a few more adjustments to help VC++ 2010 compiler.
> with thanks!
> Nigel
> 
> 
> //---------------------------------------------------------
> Mesh/qualityMeasures.cpp (line 725)
> 
> //static const double fact = 2./sqrt(3);
>   static const double fact = 2./sqrt(3.);
> 
> 
> //---------------------------------------------------------
> Mesh/meshGFaceBDS.cpp (lines 774,5)
> 
> //std::map<BDS_Point*, MVertex*>::iterator itp1 = recoverMap->find(e->p1);
> //std::map<BDS_Point*, MVertex*>::iterator itp2 = recoverMap->find(e->p2);
>   std::map<BDS_Point*, MVertex*,PointLessThan>::iterator itp1 = recoverMap->find(e->p1);
>   std::map<BDS_Point*, MVertex*,PointLessThan>::iterator itp2 = recoverMap->find(e->p2);
> 
> 
> //---------------------------------------------------------
> Fltk/FlGui.cpp (line 359)
> //#if not defined (__APPLE__)
>   #if !defined (__APPLE__)
> 
>   // else add #include <ciso646>   // <-- define keywords not, or, and
> 
> 
> //---------------------------------------------------------
> contrib/HighOrderMeshOptimizer/OptHOM.cpp (line 540)
> bool OptHOM::addBndObjGrad(...)
> {
> 
>   return true;  // line 540: expect bool return
> }
> 
> 
> //---------------------------------------------------------
> contrib/HighOrderMeshOptimizer/OptHomFastCurving.cpp (from line 564)
> 
> // At line 568, cannot make std::pair<GEntity*,GEntity*> from (0, entity);
> // fix: use a dummy GEntity*
> 
> 
>   else {
>     for (int iEnt = 0; iEnt < allEntities.size(); ++iEnt) {
>       GEntity* dummy=NULL; // NBN:
>       GEntity* &entity = allEntities[iEnt];
>       if (entity->dim() == p.dim-1 && (!p.onlyVisible || entity->getVisibility()))
>       //entities.insert(std::pair<GEntity*,GEntity*>(0, entity));
>         entities.insert(std::pair<GEntity*,GEntity*>(dummy, entity));
>     }
>   }
> 
> 
> - - - <end> - - -
> NN
> 
> 
> 
> 
> On Wed, Oct 22, 2014 at 7:55 AM, Christophe Geuzaine <cgeuzaine at ulg.ac.be> wrote:
> 
> Nigel - Thanks; these should now be fixed in SVN.
> 
> > On 21 Oct 2014, at 01:09, Nigel Nunn <nnnunnn at gmail.com> wrote:
> >
> > Hi Gmsh,
> >
> > A few adjustments to help Visual Studio 2010 compile svn version:
> >
> > Files: /Numeric/MetricBasis.cpp, JacobianBasis.cpp
> >
> > "std::sqrt (integer);"
> >
> > std::sqrt(2) -> std::sqrt(2.)
> > std::sqrt(3) -> std::sqrt(3.)
> > std::sqrt(6) -> std::sqrt(6.)
> >
> >
> > File: /Mesh/meshGRegion.cpp (line 907)
> >
> > //std::set<MEdge          >::iterator ite =  edges.begin(); // old
> >   std::set<MEdge,Less_Edge>::iterator ite =  edges.begin(); // new
> >
> >
> > File: /Mesh/meshGFaceBDS.cpp (line)
> >
> > //std::map<MEdge, MVertex *           >::iterator it = _middle.find(E);  // old
> >   std::map<MEdge, MVertex *, Less_Edge>::iterator it = _middle.find(E);  // new
> >
> >
> > many thanks!
> > Nigel
> >
> > _______________________________________________
> > gmsh mailing list
> > gmsh at geuz.org
> > http://www.geuz.org/mailman/listinfo/gmsh
> 
> --
> Prof. Christophe Geuzaine
> University of Liege, Electrical Engineering and Computer Science
> http://www.montefiore.ulg.ac.be/~geuzaine
> 
> 
> 
> 
> _______________________________________________
> gmsh mailing list
> gmsh at geuz.org
> http://www.geuz.org/mailman/listinfo/gmsh

-- 
Prof. Christophe Geuzaine
University of Liege, Electrical Engineering and Computer Science 
http://www.montefiore.ulg.ac.be/~geuzaine