fly/flightgear
1
0
Fork 0
Code Activity

Portability changes for the Borland compiler.

Browse source
This commit is contained in:
curt 1998-11-02 18:29:00 +00:00
parent 2612ab0ab3
commit 2fe733e796
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Objects/fragment.hxx
View file

@ -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.
//