GLU: fix asst warnings

This commit is contained in:
Guillaume Melquiond
2008-09-13 14:20:14 -06:00
committed by Brian Paul
parent 8db761409d
commit 6e51febc6b
9 changed files with 12 additions and 12 deletions

View File

@@ -43,7 +43,7 @@
#define __glumystdio_h_ #define __glumystdio_h_
#ifdef STANDALONE #ifdef STANDALONE
inline void _glu_dprintf( char *, ... ) { } inline void _glu_dprintf( const char *, ... ) { }
#endif #endif
#ifdef LIBRARYBUILD #ifdef LIBRARYBUILD
@@ -51,12 +51,12 @@ inline void _glu_dprintf( char *, ... ) { }
#include <stdio.h> #include <stdio.h>
#define _glu_dprintf printf #define _glu_dprintf printf
#else #else
inline void _glu_dprintf( char *, ... ) { } inline void _glu_dprintf( const char *, ... ) { }
#endif #endif
#endif #endif
#ifdef GLBUILD #ifdef GLBUILD
inline void _glu_dprintf( char *, ... ) { } inline void _glu_dprintf( const char *, ... ) { }
#endif #endif
#ifndef NULL #ifndef NULL

View File

@@ -246,7 +246,7 @@ Backend::evalVStrip(int n_left, REAL u_left, REAL* left_val,
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
void void
Backend::bgntmesh( char * ) Backend::bgntmesh( const char * )
{ {
#ifndef NOWIREFRAME #ifndef NOWIREFRAME

View File

@@ -65,7 +65,7 @@ public:
void surfbbox( long, REAL *, REAL * ); void surfbbox( long, REAL *, REAL * );
void surfgrid( REAL, REAL, long, REAL, REAL, long ); void surfgrid( REAL, REAL, long, REAL, REAL, long );
void surfmesh( long, long, long, long ); void surfmesh( long, long, long, long );
void bgntmesh( char * ); void bgntmesh( const char * );
void endtmesh( void ); void endtmesh( void );
void swaptmesh( void ); void swaptmesh( void );
void tmeshvert( GridTrimVertex * ); void tmeshvert( GridTrimVertex * );

View File

@@ -48,7 +48,7 @@
* Pool - allocate a new pool of buffers * Pool - allocate a new pool of buffers
*----------------------------------------------------------------------------- *-----------------------------------------------------------------------------
*/ */
Pool::Pool( int _buffersize, int initpoolsize, char *n ) Pool::Pool( int _buffersize, int initpoolsize, const char *n )
{ {
if((unsigned)_buffersize < sizeof(Buffer)) if((unsigned)_buffersize < sizeof(Buffer))
buffersize = sizeof(Buffer); buffersize = sizeof(Buffer);

View File

@@ -55,7 +55,7 @@ class Buffer {
class Pool { class Pool {
public: public:
Pool( int, int, char * ); Pool( int, int, const char * );
~Pool( void ); ~Pool( void );
inline void* new_buffer( void ); inline void* new_buffer( void );
inline void free_buffer( void * ); inline void free_buffer( void * );
@@ -74,7 +74,7 @@ protected:
int nextfree; /* byte offset past next free buffer */ int nextfree; /* byte offset past next free buffer */
int initsize; int initsize;
enum Magic { is_allocated = 0xf3a1, is_free = 0xf1a2 }; enum Magic { is_allocated = 0xf3a1, is_free = 0xf1a2 };
char *name; /* name of the pool */ const char *name; /* name of the pool */
Magic magic; /* marker for valid pool */ Magic magic; /* marker for valid pool */
}; };

View File

@@ -126,7 +126,7 @@ int Knotvector::validate( void )
return 0; return 0;
} }
void Knotvector::show( char *msg ) void Knotvector::show( const char *msg )
{ {
#ifndef NDEBUG #ifndef NDEBUG
_glu_dprintf( "%s\n", msg ); _glu_dprintf( "%s\n", msg );

View File

@@ -49,7 +49,7 @@ struct Knotvector { /* a knot vector */
~Knotvector( void ); ~Knotvector( void );
void init( long, long, long, INREAL * ); void init( long, long, long, INREAL * );
int validate( void ); int validate( void );
void show( char * ); void show( const char * );
long order; /* order of spline */ long order; /* order of spline */
long knotcount; /* number of knots */ long knotcount; /* number of knots */

View File

@@ -677,7 +677,7 @@ NurbsTessellator::do_nurbserror( int msg )
} }
int int
NurbsTessellator::do_check_knots( Knotvector *knots, char *msg ) NurbsTessellator::do_check_knots( Knotvector *knots, const char *msg )
{ {
int status = knots->validate(); int status = knots->validate();
if( status ) { if( status ) {

View File

@@ -112,7 +112,7 @@ protected:
private: private:
void resetObjects( void ); void resetObjects( void );
int do_check_knots( Knotvector *, char * ); int do_check_knots( Knotvector *, const char * );
void do_nurbserror( int ); void do_nurbserror( int );
void do_bgncurve( O_curve * ); void do_bgncurve( O_curve * );
void do_endcurve( void ); void do_endcurve( void );