[Gnash-commit] gnash ChangeLog gui/gtk_glue_gtkglext.h libbase...

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/13 23:56:52

Modified files:
        .              : ChangeLog 
        gui            : gtk_glue_gtkglext.h 
        libbase        : container.h 
        libgeometry    : kd_tree_dynamic.cpp 

Log message:
                * gui/gtk_glue_gtkglext.h: Fixed non-def'd virtual on !__GNUC__
                * libbase/container.h: Adding namespace gnash{}. Avoiding 
confusion.
                * libgeometry/kd_tree_dynamic.cpp: hash -> gnash::hash.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1207&r2=1.1208
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_gtkglext.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/container.h?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/kd_tree_dynamic.cpp?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1207
retrieving revision 1.1208
diff -u -b -r1.1207 -r1.1208
--- ChangeLog   13 Oct 2006 23:02:44 -0000      1.1207
+++ ChangeLog   13 Oct 2006 23:56:52 -0000      1.1208
@@ -11,6 +11,9 @@
          reverted. Removed basename().
        * macros/ogg.m4: Typo.
        * macros/boost.m4: Clean up and fixed missing AC_LANG{PUSH,POP}(C++).
+       * gui/gtk_glue_gtkglext.h: Fixed non-def'd virtual on !__GNUC__
+       * libbase/container.h: Adding namespace gnash{}. Avoiding confusion.
+       * libgeometry/kd_tree_dynamic.cpp: hash -> gnash::hash.
 
 2006-10-13 Udo Giacomozzi
 

Index: gui/gtk_glue_gtkglext.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk_glue_gtkglext.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gui/gtk_glue_gtkglext.h     11 Jul 2006 14:48:07 -0000      1.3
+++ gui/gtk_glue_gtkglext.h     13 Oct 2006 23:56:52 -0000      1.4
@@ -63,6 +63,9 @@
     void prepDrawingArea(GtkWidget *drawing_area);
     render_handler* createRenderHandler();
     void render();
+#ifndef __GNUC__ //If not GCC make sure we declare this one.
+    void render(int minx, int miny, int maxx, int maxy) { render(); };
+#endif
     void configure(GtkWidget *const widget, GdkEventConfigure *const event);
   private:
     GdkGLConfig *_glconfig;

Index: libbase/container.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/container.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- libbase/container.h 11 Oct 2006 15:13:28 -0000      1.43
+++ libbase/container.h 13 Oct 2006 23:56:52 -0000      1.44
@@ -34,6 +34,9 @@
 // forward this exception.
 // 
 //
+
+/* $Id: container.h,v 1.44 2006/10/13 23:56:52 nihilus Exp $ */
+
 #ifndef __CONTAINER_H__
 #define __CONTAINER_H__
 
@@ -127,6 +130,8 @@
 
 // Vitaly: hash from gameSWF. There are compiler problems with stdext:hash in 
Visual C
 // Markus: As well as with other compilers...
+namespace gnash{
+
 #ifdef WIN32_HASH_MAP
 
 template<class T, class U, class hash_functor = fixed_size_hash<T> >
@@ -672,6 +677,8 @@
 };
 #endif //GNUC
 
+} // namespace gnash
+
 // // tu_string is a subset of std::string, for the most part
 // class tu_string : public std::string
 // {
@@ -1065,7 +1072,7 @@
 
 
 template<class U>
-class string_hash : public hash<tu_string, U, string_hash_functor<tu_string> >
+class string_hash : public gnash::hash<tu_string, U, 
string_hash_functor<tu_string> >
 {
 };
 
@@ -1087,7 +1094,7 @@
 
 // Case-insensitive string hash.
 template<class U>
-class stringi_hash : public hash<tu_stringi, U, 
stringi_hash_functor<tu_stringi> >
+class stringi_hash : public gnash::hash<tu_stringi, U, 
stringi_hash_functor<tu_stringi> >
 {
 };
 
@@ -1100,7 +1107,6 @@
 #endif // not __GNUC__
 ;
 
-
 #endif // __CONTAINER_H__
 
 // Local Variables:

Index: libgeometry/kd_tree_dynamic.cpp
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/kd_tree_dynamic.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- libgeometry/kd_tree_dynamic.cpp     12 Oct 2006 14:05:42 -0000      1.12
+++ libgeometry/kd_tree_dynamic.cpp     13 Oct 2006 23:56:52 -0000      1.13
@@ -14,6 +14,7 @@
 #include "tu_file.h"
 #include <cfloat>
 
+using namespace gnash;
 
 static const float     EPSILON = 1e-4f;
 static const int       LEAF_FACE_COUNT = 6;