FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #142 from LaurensVoerman/Submissions12

Browse Source 
fix a few minor warnings from Visual Studio 2015
This commit is contained in:
OpenSceneGraph git repository 2016-09-27 09:48:38 +01:00 committed by GitHub
commit f705e39eb9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/osg/glu/libtess/tess.cpp
View File

@ -60,7 +60,7 @@
/*ARGSUSED*/ static void GLAPIENTRY noVertex( void * /*data*/ ) {} /*ARGSUSED*/ static void GLAPIENTRY noVertex( void * /*data*/ ) {}
/*ARGSUSED*/ static void GLAPIENTRY noEnd( void ) {} /*ARGSUSED*/ static void GLAPIENTRY noEnd( void ) {}
/*ARGSUSED*/ static void GLAPIENTRY noError( GLenum /*errnum*/ ) {} /*ARGSUSED*/ static void GLAPIENTRY noError( GLenum /*errnum*/ ) {}
/*ARGSUSED*/ static void GLAPIENTRY noCombine( GLdouble /*coords*/[3], void */*data*/[4], GLfloat /*weight*/[4], void ** /*dataOut*/ ) {} /*ARGSUSED*/ static void GLAPIENTRY noCombine( GLdouble /*coords*/[3], void * /*data*/[4], GLfloat /*weight*/[4], void ** /*dataOut*/ ) {}
/*ARGSUSED*/ static void GLAPIENTRY noMesh( GLUmesh * /*mesh*/ ) {} /*ARGSUSED*/ static void GLAPIENTRY noMesh( GLUmesh * /*mesh*/ ) {}
@ -69,7 +69,7 @@
/*ARGSUSED*/ void GLAPIENTRY __gl_noVertexData( void * /*data*/, void * /*polygonData*/ ) {} /*ARGSUSED*/ void GLAPIENTRY __gl_noVertexData( void * /*data*/, void * /*polygonData*/ ) {}
/*ARGSUSED*/ void GLAPIENTRY __gl_noEndData( void * /*polygonData*/ ) {} /*ARGSUSED*/ void GLAPIENTRY __gl_noEndData( void * /*polygonData*/ ) {}
/*ARGSUSED*/ void GLAPIENTRY __gl_noErrorData( GLenum /*errnum*/, void * /*polygonData*/ ) {} /*ARGSUSED*/ void GLAPIENTRY __gl_noErrorData( GLenum /*errnum*/, void * /*polygonData*/ ) {}
/*ARGSUSED*/ void GLAPIENTRY __gl_noCombineData( GLdouble /*coords*/[3], void */*data*/[4], GLfloat /*weight*/[4], void ** /*outData*/, void * /*polygonData*/ ) {} /*ARGSUSED*/ void GLAPIENTRY __gl_noCombineData( GLdouble /*coords*/[3], void * /*data*/[4], GLfloat /*weight*/[4], void ** /*outData*/, void * /*polygonData*/ ) {}
/* Half-edges are allocated in pairs (see mesh.c) */ /* Half-edges are allocated in pairs (see mesh.c) */
typedef struct { GLUhalfEdge e, eSym; } EdgePair; typedef struct { GLUhalfEdge e, eSym; } EdgePair;

2
src/osgPlugins/osgjs/Animation
View File

@ -6,7 +6,7 @@
#include <osgAnimation/Animation> #include <osgAnimation/Animation>
#include <osgAnimation/UpdateMatrixTransform> #include <osgAnimation/UpdateMatrixTransform>
struct WriteVisitor; class WriteVisitor;
JSONObject* createJSONAnimation(osgAnimation::Animation* anim, WriteVisitor* writer); JSONObject* createJSONAnimation(osgAnimation::Animation* anim, WriteVisitor* writer);
JSONObject* createJSONUpdateMatrixTransform(osgAnimation::UpdateMatrixTransform& acb, WriteVisitor* writer); JSONObject* createJSONUpdateMatrixTransform(osgAnimation::UpdateMatrixTransform& acb, WriteVisitor* writer);