Fixed to compile and install using an ANSI C++ compiler like G++ 3.3.

Some conditionals may be required to build with other compilers.

src/Prep/Terra/.cvsignore

@@ -0,0 +1,5 @@
+.deps
+Makefile
+Makefile.in
+terra
+xterra

src/Prep/Terra/GreedyInsert.cc

@@ -1,9 +1,14 @@
-#include <iostream.h>
+#include <assert.h>
+#include <iostream>
 #include "GreedyInsert.h"
 
 #include "Mask.h"
 extern ImportMask *MASK;
 
+using std::cerr;
+using std::endl;
+
+
 void TrackedTriangle::update(Subdivision& s)
 {
     GreedySubdivision& gs = (GreedySubdivision&)s;

src/Prep/Terra/Heap.cc

@@ -1,7 +1,10 @@
 #include <assert.h>
-#include <iostream.h>
+#include <iostream>
 #include "Heap.h"
 
+using std::cerr;
+using std::endl;
+
 
 void Heap::swap(int i,int j)
 {

src/Prep/Terra/Makefile.am

@@ -1,6 +1,21 @@
-EXTRA_DIST = \
+AM_CXXFLAGS = -DIOSTREAMH
+
+bin_PROGRAMS = terra xterra
+
+terra_SOURCES = \
 	Array.h Geom.h GreedyInsert.cc GreedyInsert.h Heap.cc Heap.h \
 	Makefile-gcc-2.95 Makefile.am Makefile.orig Map.cc Map.h Mask.cc \
 	Mask.h Quadedge.cc Quadedge.h Subdivision.cc Subdivision.h Vec2.h \
 	Vec3.h cmdline.cc glHacks.cc glHacks.h greedy.cc gui.cc gui.h \
-	output.cc terra.cc terra.h version.h xterra.cc
+	output.cc terra.cc terra.h version.h
+
+terra_LDADD = -lGL -lGLU -lglut
+
+xterra_SOURCES = \
+	Array.h Geom.h GreedyInsert.cc GreedyInsert.h Heap.cc Heap.h \
+	Makefile-gcc-2.95 Makefile.am Makefile.orig Map.cc Map.h Mask.cc \
+	Mask.h Quadedge.cc Quadedge.h Subdivision.cc Subdivision.h Vec2.h \
+	Vec3.h cmdline.cc glHacks.cc glHacks.h greedy.cc gui.cc gui.h \
+	output.cc terra.h version.h xterra.cc
+
+xterra_LDADD = -lGL -lGLU -lglut

src/Prep/Terra/Map.cc

@@ -3,6 +3,9 @@
 #include "Geom.h"
 #include "Map.h"
 
+using std::cerr;
+using std::endl;
+
 void Map::findLimits()
 {
     min = HUGE;

src/Prep/Terra/Map.h

@@ -2,7 +2,9 @@
 #define MAP_INCLUDED
 
 #include <stdlib.h>
-#include <iostream.h>
+#include <iostream>
+
+using std::istream;
 
 #include "Geom.h"
 

src/Prep/Terra/Mask.cc

@@ -1,10 +1,13 @@
 #include <math.h>
 #include <stdlib.h>
-#include <iostream.h>
+#include <iostream>
 
 #include "Geom.h"
 #include "Mask.h"
 
+using std::cerr;
+using std::endl;
+
 
 RealMask *readMask(istream& in)
 {

src/Prep/Terra/Mask.h

@@ -1,6 +1,10 @@
 #ifndef MASK_INCLUDED // -*- C++ -*-
 #define MASK_INCLUDED
 
+#include <istream>
+
+using std::istream;
+
 class ImportMask
 {
 

src/Prep/Terra/Quadedge.cc

@@ -1,8 +1,11 @@
 #include <stdlib.h>
-#include <iostream.h>
+#include <iostream>
 
 #include "Quadedge.h"
 
+using std::cerr;
+using std::endl;
+
 Edge::Edge(const Edge&)
 {
     cerr << "Edge: Edge assignments are forbidden." << endl;

src/Prep/Terra/Subdivision.cc

@@ -1,9 +1,12 @@
 #include <stdlib.h>
-#include <iostream.h>
+#include <iostream>
 #include <assert.h>
 
+#include "Geom.h"
 #include "Subdivision.h"
 
+using std::cerr;
+using std::endl;
 
 
 Edge *Subdivision::makeEdge(Vec2& org, Vec2& dest)

src/Prep/Terra/Vec2.h

@@ -3,6 +3,9 @@
 
 #include <iostream>
 
+using std::ostream;
+using std::istream;
+
 class Vec2 {
 protected:
     real elt[2];
@@ -165,7 +168,8 @@ inline ostream& operator<<(ostream& out, const Vec2& v)
 
 inline istream& operator>>(istream& in, Vec2& v)
 {
-    return in >> "[" >> v[0] >> v[1] >> "]";
+    char c;
+    return in >> c >> v[0] >> v[1] >> c;
 }
 #endif
 

src/Prep/Terra/Vec3.h

@@ -173,7 +173,8 @@ inline ostream& operator<<(ostream& out, const Vec3& v)
 
 inline istream& operator>>(istream& in, Vec3& v)
 {
-    return in >> "[" >> v[0] >> v[1] >> v[2] >> "]";
+    char c;
+    return in >> c >> v[0] >> v[1] >> v[2] >> c;
 }
 #endif
 

src/Prep/Terra/cmdline.cc

@@ -1,9 +1,14 @@
 #include <unistd.h>
 #include <stdlib.h>
-#include <fstream.h>
-#include <string.h>
+#include <fstream>
+#include <string>
 #include "terra.h"
 
+using std::ifstream;
+using std::cin;
+using std::cerr;
+using std::endl;
+
 GreedySubdivision *mesh;
 Map *DEM;
 

src/Prep/Terra/glHacks.h

@@ -7,6 +7,9 @@
 #include <GL/gl.h>
 #include <GL/glu.h>
 
+using std::ostream;
+using std::endl;
+
 
 /*************************************************************************
  *

src/Prep/Terra/greedy.cc

@@ -1,5 +1,8 @@
 #include "terra.h"
 
+using std::cerr;
+using std::endl;
+
 void scripted_preinsertion(istream& script)
 {
     char op[4];

src/Prep/Terra/gui.cc

@@ -1,5 +1,5 @@
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 
 #include <GL/glut.h>
 #include "glHacks.h"
@@ -7,6 +7,9 @@
 #include "terra.h"
 #include "gui.h"
 
+using std::cout;
+using std::endl;
+
 
 int mesh_view;
 int surf_view;

src/Prep/Terra/output.cc

@@ -1,5 +1,13 @@
 #include "terra.h"
-#include <fstream.h>
+#include <fstream>
+
+using std::cerr;
+using std::cout;
+using std::endl;
+using std::istream;
+using std::ostream;
+using std::ofstream;
+using std::streampos;
 
 
 void generate_output(char *filename, FileFormat format)