Index: ../trunk-jpl/src/c/modules/Trianglex/Trianglex.cpp
===================================================================
--- ../trunk-jpl/src/c/modules/Trianglex/Trianglex.cpp	(revision 25558)
+++ ../trunk-jpl/src/c/modules/Trianglex/Trianglex.cpp	(revision 25559)
@@ -41,12 +41,12 @@
 
 	/*Create initial triangulation to call triangulate(). First number of points:*/
 	in.numberofpoints=0;
-	for (Object* & object : domain->objects){
-		contour=(Contour<IssmPDouble>*)object;
+	for (i=0;i<domain->Size();i++){
+		contour=(Contour<IssmPDouble>*)domain->GetObjectByOffset(i);
 		in.numberofpoints+=contour->nods-1;
 	}
-	for (Object* & object : rifts->objects){
-		contour=(Contour<IssmPDouble>*)object;
+	for (i=0;i<rifts->Size();i++){
+		contour=(Contour<IssmPDouble>*)rifts->GetObjectByOffset(i);
 		in.numberofpoints+=contour->nods;
 	}
 
@@ -57,8 +57,8 @@
 	in.pointlist = xNew<REAL>(in.numberofpoints*2);
 
 	counter=0;
-	for (Object* & object : domain->objects){
-		contour=(Contour<IssmPDouble>*)object;
+	for (i=0;i<domain->Size();i++){
+		contour=(Contour<IssmPDouble>*)domain->GetObjectByOffset(i);
 		for (j=0;j<contour->nods-1;j++){
 			in.pointlist[2*counter+0]=contour->x[j];
 			in.pointlist[2*counter+1]=contour->y[j];
@@ -65,8 +65,8 @@
 			counter++;
 		}
 	}
-	for (Object* & object : rifts->objects){
-		contour=(Contour<IssmPDouble>*)object;
+	for (i=0;i<rifts->Size();i++){
+		contour=(Contour<IssmPDouble>*)rifts->GetObjectByOffset(i);
 		for (j=0;j<contour->nods;j++){
 			in.pointlist[2*counter+0]=contour->x[j];
 			in.pointlist[2*counter+1]=contour->y[j];
@@ -84,12 +84,12 @@
 
 	/*Build segments. First figure out number of segments: holes and closed outlines have as many segments as vertices: */
 	in.numberofsegments=0;
-	for (Object* & object : domain->objects){
-		contour=(Contour<IssmPDouble>*)object;
+	for (i=0;i<domain->Size();i++){
+		contour=(Contour<IssmPDouble>*)domain->GetObjectByOffset(i);
 		in.numberofsegments+=contour->nods-1;
 	}
-	for (Object* & object : rifts->objects){
-		contour=(Contour<IssmPDouble>*)object;
+	for(i=0;i<rifts->Size();i++){
+		contour=(Contour<IssmPDouble>*)rifts->GetObjectByOffset(i);
 		/*for rifts, we have one less segment as we have vertices*/
 		in.numberofsegments+=contour->nods-1;
 	}
@@ -98,8 +98,8 @@
 	in.segmentmarkerlist = xNewZeroInit<int>(in.numberofsegments);
 	counter=0;
 	backcounter=0;
-	for (Object* & object : domain->objects){
-		contour=(Contour<IssmPDouble>*)object;
+	for (i=0;i<domain->Size();i++){
+		contour=(Contour<IssmPDouble>*)domain->GetObjectByOffset(i);
 		for (j=0;j<contour->nods-2;j++){
 			in.segmentlist[2*counter+0]=counter;
 			in.segmentlist[2*counter+1]=counter+1;
@@ -114,8 +114,8 @@
 		 backcounter=counter;
 	}
 	counter2=counter;
-	for (Object* & object : rifts->objects){
-		contour=(Contour<IssmPDouble>*)object;
+	for (i=0;i<rifts->Size();i++){
+		contour=(Contour<IssmPDouble>*)rifts->GetObjectByOffset(i);
 		for (j=0;j<(contour->nods-1);j++){
 			in.segmentlist[2*counter2+0]=counter;
 			in.segmentlist[2*counter2+1]=counter+1;