Changeset 12551

Timestamp:

06/26/12 09:24:49 (13 years ago)

Author:

utke

Message:

another reCast and need to wrap case branch in {} to avoid compiler error about jumping across the variable initializarion on line 1613

File:

• issm/trunk-jpl/src/c/objects/Elements/Tria.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/objects/Elements/Tria.cpp

@@ -1390 +1390 @@
         /*Recover vertices ids needed to initialize inputs*/
         for(i=0;i<3;i++){ 
-                tria_vertex_ids[i]=(int)iomodel->Data(MeshElementsEnum)[3*index+i]; //ids for vertices are in the elements array from Matlab
+                tria_vertex_ids[i]=reCast<int>(iomodel->Data(MeshElementsEnum)[3*index+i]); //ids for vertices are in the elements array from Matlab
         }
 
@@ -1608 +1608 @@
         switch(type){
 
-                case VertexEnum:
+                case VertexEnum: {
 
                         /*New TriaP1Input*/
@@ -1626 +1626 @@
                         }
                         return;
-
+                }
                 default:
                         _error2_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");