Module Name: xsrc
Committed By: christos
Date: Thu Jan 23 04:05:15 UTC 2014
Modified Files:
xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals:
bufpool.cc bufpool.h knotvector.cc knotvector.h nurbstess.cc
nurbstess.h
Log Message:
more const for gcc-4.8
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.cc \
xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.h \
xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.cc
\
xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.h
\
xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.cc
\
xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.cc
diff -u xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.cc:1.1.1.1 xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.cc:1.2
--- xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.cc:1.1.1.1 Sat Jun 9 11:20:50 2001
+++ xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.cc Wed Jan 22 23:05:15 2014
@@ -35,8 +35,8 @@
/*
* bufpool.c++
*
- * $Date: 2001/06/09 15:20:50 $ $Revision: 1.1.1.1 $
- * $Header: /cvsroot/xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.cc,v 1.1.1.1 2001/06/09 15:20:50 tron Exp $
+ * $Date: 2014/01/23 04:05:15 $ $Revision: 1.2 $
+ * $Header: /cvsroot/xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.cc,v 1.2 2014/01/23 04:05:15 christos Exp $
*/
#include "glimports.h"
@@ -48,7 +48,7 @@
* Pool - allocate a new pool of buffers
*-----------------------------------------------------------------------------
*/
-Pool::Pool( int _buffersize, int initpoolsize, char *n )
+Pool::Pool( int _buffersize, int initpoolsize, const char *n )
{
buffersize= (_buffersize < sizeof(Buffer)) ? sizeof(Buffer) : _buffersize;
initsize = initpoolsize * buffersize;
Index: xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.h
diff -u xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.h:1.1.1.1 xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.h:1.2
--- xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.h:1.1.1.1 Sat Jun 9 11:20:50 2001
+++ xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.h Wed Jan 22 23:05:15 2014
@@ -35,8 +35,8 @@
/*
* bufpool.h
*
- * $Date: 2001/06/09 15:20:50 $ $Revision: 1.1.1.1 $
- * $Header: /cvsroot/xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.h,v 1.1.1.1 2001/06/09 15:20:50 tron Exp $
+ * $Date: 2014/01/23 04:05:15 $ $Revision: 1.2 $
+ * $Header: /cvsroot/xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.h,v 1.2 2014/01/23 04:05:15 christos Exp $
*/
#ifndef __glubufpool_h_
@@ -54,7 +54,7 @@ class Buffer {
class Pool {
public:
- Pool( int, int, char * );
+ Pool( int, int, const char * );
~Pool( void );
inline void* new_buffer( void );
inline void free_buffer( void * );
@@ -73,7 +73,7 @@ protected:
int nextfree; /* byte offset past next free buffer */
int initsize;
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 */
};
Index: xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.cc
diff -u xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.cc:1.1.1.1 xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.cc:1.2
--- xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.cc:1.1.1.1 Sat Jun 9 11:20:51 2001
+++ xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.cc Wed Jan 22 23:05:15 2014
@@ -35,8 +35,8 @@
/*
* knotvector.c++
*
- * $Date: 2001/06/09 15:20:51 $ $Revision: 1.1.1.1 $
- * $Header: /cvsroot/xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.cc,v 1.1.1.1 2001/06/09 15:20:51 tron Exp $
+ * $Date: 2014/01/23 04:05:15 $ $Revision: 1.2 $
+ * $Header: /cvsroot/xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.cc,v 1.2 2014/01/23 04:05:15 christos Exp $
*/
#include "glimports.h"
@@ -125,7 +125,7 @@ int Knotvector::validate( void )
return 0;
}
-void Knotvector::show( char *msg )
+void Knotvector::show( const char *msg )
{
#ifndef NDEBUG
dprintf( "%s\n", msg );
Index: xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.h
diff -u xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.h:1.1.1.1 xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.h:1.2
--- xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.h:1.1.1.1 Sat Jun 9 11:20:51 2001
+++ xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.h Wed Jan 22 23:05:15 2014
@@ -35,8 +35,8 @@
/*
* knotvector.h
*
- * $Date: 2001/06/09 15:20:51 $ $Revision: 1.1.1.1 $
- * $Header: /cvsroot/xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.h,v 1.1.1.1 2001/06/09 15:20:51 tron Exp $
+ * $Date: 2014/01/23 04:05:15 $ $Revision: 1.2 $
+ * $Header: /cvsroot/xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.h,v 1.2 2014/01/23 04:05:15 christos Exp $
*/
#ifndef __gluknotvector_h_
@@ -49,7 +49,7 @@ struct Knotvector { /* a knot vector */
~Knotvector( void );
void init( long, long, long, INREAL * );
int validate( void );
- void show( char * );
+ void show( const char * );
long order; /* order of spline */
long knotcount; /* number of knots */
Index: xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.cc
diff -u xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.cc:1.1.1.1 xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.cc:1.2
--- xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.cc:1.1.1.1 Sat Jun 9 11:20:53 2001
+++ xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.cc Wed Jan 22 23:05:15 2014
@@ -35,8 +35,8 @@
/*
* nurbstess.c++
*
- * $Date: 2001/06/09 15:20:53 $ $Revision: 1.1.1.1 $
- * $Header: /cvsroot/xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.cc,v 1.1.1.1 2001/06/09 15:20:53 tron Exp $
+ * $Date: 2014/01/23 04:05:15 $ $Revision: 1.2 $
+ * $Header: /cvsroot/xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.cc,v 1.2 2014/01/23 04:05:15 christos Exp $
*/
#include "glimports.h"
@@ -677,7 +677,7 @@ NurbsTessellator::do_nurbserror( int msg
}
int
-NurbsTessellator::do_check_knots( Knotvector *knots, char *msg )
+NurbsTessellator::do_check_knots( Knotvector *knots, const char *msg )
{
int status = knots->validate();
if( status ) {
Index: xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.h
diff -u xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.h:1.1.1.1 xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.h:1.2
--- xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.h:1.1.1.1 Sat Jun 9 11:20:52 2001
+++ xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.h Wed Jan 22 23:05:15 2014
@@ -35,8 +35,8 @@
/*
* nurbstess.h
*
- * $Date: 2001/06/09 15:20:52 $ $Revision: 1.1.1.1 $
- * $Header: /cvsroot/xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.h,v 1.1.1.1 2001/06/09 15:20:52 tron Exp $
+ * $Date: 2014/01/23 04:05:15 $ $Revision: 1.2 $
+ * $Header: /cvsroot/xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.h,v 1.2 2014/01/23 04:05:15 christos Exp $
*/
#ifndef __glunurbstess_h_
@@ -114,7 +114,7 @@ protected:
private:
void resetObjects( void );
- int do_check_knots( Knotvector *, char * );
+ int do_check_knots( Knotvector *, const char * );
void do_nurbserror( int );
void do_bgncurve( O_curve * );
void do_endcurve( void );
