From 3bfa74222b2e003a3f698ad141c589ff6a3aa65e Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 13 Dec 2007 16:06:02 +0000
Subject: [PATCH] Warning fixes

---
 src/osgPlugins/cfg/CameraConfig.h   | 6 ++++--
 src/osgPlugins/cfg/ConfigParser.cpp | 9 +--------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/osgPlugins/cfg/CameraConfig.h b/src/osgPlugins/cfg/CameraConfig.h
index 2267d0477..4ee6f0c4f 100644
--- a/src/osgPlugins/cfg/CameraConfig.h
+++ b/src/osgPlugins/cfg/CameraConfig.h
@@ -34,7 +34,8 @@
 namespace osgProducer {
 
 #define notImplemented {std::cout << __FILE__ << " " << __LINE__ << std::endl;}
-  struct CameraGroup : public osg::Referenced {
+  class CameraGroup : public osg::Referenced {
+  public:
     enum ThreadModel {
       SingleThreaded,
       ThreadPerRenderSurface,
@@ -44,7 +45,8 @@ namespace osgProducer {
   };
 
 
-  struct InputArea : public osg::Referenced {
+  class InputArea : public osg::Referenced {
+  public:
     void addRenderSurface(RenderSurface* s) { _rs.push_back(s); }
     std::vector<osg::ref_ptr<RenderSurface> > _rs;
   };
diff --git a/src/osgPlugins/cfg/ConfigParser.cpp b/src/osgPlugins/cfg/ConfigParser.cpp
index 2119e7f6b..c8ca21a13 100644
--- a/src/osgPlugins/cfg/ConfigParser.cpp
+++ b/src/osgPlugins/cfg/ConfigParser.cpp
@@ -1116,14 +1116,7 @@ yydestruct (yytype, yyvaluep)
   /* Pacify ``unused variable'' warnings.  */
   (void) yyvaluep;
 
-  switch (yytype)
-    {
-
-      default:
-        break;
-    }
 }
-
 
 /* Prevent warnings from -Wmissing-prototypes.  */
 
@@ -2239,7 +2232,7 @@ bool CameraConfig::parseFile( const std::string &file )
 
 #if defined (SUPPORT_CPP)
 
-    char *cpp_path =
+    const char *cpp_path =
   #if defined(__APPLE__)
                 "/usr/bin/cpp";
   #else