[Gnash-commit] gnash ChangeLog server/as_environment.cpp serve...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/24 10:37:57

Modified files:
        .              : ChangeLog 
        server         : as_environment.cpp as_environment.h 

Log message:
                * server/as_environment.{cpp,h}: use a static const for 
expressing
                  number of global registers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4093&r2=1.4094
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.83&r2=1.84
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.55&r2=1.56

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4093
retrieving revision 1.4094
diff -u -b -r1.4093 -r1.4094
--- ChangeLog   24 Aug 2007 10:07:40 -0000      1.4093
+++ ChangeLog   24 Aug 2007 10:37:56 -0000      1.4094
@@ -1,5 +1,10 @@
 2007-08-24 Sandro Santilli <address@hidden>
 
+       * server/as_environment.{cpp,h}: use a static const for expressing
+         number of global registers.
+
+2007-08-24 Sandro Santilli <address@hidden>
+
        * libbase/: tree.hpp => tree.hh: don't change original name of
          external source code.
        * libbase/Makefile.am: distribute tree.hh

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- server/as_environment.cpp   24 Aug 2007 10:05:57 -0000      1.83
+++ server/as_environment.cpp   24 Aug 2007 10:37:56 -0000      1.84
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: as_environment.cpp,v 1.83 2007/08/24 10:05:57 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.84 2007/08/24 10:37:56 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -938,7 +938,7 @@
 {
        std::string registers;
        int defined=0;
-       for (unsigned int i=0; i<4; ++i)
+       for (unsigned int i=0; i<numGlobalRegisters; ++i)
        {
                if (i) registers += std::string(" | ");
                registers += std::string("\"") +
@@ -1072,7 +1072,7 @@
 void
 as_environment::markReachableResources() const
 {
-       for (size_t i=0, s=4; i<4; ++i)
+       for (size_t i=0; i<4; ++i)
        {
                m_global_register[i].setReachable();
        }

Index: server/as_environment.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- server/as_environment.h     23 Aug 2007 16:50:56 -0000      1.55
+++ server/as_environment.h     24 Aug 2007 10:37:56 -0000      1.56
@@ -512,6 +512,8 @@
 
 private:
 
+       static const short unsigned int numGlobalRegisters = 4;
+
        typedef std::vector<CallFrame> CallStack;
                
        CallStack _localFrames;
@@ -519,7 +521,7 @@
        /// Variables available in this environment
        Variables _variables;
 
-       as_value m_global_register[4];
+       as_value m_global_register[numGlobalRegisters];
 
        /// Movie target. 
        character* m_target;