Portability changes for the Borland compiler.

[flightgear.git] / Objects / fragment.hxx

diff --git a/Objects/fragment.hxx b/Objects/fragment.hxx
index be8e05b05175e179e16ce6068a7444d2a5d54cf4..70f15ad8e28678cabfee164ceb183f0bc20ef1ff 100644 (file)
--- a/Objects/fragment.hxx
+++ b/Objects/fragment.hxx
@@ -41,11 +41,6 @@
 #include <GL/glut.h>
 #include <XGL/xgl.h>
 
-#if defined ( __sun__ )
-extern "C" void *memmove(void *, const void *, size_t);
-extern "C" void *memset(void *, int, size_t);
-#endif
-
 #include <vector>
 
 #include <Bucket/bucketutils.h>
@@ -54,10 +49,9 @@ extern "C" void *memset(void *, int, size_t);
 #include <Math/mat3.h>
 #include <Math/point3d.hxx>
 
-#ifdef NEEDNAMESPACESTD
-using namespace std;
-#endif
-
+#include <Include/compiler.h>
+//FG_USING_NAMESPACE(std);
+FG_USING_STD(vector);
 
 // Maximum nodes per tile
 #define MAX_NODES 2000
@@ -80,6 +74,10 @@ private:
        fgFACE( const fgFACE & image )
            : n1(image.n1), n2(image.n2), n3(image.n3) {}
 
+       fgFACE& operator= ( const fgFACE & image ) {
+           n1 = image.n1; n2 = image.n2; n3 = image.n3; return *this;
+       }
+
        ~fgFACE() {}
     };
 
@@ -114,6 +112,8 @@ public:
 
     container faces;
 
+public:
+
     // number of faces in this fragment
     int num_faces() {
        return faces.size();
@@ -153,14 +153,18 @@ public:
        faces.erase( faces.begin(), faces.end() );
     }
 
-    int deleteDisplayList() {
+    int deleteDisplayList() const {
        xglDeleteLists( display_list, 1 ); return 0;
     }
+
+    friend bool operator== ( const fgFRAGMENT::fgFACE & lhs,
+                            const fgFRAGMENT::fgFACE & rhs );
+    friend bool operator== ( const fgFRAGMENT & lhs, const fgFRAGMENT & rhs );
 };
 
 inline bool
-operator == ( const fgFRAGMENT::fgFACE& lhs,
-             const fgFRAGMENT::fgFACE& rhs )
+operator== ( const fgFRAGMENT::fgFACE& lhs,
+            const fgFRAGMENT::fgFACE& rhs )
 {
     return (lhs.n1 == rhs.n1) && (lhs.n2 == rhs.n2) && (lhs.n3 == rhs.n3);
 }
@@ -175,6 +179,9 @@ operator == ( const fgFRAGMENT & lhs, const fgFRAGMENT & rhs ) {
 
 
 // $Log$
+// Revision 1.7  1998/11/02 18:29:00  curt
+// Portability changes for the Borland compiler.
+//
 // Revision 1.6  1998/10/16 00:54:38  curt
 // Converted to Point3D class.
 //