diff --git a/src/Prep/Terra/Geom.h b/src/Prep/Terra/Geom.h index 9387e0dc..22e217f4 100644 --- a/src/Prep/Terra/Geom.h +++ b/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 diff --git a/src/Prep/Terra/Makefile.am b/src/Prep/Terra/Makefile.am index d62c9ff5..6a988aef 100644 --- a/src/Prep/Terra/Makefile.am +++ b/src/Prep/Terra/Makefile.am @@ -1,5 +1,3 @@ -AM_CXXFLAGS = -DIOSTREAMH - bin_PROGRAMS = terra xterra terra_SOURCES = \ diff --git a/src/Prep/Terra/Quadedge.h b/src/Prep/Terra/Quadedge.h index f8303213..f3f952a2 100644 --- a/src/Prep/Terra/Quadedge.h +++ b/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 diff --git a/src/Prep/Terra/Subdivision.h b/src/Prep/Terra/Subdivision.h index dbe22587..7db71cc4 100644 --- a/src/Prep/Terra/Subdivision.h +++ b/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 diff --git a/src/Prep/Terra/Vec2.h b/src/Prep/Terra/Vec2.h index 388a0c50..c58a6c45 100644 --- a/src/Prep/Terra/Vec2.h +++ b/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 diff --git a/src/Prep/Terra/Vec3.h b/src/Prep/Terra/Vec3.h index 1e1bf253..c920261f 100644 --- a/src/Prep/Terra/Vec3.h +++ b/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 diff --git a/src/Prep/Terra/glHacks.h b/src/Prep/Terra/glHacks.h index 5af143e8..da990912 100644 --- a/src/Prep/Terra/glHacks.h +++ b/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