more fixes for MSVC 2010 from Nigel

Fltk/FlGui.cpp

@@ -355,7 +355,7 @@ FlGui::FlGui(int argc, char **argv)
   fullscreen->mode(mode);
   fullscreen->end();
   fullscreen->fullscreen();
-#if not defined (__APPLE__)
+#if !defined (__APPLE__)
   fullscreen->icon(graph[0]->getWindow()->icon());
 #endif
 

Mesh/meshGFaceBDS.cpp

@@ -771,8 +771,8 @@ void invalidEdgesPeriodic(BDS_Mesh &m, std::map<BDS_Point*, MVertex*,PointLessTh
   while (it != m.edges.end()){
     BDS_Edge *e = *it;
     if (!e->deleted && e->numfaces() == 2){
-      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);
       if (itp1 != recoverMap->end() &&
           itp2 != recoverMap->end() &&
           itp1->second == itp2->second) toSplit.insert(e);

Mesh/qualityMeasures.cpp

@@ -722,7 +722,7 @@ double qmTetrahedron::cond(const double &x1, const double &y1, const double &z1,
 // TODO: Replace this
 static double prismNCJ(const MVertex* a, const MVertex* b, const MVertex* c, const MVertex* d)
 {
-  static const double fact = 2./sqrt(3);
+  static const double fact = 2./sqrt(3.);
 
   const SVector3 vec1 = SVector3(b->x()-a->x(),b->y()-a->y(),b->z()-a->z());
   const SVector3 vec2 = SVector3(c->x()-a->x(),c->y()-a->y(),c->z()-a->z());

contrib/HighOrderMeshOptimizer/OptHOM.cpp

@@ -536,6 +536,7 @@ bool OptHOM::addBndObjGrad(double factor, double &Obj, alglib::real_1d_array &gr
   Obj +=distCAD;
   //  printf("computing distance : 2D part %12.5E\n",distCAD);
   //  printf("%22.15E\n",distCAD);
+  return true;
 }
 
 bool OptHOM::addBndObjGrad2(double factor, double &Obj, alglib::real_1d_array &gradObj)

contrib/HighOrderMeshOptimizer/OptHomFastCurving.cpp

@@ -563,9 +563,10 @@ void HighOrderMeshFastCurving(GModel *gm, FastCurvingParameters &p)
   }
   else {                                                                                        // No BL field
     for (int iEnt = 0; iEnt < allEntities.size(); ++iEnt) {
+      GEntity *dummy = 0;
       GEntity* &entity = allEntities[iEnt];
       if (entity->dim() == p.dim-1 && (!p.onlyVisible || entity->getVisibility()))              // Consider boundary entities
-        entities.insert(std::pair<GEntity*,GEntity*>(0, entity));
+        entities.insert(std::pair<GEntity*,GEntity*>(dummy, entity));
     }
   }
 

doc/CREDITS.txt

@@ -130,4 +130,4 @@ Van den Abeele, Simon Vun, Simon Corbin, Thomas De-Soza, Marcus Drosson, Antoine
 Dechaume, Jose Paulo Moitinho de Almeida, Thomas Pinchard, Corrado Chisari, Axel
 Hackbarth, Peter Wainwright, Jiri Hnidek, Thierry Thomas, Konstantinos Poulios,
 Laurent Van Miegroet, Shahrokh Ghavamian, Geordie McBain, Jose Paulo Moitinho de
-Almeida, Guillaume Demesy, Wendy Merks-Swolfs, Cosmin Stefan Deaconu.
+Almeida, Guillaume Demesy, Wendy Merks-Swolfs, Cosmin Stefan Deaconu, Nigel Nunn.