Changeset 17507

Timestamp:

03/20/14 16:34:36 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removed all register commands to get rid of (warning: 'register' storage class specifier is deprecated)

Location:

issm/trunk-jpl/src/c/bamg

Files:

• BamgQuadtree.cpp (modified) (4 diffs)
• BamgVertex.cpp (modified) (1 diff)
• Geometry.cpp (modified) (2 diffs)
• ListofIntersectionTriangles.cpp (modified) (4 diffs)
• Mesh.cpp (modified) (6 diffs)
• Triangle.cpp (modified) (8 diffs)

issm/trunk-jpl/src/c/bamg/BamgQuadtree.cpp

@@ -150 +150 @@
 
                 /*Get integer coodinate of current point w*/
-                register long i=w.i.x, j=w.i.y;
+                long i=w.i.x, j=w.i.y;
 
                 /*Initialize level*/
-                register long level=MaxISize;
+                long level=MaxISize;
 
                 /*Get inital box (the largest)*/
@@ -426 +426 @@
                 int  pi[ MaxDepth  ];
                 Icoor1 ii[  MaxDepth ], jj [ MaxDepth];
-                register int l=0; // level
-                register BamgQuadtreeBox * b;
+                int l=0; // level
+                BamgQuadtreeBox * b;
                 Icoor1 hb =  MaxISize;
                 Icoor1 i0=0,j0=0;
@@ -444 +444 @@
                         b= pb[l];
                         while (pi[l]--){              
-                                register int k = pi[l];
+                                int k = pi[l];
 
                                 if (b->nbitems>0){ // BamgVertex BamgQuadtreeBox none empty
@@ -457 +457 @@
                                 }
                                 else{ // Pointer BamgQuadtreeBox 
-                                        register BamgQuadtreeBox *b0=b;
+                                        BamgQuadtreeBox *b0=b;
                                         if ((b=b->b[k])){
                                                 hb >>=1 ; // div by 2
-                                                register long iii = ii[l]+I_IJ(k,hb);
-                                                register long jjj = jj[l]+J_IJ(k,hb);
+                                                long iii = ii[l]+I_IJ(k,hb);
+                                                long jjj = jj[l]+J_IJ(k,hb);
 
                                                 if  (INTER_SEG(iii,iii+hb,i-hx,i+hx) && INTER_SEG(jjj,jjj+hb,j-hy,j+hy)){

issm/trunk-jpl/src/c/bamg/BamgVertex.cpp

@@ -125 +125 @@
                 /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/Smoothing)*/
 
-                register BamgVertex* s=this;
+                BamgVertex* s=this;
                 BamgVertex &vP = *s,vPsave=vP;
 
-                register Triangle* tbegin= t , *tria = t , *ttc;
-
-                register int k=0,kk=0,j = EdgesVertexTriangle[IndexInTriangle][0],jc;
+                Triangle* tbegin= t , *tria = t , *ttc;
+
+                int k=0,kk=0,j = EdgesVertexTriangle[IndexInTriangle][0],jc;
                 R2 P(s->r),PNew(0,0);
                 do {

issm/trunk-jpl/src/c/bamg/Geometry.cpp

@@ -598 +598 @@
                                 long *po=p;                     
                                 long  n=*p;                     
-                                register float angleold=-1000 ; // angle = - infinity
+                                float angleold=-1000 ; // angle = - infinity
                                 ord=0; exch=0;
 
@@ -878 +878 @@
                 double sg;
                 if (eg0 == eg1) { 
-                        register double s0=vg0,s1=vg1;
+                        double s0=vg0,s1=vg1;
                         sg =  s0*(1.0-s) +  s*s1;
                         on=eg0;

issm/trunk-jpl/src/c/bamg/ListofIntersectionTriangles.cpp

@@ -83 +83 @@
                 /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/NewItem)*/
 
-                register int n;
+                int n;
                 R2 x(0,0);
                 if ( d0) x =      (*tt)[0].r * d0;
@@ -97 +97 @@
                         lIntTria[Size].x = x;
                         Metric m0,m1,m2;
-                        register BamgVertex * v;
+                        BamgVertex * v;
                         if ((v=(*tt)(0))) m0    = v->m;
                         if ((v=(*tt)(1))) m1    = v->m;
@@ -111 +111 @@
                 /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/NewItem)*/
 
-                register int n;
+                int n;
                 if(!Size ||  Norme2_2(lIntTria[Size-1].x-A)) {
                         if (Size==MaxSize) ReShape();
@@ -183 +183 @@
         void ListofIntersectionTriangles::ReShape(){ 
 
-                register int newsize = MaxSize*2;
+                int newsize = MaxSize*2;
                 IntersectionTriangles* nw = new IntersectionTriangles[newsize];
                 _assert_(nw);

issm/trunk-jpl/src/c/bamg/Mesh.cpp

@@ -2933 +2933 @@
                 //loop over the new points
                 for (int is3=0; is3<nbvnew; is3++){
-                        register long j=nbvold +(k3 = (k3+PrimeNumber)%nbvnew);
-                        register long i=nbvold+is3; 
+                        long j=nbvold +(k3 = (k3+PrimeNumber)%nbvnew);
+                        long i=nbvold+is3; 
                         orderedvertices[i]= vertices + j;
                         orderedvertices[i]->ReferenceNumber=i;
@@ -3722 +3722 @@
 
                 long *renu= new long[nbt];
-                register Triangle *t0,*t,*te=triangles+nbt;
-                register long k=0,it,i,j;
+                Triangle *t0,*t,*te=triangles+nbt;
+                long k=0,it,i,j;
 
                 for ( it=0;it<nbt;it++) 
@@ -3914 +3914 @@
                 for(i=Head0;i>=0;i=first_np_or_next_t0[ip=i],first_np_or_next_t0[ip]=-1) {
                         //  pour tous les triangles autour du sommet s
-                        register Triangle* t= vertices[i].t;
+                        Triangle* t= vertices[i].t;
                         if (!t){
                                 _error_("!t");
@@ -4154 +4154 @@
         /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/ConsRefTriangle)*/
 
-        register Triangle *t0,*t;
-        register long k=0, num;   
+        Triangle *t0,*t;
+        long k=0, num;   
 
         //initialize all triangles as -1 (outside)
@@ -4707 +4707 @@
                                         L=0;// length of the curve
                                         long i=0;// index of new points on the curve
-                                        register GeomVertex * GA0 = *(*peequi)[k0equi].GeomEdgeHook;
+                                        GeomVertex * GA0 = *(*peequi)[k0equi].GeomEdgeHook;
                                         BamgVertex *A0;
                                         A0 = GA0->MeshVertexHook;  // the vertex in new mesh
@@ -4781 +4781 @@
                                                         if (ee[k1].GeomEdgeHook->IsRequiredVertex()) {
                                                                 _assert_(eeequi[k1equi].GeomEdgeHook->IsRequiredVertex());
-                                                                register GeomVertex * GA1 = *eeequi[k1equi].GeomEdgeHook;
+                                                                GeomVertex * GA1 = *eeequi[k1equi].GeomEdgeHook;
                                                                 A1=GA1->MeshVertexHook;// the vertex in new mesh
                                                                 _assert_(A1-vertices>=0 && A1-vertices<nbv);

issm/trunk-jpl/src/c/bamg/Triangle.cpp

@@ -231 +231 @@
                 // Copy all the mark 
                 a &= 3;
-                register Triangle *tt=adj[a];
+                Triangle *tt=adj[a];
                 AdjEdgeIndex [a] &= 55; // remove MarkUnSwap
-                register short aatt = AdjEdgeIndex[a] & 3;
+                short aatt = AdjEdgeIndex[a] & 3;
                 if(tt){ 
                         tt->adj[aatt]=this;
@@ -255 +255 @@
         void Triangle::SetHidden(int a){
                 //Get Adjacent Triangle number a
-                register Triangle* t = adj[a];
+                Triangle* t = adj[a];
                 //if it exist
                 //C|=D -> C=(C|D) bitwise inclusive OR
@@ -264 +264 @@
         void Triangle::SetLocked(int a){
                 //mark the edge as on Boundary
-                register Triangle * t = adj[a];
+                Triangle * t = adj[a];
                 t->AdjEdgeIndex[AdjEdgeIndex[a] & 3] |=4;
                 AdjEdgeIndex[a] |= 4;
@@ -270 +270 @@
         /*FUNCTION Triangle::SetMarkUnSwap{{{*/
         void Triangle::SetMarkUnSwap(int a){
-                register Triangle * t = adj[a];
+                Triangle * t = adj[a];
                 t->AdjEdgeIndex[AdjEdgeIndex[a] & 3] |=8;
                 AdjEdgeIndex[a] |=8 ;
@@ -282 +282 @@
         /*FUNCTION Triangle::SetUnMarkUnSwap{{{*/
         void Triangle::SetUnMarkUnSwap(int a){ 
-                register Triangle * t = adj[a];
+                Triangle * t = adj[a];
                 t->AdjEdgeIndex[AdjEdgeIndex[a] & 3] &=55; // 23 + 32 
                 AdjEdgeIndex[a] &=55 ;
@@ -292 +292 @@
                 if(a/4 !=0) return 0;// arete lock or MarkUnSwap
 
-                register Triangle *t1=this,*t2=adj[a];// les 2 triangles adjacent
-                register short a1=a,a2=AdjEdgeIndex[a];// les 2 numero de l arete dans les 2 triangles
+                Triangle *t1=this,*t2=adj[a];// les 2 triangles adjacent
+                short a1=a,a2=AdjEdgeIndex[a];// les 2 numero de l arete dans les 2 triangles
                 if(a2/4 !=0) return 0; // arete lock or MarkUnSwap
 
-                register BamgVertex  *sa=t1->vertices[VerticesOfTriangularEdge[a1][0]];
-                register BamgVertex  *sb=t1->vertices[VerticesOfTriangularEdge[a1][1]];
-                register BamgVertex  *s1=t1->vertices[OppositeVertex[a1]];
-                register BamgVertex  *s2=t2->vertices[OppositeVertex[a2]];
+                BamgVertex  *sa=t1->vertices[VerticesOfTriangularEdge[a1][0]];
+                BamgVertex  *sb=t1->vertices[VerticesOfTriangularEdge[a1][1]];
+                BamgVertex  *s1=t1->vertices[OppositeVertex[a1]];
+                BamgVertex  *s2=t2->vertices[OppositeVertex[a2]];
 
                 Icoor2 det1=t1->det , det2=t2->det ;
@@ -328 +328 @@
                                          if(kopt) {
                                                  // critere de Delaunay pure isotrope
-                                                 register Icoor2 xb1 = sb->i.x - s1->i.x,
+                                                 Icoor2 xb1 = sb->i.x - s1->i.x,
                                                                          x21 = s2->i.x - s1->i.x,
                                                                          yb1 = sb->i.y - s1->i.y,
@@ -336 +336 @@
                                                                          yba = sb->i.y - sa->i.y,
                                                                          y2a = s2->i.y - sa->i.y;
-                                                 register double
+                                                 double
                                                         cosb12 =  double(xb1*x21 + yb1*y21),
                                                                          cosba2 =  double(xba*x2a + yba*y2a) ,