5dbec05
diff -rupN gmsh-2.9.0-source/Geo/GEdge.cpp gmsh-2.9.0-source-new/Geo/GEdge.cpp
5dbec05
--- gmsh-2.9.0-source/Geo/GEdge.cpp	2015-03-08 14:03:26.000000000 +0100
5dbec05
+++ gmsh-2.9.0-source-new/Geo/GEdge.cpp	2015-03-13 23:54:27.754151246 +0100
5c732b6
@@ -182,7 +182,7 @@ std::string GEdge::getAdditionalInfoStri
5c732b6
     sstream << " transfinite (" << meshAttributes.nbPointsTransfinite;
5c732b6
     int type = meshAttributes.typeTransfinite;
5c732b6
     if(std::abs(type) == 1)
5c732b6
-      sstream << ", progression " << sign(type) * meshAttributes.coeffTransfinite;
5c732b6
+      sstream << ", progression " << SIGN(type) * meshAttributes.coeffTransfinite;
5c732b6
     else if(std::abs(type) == 2)
5c732b6
       sstream << ", bump " << meshAttributes.coeffTransfinite;
5c732b6
     sstream << ")";
5dbec05
diff -rupN gmsh-2.9.0-source/Geo/Geo.cpp gmsh-2.9.0-source-new/Geo/Geo.cpp
5dbec05
--- gmsh-2.9.0-source/Geo/Geo.cpp	2015-03-12 12:14:16.000000000 +0100
5dbec05
+++ gmsh-2.9.0-source-new/Geo/Geo.cpp	2015-03-13 23:54:27.755151267 +0100
5dbec05
@@ -4498,7 +4498,7 @@ void setSurfaceGeneratrices(Surface *s,
26afebd
          (i != 0 && iLoop < 0)){  // hole
26afebd
         for(int j = 0; j < List_Nbr(el->Curves); j++) {
26afebd
           List_Read(el->Curves, j, &ic);
26afebd
-          ic *= sign(iLoop);
26afebd
+          ic *= SIGN(iLoop);
26afebd
           if(i != 0) ic *= -1; // hole
26afebd
           if(!(c = FindCurve(ic)))
26afebd
             fromModel.push_back(ic);
5dbec05
@@ -4509,7 +4509,7 @@ void setSurfaceGeneratrices(Surface *s,
26afebd
       else{
26afebd
         for(int j = List_Nbr(el->Curves)-1; j >= 0; j--) {
26afebd
           List_Read(el->Curves, j, &ic);
26afebd
-          ic *= sign(iLoop);
26afebd
+          ic *= SIGN(iLoop);
26afebd
           if(i != 0) ic *= -1; // hole
26afebd
           if(!(c = FindCurve(ic)))
26afebd
             fromModel.push_back(ic);
5dbec05
@@ -4555,7 +4555,7 @@ void setVolumeSurfaces(Volume *v, List_T
26afebd
           // create "negative" surfaces. So we just store the signs in
26afebd
           // another list
26afebd
           List_Add(v->Surfaces, &s);
26afebd
-          int tmp = sign(is) * sign(il);
26afebd
+          int tmp = SIGN(is) * SIGN(il);
26afebd
           if(i > 0) tmp *= -1; // this is a hole
26afebd
           List_Add(v->SurfacesOrientations, &tmp);
26afebd
         }
5dbec05
diff -rupN gmsh-2.9.0-source/Geo/GModelIO_GEO.cpp gmsh-2.9.0-source-new/Geo/GModelIO_GEO.cpp
5dbec05
--- gmsh-2.9.0-source/Geo/GModelIO_GEO.cpp	2015-03-08 14:03:26.000000000 +0100
5dbec05
+++ gmsh-2.9.0-source-new/Geo/GModelIO_GEO.cpp	2015-03-13 23:54:27.756151288 +0100
5dbec05
@@ -325,7 +325,7 @@ int GModel::importGEOInternals()
26afebd
       case MSH_PHYSICAL_SURFACE: ge = getFaceByTag(tag); break;
26afebd
       case MSH_PHYSICAL_VOLUME:  ge = getRegionByTag(tag); break;
26afebd
       }
26afebd
-      int pnum = CTX::instance()->geom.orientedPhysicals ? (sign(num) * p->Num) : p->Num;
26afebd
+      int pnum = CTX::instance()->geom.orientedPhysicals ? (SIGN(num) * p->Num) : p->Num;
26afebd
       if(ge && std::find(ge->physicals.begin(), ge->physicals.end(), pnum) ==
26afebd
          ge->physicals.end())
26afebd
         ge->physicals.push_back(pnum);
5dbec05
diff -rupN gmsh-2.9.0-source/Geo/gmshEdge.cpp gmsh-2.9.0-source-new/Geo/gmshEdge.cpp
5dbec05
--- gmsh-2.9.0-source/Geo/gmshEdge.cpp	2015-03-08 14:03:26.000000000 +0100
5dbec05
+++ gmsh-2.9.0-source-new/Geo/gmshEdge.cpp	2015-03-13 23:54:27.757151309 +0100
5c732b6
@@ -97,7 +97,7 @@ std::string gmshEdge::getAdditionalInfoS
5c732b6
       sstream << " transfinite (" << meshAttributes.nbPointsTransfinite;
5c732b6
       int type = meshAttributes.typeTransfinite;
5c732b6
       if(std::abs(type) == 1)
5c732b6
-        sstream << ", progression " << sign(type) * meshAttributes.coeffTransfinite;
5c732b6
+        sstream << ", progression " << SIGN(type) * meshAttributes.coeffTransfinite;
5c732b6
       else if(std::abs(type) == 2)
5c732b6
         sstream << ", bump " << meshAttributes.coeffTransfinite;
5c732b6
       sstream << ")";
5dbec05
diff -rupN gmsh-2.9.0-source/Geo/gmshRegion.cpp gmsh-2.9.0-source-new/Geo/gmshRegion.cpp
5dbec05
--- gmsh-2.9.0-source/Geo/gmshRegion.cpp	2015-03-08 14:03:26.000000000 +0100
5dbec05
+++ gmsh-2.9.0-source-new/Geo/gmshRegion.cpp	2015-03-13 23:54:27.757151309 +0100
26afebd
@@ -32,7 +32,7 @@ gmshRegion::gmshRegion(GModel *m, ::Volu
26afebd
     GFace *f = m->getFaceByTag(abs(is));
26afebd
     if(f){
26afebd
       l_faces.push_back(f);
26afebd
-      l_dirs.push_back(sign(is));
26afebd
+      l_dirs.push_back(SIGN(is));
26afebd
       f->addRegion(this);
26afebd
     }
26afebd
     else
5dbec05
diff -rupN gmsh-2.9.0-source/Mesh/meshGEdge.cpp gmsh-2.9.0-source-new/Mesh/meshGEdge.cpp
5dbec05
--- gmsh-2.9.0-source/Mesh/meshGEdge.cpp	2015-03-08 14:03:14.000000000 +0100
5dbec05
+++ gmsh-2.9.0-source-new/Mesh/meshGEdge.cpp	2015-03-13 23:54:27.757151309 +0100
8e301b6
@@ -168,7 +168,7 @@ static double F_Transfinite(GEdge *ge, d
8e301b6
 
8e301b6
     case 1: // Geometric progression ar^i; Sum of n terms = length = a (r^n-1)/(r-1)
8e301b6
       {
8e301b6
-        double r = (sign(type) >= 0) ? coef : 1. / coef;
8e301b6
+        double r = (SIGN(type) >= 0) ? coef : 1. / coef;
8e301b6
         double a = length * (r - 1.) / (pow(r, nbpt - 1.) - 1.);
8e301b6
         int i = (int)(log(t * length / a * (r - 1.) + 1.) / log(r));
8e301b6
         val = d / (a * pow(r, (double)i));
5dbec05
diff -rupN gmsh-2.9.0-source/Numeric/Numeric.h gmsh-2.9.0-source-new/Numeric/Numeric.h
5dbec05
--- gmsh-2.9.0-source/Numeric/Numeric.h	2015-03-08 14:03:21.000000000 +0100
5dbec05
+++ gmsh-2.9.0-source-new/Numeric/Numeric.h	2015-03-13 23:54:27.758151330 +0100
5dbec05
@@ -14,7 +14,7 @@
26afebd
 #include "SVector3.h"
26afebd
 
26afebd
 #define myhypot(a,b) (sqrt((a)*(a)+(b)*(b)))
26afebd
-#define sign(x)      (((x)>=0)?1:-1)
26afebd
+#define SIGN(x)      (((x)>=0)?1:-1)
26afebd
 #define SQU(a)      ((a)*(a))
26afebd
 
26afebd
 struct mean_plane
5dbec05
diff -rupN gmsh-2.9.0-source/Parser/Gmsh.tab.cpp gmsh-2.9.0-source-new/Parser/Gmsh.tab.cpp
5dbec05
--- gmsh-2.9.0-source/Parser/Gmsh.tab.cpp	2015-03-12 12:14:08.000000000 +0100
5dbec05
+++ gmsh-2.9.0-source-new/Parser/Gmsh.tab.cpp	2015-03-13 23:54:27.761151394 +0100
5dbec05
@@ -8846,7 +8846,7 @@ yyreduce:
26afebd
             if(c){
26afebd
               c->Method = MESH_TRANSFINITE;
26afebd
               c->nbPointsTransfinite = ((yyvsp[(5) - (7)].d) > 2) ? (int)(yyvsp[(5) - (7)].d) : 2;
26afebd
-              c->typeTransfinite = type * sign(d);
26afebd
+              c->typeTransfinite = type * SIGN(d);
26afebd
               c->coeffTransfinite = coef;
26afebd
             }
26afebd
             else{
5dbec05
@@ -8854,7 +8854,7 @@ yyreduce:
26afebd
               if(ge){
26afebd
                 ge->meshAttributes.method = MESH_TRANSFINITE;
26afebd
                 ge->meshAttributes.nbPointsTransfinite = ((yyvsp[(5) - (7)].d) > 2) ? (int)(yyvsp[(5) - (7)].d) : 2;
26afebd
-                ge->meshAttributes.typeTransfinite = type * sign(d);
26afebd
+                ge->meshAttributes.typeTransfinite = type * SIGN(d);
26afebd
                 ge->meshAttributes.coeffTransfinite = coef;
26afebd
               }
26afebd
               else if(sign > 0)
5dbec05
diff -rupN gmsh-2.9.0-source/Parser/Gmsh.y gmsh-2.9.0-source-new/Parser/Gmsh.y
5dbec05
--- gmsh-2.9.0-source/Parser/Gmsh.y	2015-03-12 12:14:08.000000000 +0100
5dbec05
+++ gmsh-2.9.0-source-new/Parser/Gmsh.y	2015-03-13 23:54:27.762151415 +0100
5dbec05
@@ -3582,7 +3582,7 @@ Constraints :
5c732b6
             if(c){
5c732b6
               c->Method = MESH_TRANSFINITE;
5c732b6
               c->nbPointsTransfinite = ($5 > 2) ? (int)$5 : 2;
5c732b6
-              c->typeTransfinite = type * sign(d);
5c732b6
+              c->typeTransfinite = type * SIGN(d);
5c732b6
               c->coeffTransfinite = coef;
5c732b6
             }
5c732b6
             else{
5dbec05
@@ -3590,7 +3590,7 @@ Constraints :
5c732b6
               if(ge){
5c732b6
                 ge->meshAttributes.method = MESH_TRANSFINITE;
5c732b6
                 ge->meshAttributes.nbPointsTransfinite = ($5 > 2) ? (int)$5 : 2;
5c732b6
-                ge->meshAttributes.typeTransfinite = type * sign(d);
5c732b6
+                ge->meshAttributes.typeTransfinite = type * SIGN(d);
5c732b6
                 ge->meshAttributes.coeffTransfinite = coef;
5c732b6
               }
5c732b6
               else if(sign > 0)
5dbec05
diff -rupN gmsh-2.9.0-source/Plugin/FaultZone.cpp gmsh-2.9.0-source-new/Plugin/FaultZone.cpp
5dbec05
--- gmsh-2.9.0-source/Plugin/FaultZone.cpp	2015-03-08 14:03:17.000000000 +0100
5dbec05
+++ gmsh-2.9.0-source-new/Plugin/FaultZone.cpp	2015-03-13 23:54:27.763151436 +0100
26afebd
@@ -418,7 +418,7 @@ void GMSH_FaultZoneMesher::ComputeHeavis
26afebd
           lsn = dot(vectsNor[j], vectsNor[i])*heav[i];
26afebd
           assert(fabs(lsn) > tolerance || heav[i] == 0);
26afebd
         }
26afebd
-        heav[j] = sign(lsn);
26afebd
+        heav[j] = SIGN(lsn);
26afebd
       }
26afebd
 
26afebd
       if (heav[i] != 0){
26afebd
@@ -494,7 +494,7 @@ std::vector < int > GMSH_FaultZoneMesher
26afebd
       assert(dot(vectPoint, vectTan) > 0);
26afebd
       lsn = 0;
26afebd
     }
26afebd
-    heav.push_back(sign(lsn));
26afebd
+    heav.push_back(SIGN(lsn));
26afebd
   }
26afebd
   else if (_nodesByJunctionNode.find( mVert ) != _nodesByJunctionNode.end()){ // if it is a junction node
26afebd
     std::vector < GEdge* > fissures = _fissuresByJunctionNode[mVert];
26afebd
@@ -503,7 +503,7 @@ std::vector < int > GMSH_FaultZoneMesher
26afebd
       SVector3 vectNorm = _vectNormByFissure[fissures[i]];
26afebd
       double lsn = dot(vectPoint, vectNorm);
26afebd
       if (fabs(lsn) > tolerance) // tolerance seems to be ok
26afebd
-        heav.push_back(sign(lsn));
26afebd
+        heav.push_back(SIGN(lsn));
26afebd
       else
26afebd
         heav.push_back(0);
26afebd
     }