mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-05 05:18:08 +02:00
fix minor warnings from g++ 3.2
This commit is contained in:
Brian Paul
parent
16927d02bc
commit
4eaf56a160
8 changed files with 28 additions and 28 deletions
|
|
@ -35,8 +35,8 @@
|
|||
/*
|
||||
* glcurveval.h
|
||||
*
|
||||
* $Date: 2003/04/30 15:20:37 $ $Revision: 1.5 $
|
||||
* $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glcurveval.h,v 1.5 2003/04/30 15:20:37 brianp Exp $
|
||||
* $Date: 2003/10/15 21:11:13 $ $Revision: 1.6 $
|
||||
* $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glcurveval.h,v 1.6 2003/10/15 21:11:13 brianp Exp $
|
||||
*/
|
||||
|
||||
#ifndef __gluglcurveval_h_
|
||||
|
|
@ -72,7 +72,7 @@ typedef struct curveEvalMachine{
|
|||
class OpenGLCurveEvaluator : public BasicCurveEvaluator {
|
||||
public:
|
||||
OpenGLCurveEvaluator(void);
|
||||
~OpenGLCurveEvaluator(void);
|
||||
virtual ~OpenGLCurveEvaluator(void);
|
||||
void range1f(long, REAL *, REAL *);
|
||||
void domain1f(REAL, REAL);
|
||||
void addMap(CurveMap *);
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@
|
|||
/*
|
||||
* glsurfeval.h
|
||||
*
|
||||
* $Date: 2001/08/07 17:34:11 $ $Revision: 1.4 $
|
||||
* $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glsurfeval.h,v 1.4 2001/08/07 17:34:11 brianp Exp $
|
||||
* $Date: 2003/10/15 21:11:13 $ $Revision: 1.5 $
|
||||
* $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glsurfeval.h,v 1.5 2003/10/15 21:11:13 brianp Exp $
|
||||
*/
|
||||
|
||||
#ifndef __gluglsurfeval_h_
|
||||
|
|
@ -106,7 +106,7 @@ private:
|
|||
class OpenGLSurfaceEvaluator : public BasicSurfaceEvaluator {
|
||||
public:
|
||||
OpenGLSurfaceEvaluator();
|
||||
~OpenGLSurfaceEvaluator( void );
|
||||
virtual ~OpenGLSurfaceEvaluator( void );
|
||||
void polymode( long style );
|
||||
void range2f( long, REAL *, REAL * );
|
||||
void domain2f( REAL, REAL, REAL, REAL );
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@
|
|||
/*
|
||||
* arctessellator.c++
|
||||
*
|
||||
* $Date: 2002/11/01 23:35:07 $ $Revision: 1.2 $
|
||||
* $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/arctess.cc,v 1.2 2002/11/01 23:35:07 brianp Exp $
|
||||
* $Date: 2003/10/15 21:11:13 $ $Revision: 1.3 $
|
||||
* $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/arctess.cc,v 1.3 2003/10/15 21:11:13 brianp Exp $
|
||||
*/
|
||||
|
||||
#include "glimports.h"
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
*/
|
||||
|
||||
ArcTessellator::ArcTessellator( TrimVertexPool& t, Pool& p )
|
||||
: trimvertexpool(t), pwlarcpool(p)
|
||||
: pwlarcpool(p), trimvertexpool(t)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@
|
|||
/*
|
||||
* mymath.h
|
||||
*
|
||||
* $Date: 2001/08/13 16:52:18 $ $Revision: 1.2 $
|
||||
* $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/mymath.h,v 1.2 2001/08/13 16:52:18 brianp Exp $
|
||||
* $Date: 2003/10/15 21:11:13 $ $Revision: 1.3 $
|
||||
* $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/mymath.h,v 1.3 2003/10/15 21:11:13 brianp Exp $
|
||||
*/
|
||||
|
||||
#ifndef __glumymath_h_
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
#define sqrtf gl_fsqrt
|
||||
#endif
|
||||
|
||||
#if GLBUILD | STANDALONE
|
||||
#if defined(GLBUILD) || defined(STANDALONE)
|
||||
#define M_SQRT2 1.41421356237309504880
|
||||
#define ceilf myceilf
|
||||
#define floorf myfloorf
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@
|
|||
/*
|
||||
* mysetjmp.h
|
||||
*
|
||||
* $Date: 2001/03/22 11:38:36 $ $Revision: 1.2 $
|
||||
* $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/mysetjmp.h,v 1.2 2001/03/22 11:38:36 joukj Exp $
|
||||
* $Date: 2003/10/15 21:11:13 $ $Revision: 1.3 $
|
||||
* $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/mysetjmp.h,v 1.3 2003/10/15 21:11:13 brianp Exp $
|
||||
*/
|
||||
|
||||
#ifndef __glumysetjmp_h_
|
||||
|
|
@ -55,7 +55,7 @@ extern "C" int mysetjmp( JumpBuffer * );
|
|||
#define longjmp gl_longjmp
|
||||
#endif
|
||||
|
||||
#if LIBRARYBUILD | GLBUILD
|
||||
#if defined(LIBRARYBUILD) || defined(GLBUILD)
|
||||
#include <setjmp.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@
|
|||
/*
|
||||
* nurbsinterfac.c++
|
||||
*
|
||||
* $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $
|
||||
* $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/nurbsinterfac.cc,v 1.1 2001/03/17 00:25:41 brianp Exp $
|
||||
* $Date: 2003/10/15 21:11:13 $ $Revision: 1.2 $
|
||||
* $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/nurbsinterfac.cc,v 1.2 2003/10/15 21:11:13 brianp Exp $
|
||||
*/
|
||||
|
||||
#include "glimports.h"
|
||||
|
|
@ -66,9 +66,9 @@
|
|||
}
|
||||
|
||||
NurbsTessellator::NurbsTessellator( BasicCurveEvaluator &c, BasicSurfaceEvaluator& e)
|
||||
: subdivider( renderhints, backend ),
|
||||
: maplist( backend ),
|
||||
backend( c, e ),
|
||||
maplist( backend ),
|
||||
subdivider( renderhints, backend ),
|
||||
o_pwlcurvePool( sizeof( O_pwlcurve ), 32, "o_pwlcurvePool" ),
|
||||
o_nurbscurvePool( sizeof( O_nurbscurve ), 32, "o_nurbscurvePool"),
|
||||
o_curvePool( sizeof( O_curve ), 32, "o_curvePool" ),
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@
|
|||
/*
|
||||
* nurbstess.h
|
||||
*
|
||||
* $Date: 2001/08/07 17:34:11 $ $Revision: 1.2 $
|
||||
* $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/nurbstess.h,v 1.2 2001/08/07 17:34:11 brianp Exp $
|
||||
* $Date: 2003/10/15 21:11:13 $ $Revision: 1.3 $
|
||||
* $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/nurbstess.h,v 1.3 2003/10/15 21:11:13 brianp Exp $
|
||||
*/
|
||||
|
||||
#ifndef __glunurbstess_h_
|
||||
|
|
@ -60,7 +60,7 @@ class NurbsTessellator {
|
|||
public:
|
||||
NurbsTessellator( BasicCurveEvaluator &c,
|
||||
BasicSurfaceEvaluator &e );
|
||||
~NurbsTessellator( void );
|
||||
virtual ~NurbsTessellator( void );
|
||||
|
||||
void getnurbsproperty( long, INREAL * );
|
||||
void getnurbsproperty( long, long, INREAL * );
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@
|
|||
/*
|
||||
* subdivider.cxx
|
||||
*
|
||||
* $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $
|
||||
* $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/subdivider.cc,v 1.1 2001/03/17 00:25:41 brianp Exp $
|
||||
* $Date: 2003/10/15 21:11:13 $ $Revision: 1.2 $
|
||||
* $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/subdivider.cc,v 1.2 2003/10/15 21:11:13 brianp Exp $
|
||||
*/
|
||||
|
||||
#include "glimports.h"
|
||||
|
|
@ -112,13 +112,13 @@ Subdivider::makePatchBoundary( const REAL *from, const REAL *to )
|
|||
*/
|
||||
|
||||
Subdivider::Subdivider( Renderhints& r, Backend& b )
|
||||
: arcpool( sizeof( Arc), 1, "arcpool" ),
|
||||
: slicer( b ),
|
||||
arctessellator( trimvertexpool, pwlarcpool ),
|
||||
arcpool( sizeof( Arc), 1, "arcpool" ),
|
||||
bezierarcpool( sizeof( BezierArc ), 1, "Bezarcpool" ),
|
||||
pwlarcpool( sizeof( PwlArc ), 1, "Pwlarcpool" ),
|
||||
renderhints( r ),
|
||||
arctessellator( trimvertexpool, pwlarcpool ),
|
||||
backend( b ),
|
||||
slicer( b )
|
||||
backend( b )
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue