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

[Zou Lunkai]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Zou Lunkai <zoulunkai>  07/12/24 05:33:44

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

Log message:
        * server/as_value.{h, cpp}: ~as_value(), don't inline the destructor.
        * server/as_environment.{h, cpp}: popCallFrame(), don't inline this 
function.
          fix the 'link once' problem here with -O2 option.
        
        Although it is probably a linker bug, it's annoying anyway.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5249&r2=1.5250
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.116&r2=1.117
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.107&r2=1.108
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.80&r2=1.81

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5249
retrieving revision 1.5250
diff -u -b -r1.5249 -r1.5250
--- ChangeLog   24 Dec 2007 00:20:46 -0000      1.5249
+++ ChangeLog   24 Dec 2007 05:33:43 -0000      1.5250
@@ -1,3 +1,9 @@
+2007-12-24 Zou Lunkai <address@hidden>
+       
+       * server/as_value.{h, cpp}: ~as_value(), don't inline the destructor.
+       * server/as_environment.{h, cpp}: popCallFrame(), don't inline this 
function.
+         fix the 'link once' problem here with -O2 option.
+       
 2007-12-24 Markus Gothe <address@hidden>
 
        * Santa Claus is coming to town.

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- server/as_environment.cpp   14 Dec 2007 20:51:20 -0000      1.116
+++ server/as_environment.cpp   24 Dec 2007 05:33:44 -0000      1.117
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: as_environment.cpp,v 1.116 2007/12/14 20:51:20 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.117 2007/12/24 05:33:44 zoulunkai Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -849,6 +849,13 @@
 }
 
 void
+as_environment::popCallFrame()
+{
+       assert(!_localFrames.empty());
+       _localFrames.pop_back();
+}
+       
+void
 as_environment::set_target(character* target)
 {
        assert(target);

Index: server/as_environment.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- server/as_environment.h     18 Dec 2007 07:44:41 -0000      1.69
+++ server/as_environment.h     24 Dec 2007 05:33:44 -0000      1.70
@@ -515,11 +515,7 @@
        //
        /// This should happen when an ActionScript function returns.
        ///
-       static void popCallFrame()
-       {
-               assert(!_localFrames.empty());
-               _localFrames.pop_back();
-       }
+       static void popCallFrame();
        
        /// Return the (possibly UNDEFINED) value of the named variable.
        //

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- server/as_value.cpp 19 Dec 2007 20:40:31 -0000      1.107
+++ server/as_value.cpp 24 Dec 2007 05:33:44 -0000      1.108
@@ -1500,6 +1500,11 @@
        set_as_object(obj);
 }
 
+as_value::~as_value()
+{ 
+       drop_refs(); 
+}
+
 //-------------------------------------
 // as_value::CharacterProxy
 //-------------------------------------

Index: server/as_value.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.h,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- server/as_value.h   19 Dec 2007 20:40:31 -0000      1.80
+++ server/as_value.h   24 Dec 2007 05:33:44 -0000      1.81
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: as_value.h,v 1.80 2007/12/19 20:40:31 strk Exp $ */
+/* $Id: as_value.h,v 1.81 2007/12/24 05:33:44 zoulunkai Exp $ */
 
 #ifndef GNASH_AS_VALUE_H
 #define GNASH_AS_VALUE_H
@@ -191,7 +191,7 @@
        /// Construct a NULL or AS_FUNCTION value
        as_value(as_function* func);
 
-       ~as_value() { drop_refs(); }
+       ~as_value();
 
        /// Convert numeric value to string value, following ECMA-262 
specification
        //