[Gnash-dev] [patch] Fixing a few compile errors

[James Athey]

Using a fresh CVS checkout, I'm getting the following errors compiling 
libbase/demo.cpp:

demo.cpp: In function `void init_video(int, int, int)':
demo.cpp:35: error: expected primary-expression before "gl"
demo.cpp:35: error: expected `;' before "gl"
demo.cpp:36: error: `gl' was not declared in this scope
demo.cpp:36: warning: unused variable 'gl'
demo.cpp: At global scope:
demo.cpp:40: error: `nav2d_state' was not declared in this scope
demo.cpp:40: error: `state' was not declared in this scope
demo.cpp:41: error: expected `,' or `;' before '{' token
demo.cpp:106: error: expected `,' or `...' before '&' token
demo.cpp:107: error: ISO C++ forbids declaration of `nav2d_state' with no type
demo.cpp: In function `void set_nav2d_viewport(int)':
demo.cpp:110: error: `state' was not declared in this scope

I fixed these errors with the following patch.  I'm not sure why other people 
aren't seeing the same errors.  I'm using GCC 3.4.5.

Index: libbase/demo.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/demo.cpp,v
retrieving revision 1.3
diff -u -r1.3 demo.cpp
--- libbase/demo.cpp    29 Mar 2006 05:42:41 -0000      1.3
+++ libbase/demo.cpp    2 Apr 2006 17:59:22 -0000
@@ -12,6 +12,8 @@
 #include "ogl.h"
 #include "SDL.h"

+using namespace demo;
+
 void init_video(int width, int height, int depth)
 {
     // Display.
@@ -32,8 +34,7 @@
            exit(1);
        }

-    ogl gl;
-    gl.open();
+    ogl::open();
 }