[Gnash-commit] gnash ChangeLog server/dlist.cpp libamf/amf.cpp

[Zou Lunkai]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Zou Lunkai <zoulunkai>  07/03/01 08:00:41

Modified files:
        .              : ChangeLog 
        server         : dlist.cpp 
        libamf         : amf.cpp 

Log message:
        typos

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2504&r2=1.2505
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.cpp?cvsroot=gnash&r1=1.23&r2=1.24

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2504
retrieving revision 1.2505
diff -u -b -r1.2504 -r1.2505
--- ChangeLog   28 Feb 2007 23:58:26 -0000      1.2504
+++ ChangeLog   1 Mar 2007 08:00:40 -0000       1.2505
@@ -1,3 +1,8 @@
+2007-03-01 Zou Lunkai <address@hidden>
+
+       * server/dlist.cpp: keep function declaration consistent with the 
headfile;
+         libamf/amf.cpp: typos, get rid of warnings for vc8 compiler.
+       
 2007-03-01 Sandro Santilli <address@hidden>
 
        * testsuite/actionscript.all/: array.as, Function.as

Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- server/dlist.cpp    28 Feb 2007 17:25:26 -0000      1.51
+++ server/dlist.cpp    1 Mar 2007 08:00:40 -0000       1.52
@@ -482,7 +482,7 @@
 }
 
 void
-DisplayList::clear_except(const DisplayList& exclude, bool unload)
+DisplayList::clear_except(const DisplayList& exclude, bool call_unload)
 {
        //GNASH_REPORT_FUNCTION;
 
@@ -504,7 +504,7 @@
 
                if (is_affected == false)
                {
-                       if ( unload ) di->on_event(event_id::UNLOAD);
+                       if ( call_unload ) di->on_event(event_id::UNLOAD);
                        it = _characters.erase(it);
                        continue;
                }
@@ -513,7 +513,7 @@
 }
 
 void
-DisplayList::clear(const DisplayList& from, bool unload)
+DisplayList::clear(const DisplayList& from, bool call_unload)
 {
        //GNASH_REPORT_FUNCTION;
 
@@ -535,7 +535,7 @@
 
                if (is_affected)
                {
-                       if ( unload ) di->on_event(event_id::UNLOAD);
+                       if ( call_unload ) di->on_event(event_id::UNLOAD);
                        it = _characters.erase(it);
                        continue;
                }

Index: libamf/amf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- libamf/amf.cpp      17 Dec 2006 19:21:20 -0000      1.23
+++ libamf/amf.cpp      1 Mar 2007 08:00:41 -0000       1.24
@@ -18,7 +18,7 @@
 // 
 //
 
-/* $Id: amf.cpp,v 1.23 2006/12/17 19:21:20 nihilus Exp $ */
+/* $Id: amf.cpp,v 1.24 2007/03/01 08:00:41 zoulunkai Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -265,7 +265,7 @@
 }
 
 bool
-AMF::readObject(void */* in */)
+AMF::readObject(void * /* in */)
 {
     GNASH_REPORT_FUNCTION;
                return true;
@@ -660,7 +660,7 @@
 }
 
 int
-AMF::extractNumber(const char */* in */)
+AMF::extractNumber(const char * /* in */)
 {
     GNASH_REPORT_FUNCTION;    
                return 0;