From 0ee744f7a055234953b9b9e8b523f2a8a8dadf34 Mon Sep 17 00:00:00 2001
From: Laurens Voerman <l.voerman@rug.nl>
Date: Mon, 26 Sep 2016 13:43:51 +0200
Subject: [PATCH 1/2] fix Visual studio warning C4138: '*/' found outside of
 comment

---
 src/osg/glu/libtess/tess.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/osg/glu/libtess/tess.cpp b/src/osg/glu/libtess/tess.cpp
index e6d11e791..ccdbfada7 100644
--- a/src/osg/glu/libtess/tess.cpp
+++ b/src/osg/glu/libtess/tess.cpp
@@ -60,7 +60,7 @@
 /*ARGSUSED*/ static void GLAPIENTRY noVertex( void * /*data*/ ) {}
 /*ARGSUSED*/ static void GLAPIENTRY noEnd( void ) {}
 /*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*/ ) {}
 
 
@@ -69,7 +69,7 @@
 /*ARGSUSED*/ void GLAPIENTRY __gl_noVertexData( void * /*data*/, void * /*polygonData*/ ) {}
 /*ARGSUSED*/ void GLAPIENTRY __gl_noEndData( 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) */
 typedef struct { GLUhalfEdge e, eSym; } EdgePair;

From 0619fe1cfa85d451cfd2726b7b9e6a5b149143cc Mon Sep 17 00:00:00 2001
From: Laurens Voerman <l.voerman@rug.nl>
Date: Mon, 26 Sep 2016 13:56:38 +0200
Subject: [PATCH 2/2] src\osgplugins\osgjs\Animation(9): warning C4099:
 'WriteVisitor': type name first seen using 'class' now seen using 'struct'

---
 src/osgPlugins/osgjs/Animation | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/osgPlugins/osgjs/Animation b/src/osgPlugins/osgjs/Animation
index 92a1e2891..366de2b5d 100644
--- a/src/osgPlugins/osgjs/Animation
+++ b/src/osgPlugins/osgjs/Animation
@@ -6,7 +6,7 @@
 #include <osgAnimation/Animation>
 #include <osgAnimation/UpdateMatrixTransform>
 
-struct WriteVisitor;
+class WriteVisitor;
 
 JSONObject* createJSONAnimation(osgAnimation::Animation* anim, WriteVisitor* writer);
 JSONObject* createJSONUpdateMatrixTransform(osgAnimation::UpdateMatrixTransform& acb, WriteVisitor* writer);