[Gnash-commit] gnash ChangeLog server/as_object.cpp server/aso...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/11/20 22:14:48

Modified files:
        .              : ChangeLog 
        server         : as_object.cpp 
        server/asobj   : AsBroadcaster.cpp 

Log message:
        Fix build with --enable-cassert.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4903&r2=1.4904
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.cpp?cvsroot=gnash&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/AsBroadcaster.cpp?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4903
retrieving revision 1.4904
diff -u -b -r1.4903 -r1.4904
--- ChangeLog   20 Nov 2007 20:59:26 -0000      1.4903
+++ ChangeLog   20 Nov 2007 22:14:47 -0000      1.4904
@@ -1,5 +1,7 @@
 2007-11-20 Sandro Santilli <address@hidden>
 
+       * server/as_object.cpp, server/asobj/AsBroadcaster.cpp:
+         Fix build with --enable-cassert.
        * extensions/fileio/fileio.cpp:
          Drop as_environment argument from to_string calls.
 

Index: server/as_object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- server/as_object.cpp        20 Nov 2007 10:31:39 -0000      1.82
+++ server/as_object.cpp        20 Nov 2007 22:14:48 -0000      1.83
@@ -906,12 +906,12 @@
                return ret;
        }
 
+       as_environment env;
+
 #ifndef NDEBUG
        size_t origStackSize = env.stack_size();
 #endif
 
-       as_environment env;
-
        env.push(arg1);
        env.push(arg0);
 

Index: server/asobj/AsBroadcaster.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/AsBroadcaster.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/asobj/AsBroadcaster.cpp      20 Nov 2007 12:04:55 -0000      1.11
+++ server/asobj/AsBroadcaster.cpp      20 Nov 2007 22:14:48 -0000      1.12
@@ -82,12 +82,12 @@
                {
 
 #ifndef NDEBUG
-                       size_t oldStackSize = _env.stack_size();
+                       size_t oldStackSize = _fn.env().stack_size();
 #endif
                        _fn.this_ptr = o.get();
                        method.to_as_function()->call(_fn);
 
-                       assert ( _env.stack_size() == oldStackSize );
+                       assert ( _fn.env().stack_size() == oldStackSize );
 
                }