From 4eaf56a1607421c9ac0d256025d2525c985e77bb Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 15 Oct 2003 21:11:13 +0000 Subject: [PATCH] fix minor warnings from g++ 3.2 --- src/glu/sgi/libnurbs/interface/glcurveval.h | 6 +++--- src/glu/sgi/libnurbs/interface/glsurfeval.h | 6 +++--- src/glu/sgi/libnurbs/internals/arctess.cc | 6 +++--- src/glu/sgi/libnurbs/internals/mymath.h | 6 +++--- src/glu/sgi/libnurbs/internals/mysetjmp.h | 6 +++--- src/glu/sgi/libnurbs/internals/nurbsinterfac.cc | 8 ++++---- src/glu/sgi/libnurbs/internals/nurbstess.h | 6 +++--- src/glu/sgi/libnurbs/internals/subdivider.cc | 12 ++++++------ 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/glu/sgi/libnurbs/interface/glcurveval.h b/src/glu/sgi/libnurbs/interface/glcurveval.h index 445dd368270..417691933c1 100644 --- a/src/glu/sgi/libnurbs/interface/glcurveval.h +++ b/src/glu/sgi/libnurbs/interface/glcurveval.h @@ -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 *); diff --git a/src/glu/sgi/libnurbs/interface/glsurfeval.h b/src/glu/sgi/libnurbs/interface/glsurfeval.h index 8f95e2e48ec..87ceda332af 100644 --- a/src/glu/sgi/libnurbs/interface/glsurfeval.h +++ b/src/glu/sgi/libnurbs/interface/glsurfeval.h @@ -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 ); diff --git a/src/glu/sgi/libnurbs/internals/arctess.cc b/src/glu/sgi/libnurbs/internals/arctess.cc index b3222a88d76..68783efb9f4 100644 --- a/src/glu/sgi/libnurbs/internals/arctess.cc +++ b/src/glu/sgi/libnurbs/internals/arctess.cc @@ -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) { } diff --git a/src/glu/sgi/libnurbs/internals/mymath.h b/src/glu/sgi/libnurbs/internals/mymath.h index 70138321152..ec823288430 100644 --- a/src/glu/sgi/libnurbs/internals/mymath.h +++ b/src/glu/sgi/libnurbs/internals/mymath.h @@ -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 diff --git a/src/glu/sgi/libnurbs/internals/mysetjmp.h b/src/glu/sgi/libnurbs/internals/mysetjmp.h index 16f9f74cf64..6874089205f 100644 --- a/src/glu/sgi/libnurbs/internals/mysetjmp.h +++ b/src/glu/sgi/libnurbs/internals/mysetjmp.h @@ -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 #include diff --git a/src/glu/sgi/libnurbs/internals/nurbsinterfac.cc b/src/glu/sgi/libnurbs/internals/nurbsinterfac.cc index e6b3a8a2a06..6d34951e160 100644 --- a/src/glu/sgi/libnurbs/internals/nurbsinterfac.cc +++ b/src/glu/sgi/libnurbs/internals/nurbsinterfac.cc @@ -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" ), diff --git a/src/glu/sgi/libnurbs/internals/nurbstess.h b/src/glu/sgi/libnurbs/internals/nurbstess.h index 33e60d65f97..5e41a87e0d9 100644 --- a/src/glu/sgi/libnurbs/internals/nurbstess.h +++ b/src/glu/sgi/libnurbs/internals/nurbstess.h @@ -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 * ); diff --git a/src/glu/sgi/libnurbs/internals/subdivider.cc b/src/glu/sgi/libnurbs/internals/subdivider.cc index e85acacf8b4..104a13a3f61 100644 --- a/src/glu/sgi/libnurbs/internals/subdivider.cc +++ b/src/glu/sgi/libnurbs/internals/subdivider.cc @@ -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 ) { } -- 2.30.2