From ddd3c39a171f6646c8775c91fbee885fe4914a43 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 22 Apr 2009 16:42:16 +0000 Subject: [PATCH] Warning fixes --- src/osgPlugins/ply/ply.h | 3 +++ src/osgPlugins/ply/vertexData.cpp | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/osgPlugins/ply/ply.h b/src/osgPlugins/ply/ply.h index a79f3b3e3..725f40235 100644 --- a/src/osgPlugins/ply/ply.h +++ b/src/osgPlugins/ply/ply.h @@ -33,6 +33,9 @@ WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. #ifndef __PLY_H__ #define __PLY_H__ +// include to quieten down silly VS warnings +#include + #ifdef __cplusplus extern "C" { #endif diff --git a/src/osgPlugins/ply/vertexData.cpp b/src/osgPlugins/ply/vertexData.cpp index 31c84da00..e41eb17a4 100644 --- a/src/osgPlugins/ply/vertexData.cpp +++ b/src/osgPlugins/ply/vertexData.cpp @@ -9,9 +9,9 @@ /** note, derived from Equalizer LGPL source.*/ #include "typedefs.h" - #include "vertexData.h" #include "ply.h" + #include #include #include @@ -249,7 +249,9 @@ osg::Node* VertexData::readPlyFile( const char* filename, const bool ignoreColor MESHASSERT( _vertices->size() == static_cast< size_t >( nElems ) ); // Check all color elements read or not if( hasColors && !ignoreColors ) + { MESHASSERT( _colors->size() == static_cast< size_t >( nElems ) ); + } } catch( exception& e ) {