Remove IOSTREAMH macro -- it turned out to be something specific to

SGI headers, rather than a program-specific compilation macro.  Always
assume that the iostream library is present.

src/Prep/Terra/Geom.h

@@ -166,17 +166,13 @@ public:
 	p[Y] = (c*l.a - a*l.c)/den;
     }
 
-#ifdef IOSTREAMH
     friend ostream& operator<<(ostream&, const Line&);
-#endif
 };
 
-#ifdef IOSTREAMH
 inline ostream& operator<<(ostream &out, const Line& l)
 {
     return out << "Line(a=" << l.a << " b=" << l.b << " c=" << l.c << ")";
 }
-#endif
 
 
 #endif

src/Prep/Terra/Makefile.am

@@ -1,5 +1,3 @@
-AM_CXXFLAGS = -DIOSTREAMH
-
 bin_PROGRAMS = terra xterra
 
 terra_SOURCES = \

src/Prep/Terra/Quadedge.h

@@ -72,11 +72,9 @@ inline boolean leftOf(const Vec2& x, const Edge *e)
 }
 
 
-#ifdef IOSTREAMH
 inline ostream& operator<<(ostream& out, const Edge *e)
 {
     return out << "{ " << e->Org() << " ---> " << e->Dest() << " }";
 }
-#endif
 
 #endif

src/Prep/Terra/Subdivision.h

@@ -83,13 +83,11 @@ public:
 };
 
 
-#ifdef IOSTREAMH
 inline ostream& operator<<(ostream& out, Triangle& t)
 {
     return out << "Triangle("<< t.point1() << " " << t.point2() << " "
 	       << t.point3() << ")";
 }
-#endif
 
 
 #endif

src/Prep/Terra/Vec2.h

@@ -41,11 +41,9 @@ public:
     inline Vec2 operator/(real s) const;
     inline real operator*(const Vec2& v) const;
 
-#ifdef IOSTREAMH
     // Input/Output methods
     friend ostream& operator<<(ostream&, const Vec2&);
     friend istream& operator>>(istream&, Vec2&);
-#endif
 
     // Additional vector methods
     inline real length();
@@ -160,7 +158,6 @@ inline real Vec2::unitize()
     return l;
 }
 
-#ifdef IOSTREAMH
 inline ostream& operator<<(ostream& out, const Vec2& v)
 {
     return out << "[" << v[0] << " " << v[1] << "]";
@@ -171,7 +168,6 @@ inline istream& operator>>(istream& in, Vec2& v)
     char c;
     return in >> c >> v[0] >> v[1] >> c;
 }
-#endif
 
 
 #endif

src/Prep/Terra/Vec3.h

@@ -38,11 +38,9 @@ public:
     inline Vec3 operator^(const Vec3& v) const;
 
 
-#ifdef IOSTREAMH
     // Input/Output methods
     friend ostream& operator<<(ostream&, const Vec3&);
     friend istream& operator>>(istream&, Vec3&);
-#endif
 
     // Additional vector methods
     inline real length();
@@ -165,7 +163,6 @@ inline real Vec3::unitize()
     return l;
 }
 
-#ifdef IOSTREAMH
 inline ostream& operator<<(ostream& out, const Vec3& v)
 {
     return out << "[" << v[0] << " " << v[1] << " " << v[2] << "]";
@@ -176,7 +173,6 @@ inline istream& operator>>(istream& in, Vec3& v)
     char c;
     return in >> c >> v[0] >> v[1] >> v[2] >> c;
 }
-#endif
 
 
 #endif

src/Prep/Terra/glHacks.h

@@ -164,7 +164,6 @@ inline void glToPPM(FILE *out)
 }
 #endif
 
-#ifdef IOSTREAMH
 inline ostream& operator<<(ostream& out,const gfxPixel& p)
 {
     return out << p.channel.r << p.channel.g << p.channel.b;
@@ -188,7 +187,6 @@ inline void glToPPM(ostream& out)
 
     delete[] data;
 }
-#endif
 
 
 #endif