fix msvc compilation

Plugin/Distance.cpp

@@ -323,7 +323,7 @@ PView *GMSH_DistancePlugin::execute(PView *v)
 	  MVertex *v2 = e->getVertex(1);
 	  SPoint3 p1(v1->x(), v1->y(), v1->z());
 	  SPoint3 p2(v2->x(), v2->y(), v2->z());
-	  if((e->getNumVertices() == 2 and order==1) or (e->getNumVertices() == 3 and order==2)){
+	  if((e->getNumVertices() == 2 && order==1) || (e->getNumVertices() == 3 && order==2)){
             if (type==-100){
 //              if ( !((p1.x()==p2.x()) & (p1.y()==p2.y()) & (p1.z()==p2.z())) ){
                 signedDistancesPointsEllipseLine(iDistances, iDistancesE, iIsInYarn, iClosePts, pts, p1,p2);
@@ -332,7 +332,7 @@ PView *GMSH_DistancePlugin::execute(PView *v)
 	      signedDistancesPointsLine(iDistances, iClosePts, pts, p1,p2);
             }
 	  }
-	  else if(e->getNumVertices() == 3 and order==1){
+	  else if(e->getNumVertices() == 3 && order==1){
 	    MVertex *v3 = e->getVertex(2);
 	    SPoint3 p3 (v3->x(),v3->y(),v3->z());
 	    signedDistancesPointsTriangle(iDistances, iClosePts, pts, p1, p2, p3);

Plugin/MathEval.h

@@ -7,7 +7,7 @@
 #define _MATH_EVAL_H_
 
 #include "Plugin.h"
-
+;
 extern "C"
 {
   GMSH_Plugin *GMSH_RegisterMathEvalPlugin();

contrib/bamg/bamglib/MeshQuad.cpp

@@ -534,7 +534,7 @@ int  Triangles::SplitElement(int choice)
 
   newnbv=k;
   newNbVerticesOnGeomEdge=kvg;
-  if (newnbv> nbvx) goto Error;// bug 
+  if (newnbv> nbvx) goto error;// bug 
     
   nbv = k;
 
@@ -824,7 +824,7 @@ int  Triangles::SplitElement(int choice)
 
 		  }
 		else
-		  goto Error; 
+		  goto error; 
 	     }
 		    
 	 } 
@@ -876,8 +876,8 @@ int  Triangles::SplitElement(int choice)
   
   
   ret = 2;
-  if (nbt>= nbtx) goto Error; // bug 
-  if (nbv>= nbvx) goto Error; // bug 
+  if (nbt>= nbtx) goto error; // bug 
+  if (nbv>= nbvx) goto error; // bug 
   // generation of the new triangles 
 
   SetIntCoor("In SplitElement"); 
@@ -923,7 +923,7 @@ int  Triangles::SplitElement(int choice)
  CurrentTh=OCurrentTh;
  return 0; //ok
 
- Error:
+ error:
   nbv = nbvold;
   nbt = nbtold;
   NbOutT = NbOutTold;