[Gnash-commit] gnash/server action.cpp action_buffer.cpp

[Vitaly Alexeev]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Vitaly Alexeev <alexeev>        06/06/21 09:06:01

Modified files:
        server         : action.cpp action_buffer.cpp 

Log message:
        fixed "static SWFHandlers ash;" problem

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/action.cpp?cvsroot=gnash&r1=1.86&r2=1.87
http://cvs.savannah.gnu.org/viewcvs/gnash/server/action_buffer.cpp?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: action.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/action.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- action.cpp  20 Jun 2006 11:12:36 -0000      1.86
+++ action.cpp  21 Jun 2006 09:06:01 -0000      1.87
@@ -151,19 +151,6 @@
 
 namespace gnash {
 
-// Vitaly:     SWF::SWFHandlers::_handlers & SWF::SWFHandlers::_property_names
-//     are used at creation "SWFHandlers ash" and consequently they should be 
certain here
-//
-// Tue Jun 20 12:16:03 CEST 2006
-// strk: Moved  SWFHandlers stuff in server/swf/ASHandlers.cpp, where
-//       the SWFHandlers class is defined.
-//       Moved 'ash' definition to server/action_buffer.cpp, where
-//       it is used.
-//
-//std::map<action_type, ActionHandler> SWF::SWFHandlers::_handlers;
-//std::vector<std::string> SWF::SWFHandlers::_property_names;
-//SWFHandlers ash;
-       
 //
 // action stuff
 //

Index: action_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/action_buffer.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- action_buffer.cpp   20 Jun 2006 11:12:36 -0000      1.1
+++ action_buffer.cpp   21 Jun 2006 09:06:01 -0000      1.2
@@ -64,6 +64,11 @@
 
 namespace gnash {
 
+// Vitaly:     SWF::SWFHandlers::_handlers & SWF::SWFHandlers::_property_names
+//     are used at creation "SWFHandlers ash" and consequently they should be 
certain here
+std::map<action_type, ActionHandler> SWF::SWFHandlers::_handlers;
+std::vector<std::string> SWF::SWFHandlers::_property_names;
+
 static SWFHandlers ash;
 
 // Utility.  Try to convert str to a number.  If successful,