Changeset 11202 for issm/trunk-jpl/src/c/shared/TriMesh/OrderSegments.cpp

Timestamp:

01/25/12 10:52:04 (13 years ago)

Author:

Mathieu Morlighem

Message:

Fixed some g++ warnings: deprecated conversion from string constant to ‘char*’

File:

• issm/trunk-jpl/src/c/shared/TriMesh/OrderSegments.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/shared/TriMesh/OrderSegments.cpp

@@ -24 +24 @@
 
         for (i=0;i<nseg;i++){
-                A=*(segments+3*i+0);
-                B=*(segments+3*i+1);
-                el=*(segments+3*i+2)-1; //after AssociateSegmentToElement, el was a matlab index, we need the c index now.
+                A=segments[3*i+0];
+                B=segments[3*i+1];
+                el=(int)segments[3*i+2]-1; //after AssociateSegmentToElement, el was a matlab index, we need the c index now.
 
-                if (*(index+3*el+0)==A){
-                        if (*(index+3*el+2)==B){
-                                *(segments+3*i+0)=B;
-                                *(segments+3*i+1)=A;
+                if (index[3*el+0]==A){
+                        if (index[3*el+2]==B){
+                                segments[3*i+0]=B;
+                                segments[3*i+1]=A;
                         }
                 }
-                else if (*(index+3*el+1)==A){
-                        if (*(index+3*el+0)==B){
-                                *(segments+3*i+0)=B;
-                                *(segments+3*i+1)=A;
+                else if (index[3*el+1]==A){
+                        if (index[3*el+0]==B){
+                                segments[3*i+0]=B;
+                                segments[3*i+1]=A;
                         }
                 }
                 else{
-                        if (*(index+3*el+1)==B){
-                                *(segments+3*i+0)=B;
-                                *(segments+3*i+1)=A;
+                        if (index[3*el+1]==B){
+                                segments[3*i+0]=B;
+                                segments[3*i+1]=A;
                         }
                 }