From 33545ab3327da319a843e85d38f33714ed1cd99b Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 17 Dec 2008 14:56:40 +0000 Subject: [PATCH] Fixed warnings --- src/osgPlugins/cfg/CameraConfig.h | 4 ++-- src/osgPlugins/cfg/ConfigLexer.cpp | 6 +++++- src/osgPlugins/cfg/ConfigParser.cpp | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/osgPlugins/cfg/CameraConfig.h b/src/osgPlugins/cfg/CameraConfig.h index 32223e915..0ed1c23e3 100644 --- a/src/osgPlugins/cfg/CameraConfig.h +++ b/src/osgPlugins/cfg/CameraConfig.h @@ -40,7 +40,7 @@ namespace osgProducer { enum ThreadModel { SingleThreaded, ThreadPerRenderSurface, - ThreadPerCamera, + ThreadPerCamera }; static ThreadModel getDefaultThreadModel() { return SingleThreaded;} }; @@ -241,7 +241,7 @@ class CameraConfig : public osg::Referenced CameraGroup::ThreadModel _threadModelDirective; }; -}; +} #endif diff --git a/src/osgPlugins/cfg/ConfigLexer.cpp b/src/osgPlugins/cfg/ConfigLexer.cpp index f22779e31..bc9f59eaa 100644 --- a/src/osgPlugins/cfg/ConfigLexer.cpp +++ b/src/osgPlugins/cfg/ConfigLexer.cpp @@ -1959,8 +1959,12 @@ void yyFlexLexer::yy_delete_buffer( YY_BUFFER_STATE b ) yy_flex_free( (void *) b ); } +#ifndef __THROW + #define __THROW +#endif + +extern "C" int isatty YY_PROTO(( int )) __THROW; -extern "C" int isatty YY_PROTO(( int )); void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, std::istream* file ) { diff --git a/src/osgPlugins/cfg/ConfigParser.cpp b/src/osgPlugins/cfg/ConfigParser.cpp index 3cf642a9b..6470215ec 100644 --- a/src/osgPlugins/cfg/ConfigParser.cpp +++ b/src/osgPlugins/cfg/ConfigParser.cpp @@ -1974,7 +1974,7 @@ yyreduce: case 120: { - int n; + unsigned int n; sscanf( flexer->YYText(), "0x%x", &n ); yyval.integer = n; ;}