[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/LoadVariablesThread.cpp ...
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] gnash ChangeLog server/LoadVariablesThread.cpp ... |
|
Date: |
Mon, 21 Apr 2008 11:27:47 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Benjamin Wolsey <bwy> 08/04/21 11:27:46
Modified files:
. : ChangeLog
server : LoadVariablesThread.cpp array.cpp array.h
as_environment.cpp as_environment.h
as_function.cpp as_function.h as_object.cpp
as_object.h as_value.cpp
button_character_instance.cpp
button_character_instance.h character.cpp
character.h debugger.cpp dlist.cpp
edit_text_character.cpp edit_text_character.h
fill_style.cpp fill_style.h font.cpp font.h
generic_character.h impl.cpp
mouse_button_state.h movie_instance.cpp
movie_root.cpp movie_root.h sprite_instance.cpp
server/asobj : Key.cpp Key.h LoadVars.cpp MovieClipLoader.cpp
NetStream.cpp NetStream.h SharedObject.cpp
Sound.cpp Sound.h TextFormat.cpp string.cpp
xml.cpp xmlnode.cpp xmlnode.h xmlsocket.cpp
server/parser : BitmapMovieDefinition.cpp
BitmapMovieDefinition.h bitmap_character_def.h
button_character_def.cpp button_character_def.h
edit_text_character_def.cpp
edit_text_character_def.h
morph2_character_def.h movie_def_impl.cpp
movie_def_impl.h shape_character_def.cpp
shape_character_def.h sprite_definition.cpp
sprite_definition.h
server/swf : tag_loaders.cpp
server/vm : ASHandlers.cpp ActionExec.cpp ExecutableCode.h
VM.cpp VM.h
libbase : log.h
Log message:
* server/: (many files) GNASH_USE_GC is defined in smart_ptr.h,
not gnashconfig.h. Make sure it's explicitly included wherever
GNASH_USE_GC is needed. Drop more gnashconfig.h includes.
Replace
SIZET_FMT with %d now that we use boost::format (removes need
to
include gnashconfig.h).
* libbase/log.h: define LOG_ONCE to replace the ONCE
implementations
in various server/ files.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6335&r2=1.6336
http://cvs.savannah.gnu.org/viewcvs/gnash/server/LoadVariablesThread.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.103&r2=1.104
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.h?cvsroot=gnash&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.130&r2=1.131
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_function.cpp?cvsroot=gnash&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_function.h?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.cpp?cvsroot=gnash&r1=1.115&r2=1.116
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.h?cvsroot=gnash&r1=1.104&r2=1.105
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.129&r2=1.130
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.h?cvsroot=gnash&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.92&r2=1.93
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.138&r2=1.139
http://cvs.savannah.gnu.org/viewcvs/gnash/server/debugger.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.116&r2=1.117
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.175&r2=1.176
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.h?cvsroot=gnash&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/gnash/server/fill_style.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/server/fill_style.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.cpp?cvsroot=gnash&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.h?cvsroot=gnash&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gnash/server/generic_character.h?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.142&r2=1.143
http://cvs.savannah.gnu.org/viewcvs/gnash/server/mouse_button_state.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_instance.cpp?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.176&r2=1.177
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.117&r2=1.118
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.507&r2=1.508
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Key.cpp?cvsroot=gnash&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Key.h?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/LoadVars.cpp?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/MovieClipLoader.cpp?cvsroot=gnash&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.cpp?cvsroot=gnash&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.h?cvsroot=gnash&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SharedObject.cpp?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Sound.cpp?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Sound.h?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/TextFormat.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/string.cpp?cvsroot=gnash&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.cpp?cvsroot=gnash&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.h?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.cpp?cvsroot=gnash&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/BitmapMovieDefinition.cpp?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/BitmapMovieDefinition.h?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/bitmap_character_def.h?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/button_character_def.cpp?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/button_character_def.h?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/edit_text_character_def.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/edit_text_character_def.h?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/morph2_character_def.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.105&r2=1.106
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.h?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.cpp?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.h?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.194&r2=1.195
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.226&r2=1.227
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ExecutableCode.h?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/VM.cpp?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/VM.h?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.h?cvsroot=gnash&r1=1.76&r2=1.77
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6335
retrieving revision 1.6336
diff -u -b -r1.6335 -r1.6336
--- ChangeLog 20 Apr 2008 17:53:57 -0000 1.6335
+++ ChangeLog 21 Apr 2008 11:27:41 -0000 1.6336
@@ -1,3 +1,13 @@
+2008-04-21 Benjamin Wolsey <address@hidden>
+
+ * server/: (many files) GNASH_USE_GC is defined in smart_ptr.h,
+ not gnashconfig.h. Make sure it's explicitly included wherever
+ GNASH_USE_GC is needed. Drop more gnashconfig.h includes. Replace
+ SIZET_FMT with %d now that we use boost::format (removes need to
+ include gnashconfig.h).
+ * libbase/log.h: define LOG_ONCE to replace the ONCE implementations
+ in various server/ files.
+
2008-04-20 Benjamin Wolsey <address@hidden>
* server/asobj/Date.{h,cpp}: make date_as_object into Date class,
Index: server/LoadVariablesThread.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/LoadVariablesThread.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/LoadVariablesThread.cpp 17 Apr 2008 08:05:37 -0000 1.11
+++ server/LoadVariablesThread.cpp 21 Apr 2008 11:27:42 -0000 1.12
@@ -120,7 +120,8 @@
_bytesLoaded = _stream->get_position();
if ( _bytesTotal != _bytesLoaded )
{
- log_error("Size of stream variables were loaded from advertised
to be "SIZET_FMT" bytes long, but turned out to be only "SIZET_FMT" bytes long",
+ log_error("Size of stream variables were loaded from advertised
to be %d bytes long,"
+ " but turned out to be only %d bytes long",
_bytesTotal, _bytesLoaded);
_bytesTotal = _bytesLoaded;
}
Index: server/array.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/array.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- server/array.cpp 1 Apr 2008 11:19:23 -0000 1.103
+++ server/array.cpp 21 Apr 2008 11:27:42 -0000 1.104
@@ -21,6 +21,7 @@
#include "gnashconfig.h"
#endif
+#include "smart_ptr.h" // GNASH_USE_GC
#include "as_value.h"
#include "array.h"
#include "log.h"
Index: server/array.h
===================================================================
RCS file: /sources/gnash/gnash/server/array.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- server/array.h 19 Mar 2008 14:36:21 -0000 1.46
+++ server/array.h 21 Apr 2008 11:27:42 -0000 1.47
@@ -19,6 +19,7 @@
#define GNASH_ARRAY_H
#include "as_object.h" // for inheritance
+#include "smart_ptr.h" // GNASH_USE_GC
#include <deque>
#include <vector>
Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -b -r1.130 -r1.131
--- server/as_environment.cpp 17 Apr 2008 22:45:31 -0000 1.130
+++ server/as_environment.cpp 21 Apr 2008 11:27:42 -0000 1.131
@@ -17,12 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
-#include "smart_ptr.h"
+#include "smart_ptr.h" // GNASH_USE_GC
#include "as_environment.h"
#include "sprite_instance.h"
#include "shape_character_def.h"
Index: server/as_environment.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.h,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- server/as_environment.h 28 Mar 2008 16:23:07 -0000 1.75
+++ server/as_environment.h 21 Apr 2008 11:27:42 -0000 1.76
@@ -18,10 +18,7 @@
#ifndef GNASH_AS_ENVIRONMENT_H
#define GNASH_AS_ENVIRONMENT_H
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
+#include "smart_ptr.h" // GNASH_USE_GC
#include "dsodefs.h" // DSOEXPORT
#include "as_value.h" // for composition (vector + frame_slot)
#include "StringPredicates.h" // for Variables
Index: server/as_function.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_function.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- server/as_function.cpp 31 Mar 2008 18:09:36 -0000 1.58
+++ server/as_function.cpp 21 Apr 2008 11:27:42 -0000 1.59
@@ -17,10 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
+#include "smart_ptr.h" // GNASH_USE_GC
#include "log.h"
#include "as_function.h"
#include "builtin_function.h" // for _global.Function
Index: server/as_function.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_function.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/as_function.h 30 Mar 2008 13:28:58 -0000 1.22
+++ server/as_function.h 21 Apr 2008 11:27:42 -0000 1.23
@@ -18,10 +18,7 @@
#ifndef _GNASH_AS_FUNCTION_H_
#define _GNASH_AS_FUNCTION_H_
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
+#include "smart_ptr.h" // GNASH_USE_GC
#include "as_object.h" // for inheritance
// Forward declarations
Index: server/as_object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- server/as_object.cpp 8 Apr 2008 21:59:23 -0000 1.115
+++ server/as_object.cpp 21 Apr 2008 11:27:42 -0000 1.116
@@ -22,6 +22,7 @@
#include "log.h"
+#include "smart_ptr.h" // GNASH_USE_GC
#include "as_object.h"
#include "as_function.h"
#include "as_environment.h" // for enumerateProperties
@@ -917,7 +918,7 @@
void
as_object::dump_members()
{
- log_debug(_(SIZET_FMT " members of object %p follow"),
+ log_debug(_("%d members of object %p follow"),
_members.size(), (const void*)this);
_members.dump(*this);
}
Index: server/as_object.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.h,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- server/as_object.h 8 Apr 2008 21:59:23 -0000 1.104
+++ server/as_object.h 21 Apr 2008 11:27:42 -0000 1.105
@@ -23,7 +23,7 @@
#endif
#include "dsodefs.h" // DSOEXPORT
-
+#include "smart_ptr.h" // GNASH_USE_GC
#include "string_table.h"
#include "ref_counted.h" // for inheritance (to drop)
#include "GC.h" // for inheritance from GcResource (to complete)
Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- server/as_value.cpp 2 Apr 2008 08:53:45 -0000 1.129
+++ server/as_value.cpp 21 Apr 2008 11:27:42 -0000 1.130
@@ -17,10 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
+#include "smart_ptr.h" // GNASH_USE_GC
#include "as_value.h"
#include "as_object.h"
#include "as_function.h" // for as_function
Index: server/button_character_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- server/button_character_instance.cpp 19 Apr 2008 21:46:29 -0000
1.98
+++ server/button_character_instance.cpp 21 Apr 2008 11:27:42 -0000
1.99
@@ -18,10 +18,10 @@
//
#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
+#include "gnashconfig.h" // USE_SWF_TREE
#endif
-
+#include "smart_ptr.h" // GNASH_USE_GC
#include "button_character_instance.h"
#include "button_character_def.h"
#include "action.h" // for as_standard_member enum
Index: server/button_character_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- server/button_character_instance.h 19 Apr 2008 00:56:24 -0000 1.38
+++ server/button_character_instance.h 21 Apr 2008 11:27:42 -0000 1.39
@@ -22,6 +22,7 @@
#ifndef GNASH_BUTTON_CHARACTER_INSTANCE_H
#define GNASH_BUTTON_CHARACTER_INSTANCE_H
+#include "smart_ptr.h" // GNASH_USE_GC
#include "character.h" // for inheritance
#include <vector>
Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- server/character.cpp 17 Apr 2008 22:45:32 -0000 1.92
+++ server/character.cpp 21 Apr 2008 11:27:42 -0000 1.93
@@ -22,6 +22,7 @@
#include "gnashconfig.h" // USE_SWFTREE
#endif
+#include "smart_ptr.h" // GNASH_USE_GC
#include "character.h"
#include "sprite_instance.h"
#include "drag_state.h" // for do_mouse_drag (to be moved in movie_root)
Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -b -r1.138 -r1.139
--- server/character.h 17 Apr 2008 22:45:32 -0000 1.138
+++ server/character.h 21 Apr 2008 11:27:42 -0000 1.139
@@ -23,6 +23,7 @@
#include "gnashconfig.h" // USE_SWFTREE
#endif
+#include "smart_ptr.h" // GNASH_USE_GC
#include "gnash.h"
#include "types.h"
#include "utility.h"
Index: server/debugger.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/debugger.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/debugger.cpp 15 Mar 2008 09:40:23 -0000 1.26
+++ server/debugger.cpp 21 Apr 2008 11:27:43 -0000 1.27
@@ -24,6 +24,7 @@
#include <map>
#include <boost/algorithm/string/case_conv.hpp>
+#include "smart_ptr.h" // GNASH_USE_GC
#include "VM.h"
#include "rc.h"
#include "debugger.h"
Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- server/dlist.cpp 3 Apr 2008 14:24:01 -0000 1.116
+++ server/dlist.cpp 21 Apr 2008 11:27:43 -0000 1.117
@@ -17,6 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#include "smart_ptr.h" // GNASH_USE_GC
#include "dlist.h"
#include "log.h"
#include "render.h"
Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -b -r1.175 -r1.176
--- server/edit_text_character.cpp 19 Apr 2008 22:45:51 -0000 1.175
+++ server/edit_text_character.cpp 21 Apr 2008 11:27:43 -0000 1.176
@@ -61,8 +61,6 @@
//
//#define PP_COMPATIBLE_DEVICE_FONT_HANDLING 1
-#define ONCE(x) { static bool warned=false; if (!warned) { warned=true; x; } }
-
namespace gnash {
// Forward declarations
@@ -188,7 +186,7 @@
// TODO: add font color and some more
- ONCE( log_unimpl("TextField.getTextFormat() discards url, target,
tabStops, bullet and display") );
+ LOG_ONCE( log_unimpl("TextField.getTextFormat() discards url, target,
tabStops, bullet and display") );
return as_value(tf.get());
}
@@ -259,7 +257,7 @@
// TODO: add font color and some more
- ONCE( log_unimpl("TextField.setTextFormat() discards url, target,
tabStops, bullet and display") );
+ LOG_ONCE( log_unimpl("TextField.setTextFormat() discards url, target,
tabStops, bullet and display") );
return as_value();
@@ -271,7 +269,7 @@
//boost::intrusive_ptr<edit_text_character> text =
ensureType<edit_text_character>(fn.this_ptr);
//UNUSED(text);
- ONCE( log_unimpl("TextField.setNewTextFormat(), we'll delegate to
setTextFormat") );
+ LOG_ONCE( log_unimpl("TextField.setNewTextFormat(), we'll delegate to
setTextFormat") );
return textfield_setTextFormat(fn);
//return as_value();
Index: server/edit_text_character.h
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.h,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- server/edit_text_character.h 11 Apr 2008 09:58:41 -0000 1.75
+++ server/edit_text_character.h 21 Apr 2008 11:27:43 -0000 1.76
@@ -18,10 +18,6 @@
#ifndef _GNASH_EDIT_TEXT_CHARACTER_H_
#define _GNASH_EDIT_TEXT_CHARACTER_H_
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h" // For GNASH_USE_GC
-#endif
-
#include "character.h" // for inheritance
#include "edit_text_character_def.h" // for inlines and typedefs
#include "styles.h" // for fill_style and line_style
Index: server/fill_style.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/fill_style.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/fill_style.cpp 14 Mar 2008 20:21:49 -0000 1.26
+++ server/fill_style.cpp 21 Apr 2008 11:27:43 -0000 1.27
@@ -19,6 +19,7 @@
// Based on work of Thatcher Ulrich <address@hidden> 2003
+#include "smart_ptr.h" // GNASH_USE_GC
#include "fill_style.h"
#include "impl.h"
#include "log.h"
Index: server/fill_style.h
===================================================================
RCS file: /sources/gnash/gnash/server/fill_style.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/fill_style.h 27 Mar 2008 10:50:14 -0000 1.18
+++ server/fill_style.h 21 Apr 2008 11:27:43 -0000 1.19
@@ -21,10 +21,7 @@
#ifndef GNASH_FILL_STYLE_H
#define GNASH_FILL_STYLE_H
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h" // GNASH_USE_GC
-#endif
-
+#include "smart_ptr.h" // GNASH_USE_GC
#include "types.h"
#include "matrix.h"
#include "bitmap_character_def.h"
Index: server/font.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/font.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- server/font.cpp 17 Apr 2008 16:24:07 -0000 1.63
+++ server/font.cpp 21 Apr 2008 11:27:43 -0000 1.64
@@ -20,6 +20,7 @@
// Based on the public domain work of Thatcher Ulrich <address@hidden> 2003
+#include "smart_ptr.h" // GNASH_USE_GC
#include "font.h"
#include "stream.h"
#include "log.h"
Index: server/font.h
===================================================================
RCS file: /sources/gnash/gnash/server/font.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- server/font.h 17 Apr 2008 16:24:08 -0000 1.38
+++ server/font.h 21 Apr 2008 11:27:43 -0000 1.39
@@ -23,7 +23,7 @@
#ifndef GNASH_FONT_H
#define GNASH_FONT_H
-#include "gnashconfig.h" // For GNASH_USE_GC
+#include "smart_ptr.h" // GNASH_USE_GC
#include "types.h"
#include "resource.h" // for inheritance of font
Index: server/generic_character.h
===================================================================
RCS file: /sources/gnash/gnash/server/generic_character.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/generic_character.h 27 Mar 2008 10:50:14 -0000 1.29
+++ server/generic_character.h 21 Apr 2008 11:27:43 -0000 1.30
@@ -18,12 +18,8 @@
#ifndef GNASH_GENERIC_CHARACTER_H
#define GNASH_GENERIC_CHARACTER_H
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h" // GNASH_USE_GC
-#endif
-
+#include "smart_ptr.h" // GNASH_USE_GC
#include "character.h" // for inheritance
-
#include "shape_character_def.h" // for add_invalidated_bounds
#include <cassert>
Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -b -r1.142 -r1.143
--- server/impl.cpp 5 Mar 2008 03:55:59 -0000 1.142
+++ server/impl.cpp 21 Apr 2008 11:27:43 -0000 1.143
@@ -22,6 +22,7 @@
#include "gnashconfig.h"
#endif
+#include "smart_ptr.h" // GNASH_USE_GC
#include "tu_file.h"
#include "utility.h"
#include "action.h"
Index: server/mouse_button_state.h
===================================================================
RCS file: /sources/gnash/gnash/server/mouse_button_state.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/mouse_button_state.h 27 Mar 2008 10:50:15 -0000 1.10
+++ server/mouse_button_state.h 21 Apr 2008 11:27:43 -0000 1.11
@@ -7,10 +7,7 @@
#ifndef GNASH_MOUSE_BUTTON_STATE_H
#define GNASH_MOUSE_BUTTON_STATE_H
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h" // For GNASH_USE_GC
-#endif
-
+#include "smart_ptr.h" // GNASH_USE_GC
#include "character_def.h"
#include "smart_ptr.h" // for composition and inlines
#include "character.h" // for use in intrusive_ptr
Index: server/movie_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_instance.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/movie_instance.cpp 21 Jan 2008 20:55:51 -0000 1.25
+++ server/movie_instance.cpp 21 Apr 2008 11:27:43 -0000 1.26
@@ -55,8 +55,8 @@
if ( !_def->ensure_frame_loaded(nextframe) )
{
IF_VERBOSE_MALFORMED_SWF(
- log_swferror("Frame " SIZET_FMT " never loaded. Total frames: "
- SIZET_FMT ".", nextframe, get_frame_count());
+ log_swferror("Frame %d never loaded. Total frames: %d",
+ nextframe, get_frame_count());
);
}
@@ -81,8 +81,8 @@
if ( !_def->ensure_frame_loaded(nextframe) )
{
IF_VERBOSE_MALFORMED_SWF(
- log_swferror("Frame " SIZET_FMT " never loaded. Total frames: "
- SIZET_FMT ".", nextframe, get_frame_count());
+ log_swferror("Frame %d never loaded. Total frames: %d.",
+ nextframe, get_frame_count());
);
}
Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -b -r1.176 -r1.177
--- server/movie_root.cpp 16 Apr 2008 16:59:43 -0000 1.176
+++ server/movie_root.cpp 21 Apr 2008 11:27:43 -0000 1.177
@@ -17,10 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
+#include "smart_ptr.h" // GNASH_USE_GC
#include "movie_root.h"
#include "log.h"
#include "sprite_instance.h"
@@ -988,7 +985,7 @@
if ( _intervalTimers.size() >= 255 )
{
// TODO: Why this limitation ?
- log_error("FIXME: " SIZET_FMT " timers currently active, won't
add another one", _intervalTimers.size());
+ log_error("FIXME: %d timers currently active, won't add another
one", _intervalTimers.size());
}
assert(_intervalTimers.find(id) == _intervalTimers.end());
@@ -1161,7 +1158,7 @@
void movie_root::notify_key_listeners(key::code k, bool down)
{
- // log_debug("Notifying " SIZET_FMT " character Key listeners",
+ // log_debug("Notifying %d character Key listeners",
// m_key_listeners.size());
KeyListeners copy = m_key_listeners;
@@ -1223,7 +1220,7 @@
void
movie_root::notify_mouse_listeners(const event_id& event)
{
- //log_debug("Notifying " SIZET_FMT " listeners about %s",
+ //log_debug("Notifying %d listeners about %s",
// m_mouse_listeners.size(),
event.get_function_name().c_str());
CharacterList copy = m_mouse_listeners;
@@ -1745,7 +1742,7 @@
if ( _liveChars.size() > maxLiveChars )
{
maxLiveChars = _liveChars.size();
- log_debug("Global instance list grew to " SIZET_FMT " entries",
maxLiveChars);
+ log_debug("Global instance list grew to %d entries",
maxLiveChars);
}
#endif
Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- server/movie_root.h 11 Apr 2008 15:33:46 -0000 1.117
+++ server/movie_root.h 21 Apr 2008 11:27:43 -0000 1.118
@@ -66,15 +66,14 @@
#define GNASH_MOVIE_ROOT_H
#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h" // GNASH_USE_GC, USE_SWFTREE
+#include "gnashconfig.h" //USE_SWFTREE
#endif
+#include "smart_ptr.h" // GNASH_USE_GC
#include "dsodefs.h" // DSOEXPORT
-
#include "mouse_button_state.h" // for composition
#include "drag_state.h" // for composition
#include "movie_instance.h" // for inlines
-//#include "timers.h" // for composition
#include "asobj/Key.h"
#include "smart_ptr.h" // for memory management
#include "URL.h" // for loadMovie
Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.507
retrieving revision 1.508
diff -u -b -r1.507 -r1.508
--- server/sprite_instance.cpp 18 Apr 2008 20:52:18 -0000 1.507
+++ server/sprite_instance.cpp 21 Apr 2008 11:27:44 -0000 1.508
@@ -18,7 +18,7 @@
//
#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
+#include "gnashconfig.h" // USE_SWFTREE, SIZET_FMT
#endif
#include "log.h"
@@ -39,7 +39,7 @@
#include "sprite_definition.h"
#include "ActionExec.h"
#include "builtin_function.h"
-#include "smart_ptr.h"
+#include "smart_ptr.h" // GNASH_USE_GC
#include "VM.h"
#include "Range2d.h" // for getBounds
#include "GnashException.h"
@@ -93,8 +93,6 @@
//
//#define DEBUG_MOUSE_ENTITY_FINDING 1
-#define ONCE(x) { static bool warned=false; if (!warned) { warned=true; x; } }
-
// Forward declarations
static as_object* getMovieClipInterface();
static void attachMovieClipInterface(as_object& o);
@@ -290,7 +288,7 @@
boost::intrusive_ptr<sprite_instance> sprite =
ensureType<sprite_instance>(fn.this_ptr);
UNUSED(sprite);
- ONCE( log_unimpl("MovieClip.attachAudio()") );
+ LOG_ONCE( log_unimpl("MovieClip.attachAudio()") );
return as_value();
}
@@ -300,7 +298,7 @@
boost::intrusive_ptr<sprite_instance> sprite =
ensureType<sprite_instance>(fn.this_ptr);
UNUSED(sprite);
- ONCE( log_unimpl("MovieClip.attachVideo()") );
+ LOG_ONCE( log_unimpl("MovieClip.attachVideo()") );
return as_value();
}
@@ -769,7 +767,7 @@
// See http://sephiroth.it/reference.php?id=429
- ONCE( log_unimpl("MovieClip.unloadMovie()") );
+ LOG_ONCE( log_unimpl("MovieClip.unloadMovie()") );
return as_value();
}
@@ -925,7 +923,7 @@
boost::intrusive_ptr<sprite_instance> sprite =
ensureType<sprite_instance>(fn.this_ptr);
UNUSED(sprite);
- ONCE( log_unimpl("MovieClip.getURL()") );
+ LOG_ONCE( log_unimpl("MovieClip.getURL()") );
return as_value();
}
@@ -976,7 +974,7 @@
{
boost::intrusive_ptr<sprite_instance> sprite =
ensureType<sprite_instance>(fn.this_ptr);
- ONCE( log_unimpl("MovieClip.getTextSnapshot()") );
+ LOG_ONCE( log_unimpl("MovieClip.getTextSnapshot()") );
return as_value();
}
@@ -1725,7 +1723,7 @@
sprite->beginLinearGradientFill(gradients, mat);
}
- ONCE( log_debug("MovieClip.beginGradientFill() TESTING") );
+ LOG_ONCE( log_debug("MovieClip.beginGradientFill() TESTING") );
return as_value();
}
@@ -1870,7 +1868,7 @@
}
else // setter
{
- ONCE( log_unimpl("MovieClip._highquality setting") );
+ LOG_ONCE( log_unimpl("MovieClip._highquality setting") );
}
return as_value();
}
@@ -1890,7 +1888,7 @@
}
else // setter
{
- ONCE( log_unimpl("MovieClip._focusrect setting") );
+ LOG_ONCE( log_unimpl("MovieClip._focusrect setting") );
}
return as_value();
}
@@ -1908,7 +1906,7 @@
}
else // setter
{
- ONCE( log_unimpl("MovieClip._soundbuftime setting") );
+ LOG_ONCE( log_unimpl("MovieClip._soundbuftime setting") );
}
return as_value();
}
@@ -2814,7 +2812,7 @@
if ( get_loaded_frames() == 0 )
{
IF_VERBOSE_MALFORMED_SWF(
- ONCE( log_swferror(_("advance_sprite: no frames loaded for sprite/movie
%s"), getTarget()) );
+ LOG_ONCE( log_swferror(_("advance_sprite: no frames loaded for
sprite/movie %s"), getTarget()) );
);
return;
}
@@ -3999,7 +3997,7 @@
if ( ! hasFrames )
{
IF_VERBOSE_MALFORMED_SWF(
- ONCE( log_swferror(_("stagePlacementCallback: no frames loaded for
sprite/movie %s"), getTarget()) );
+ LOG_ONCE( log_swferror(_("stagePlacementCallback: no frames loaded for
sprite/movie %s"), getTarget()) );
);
}
#endif
Index: server/asobj/Key.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Key.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- server/asobj/Key.cpp 7 Feb 2008 10:07:58 -0000 1.52
+++ server/asobj/Key.cpp 21 Apr 2008 11:27:44 -0000 1.53
@@ -17,10 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
+#include "smart_ptr.h" // GNASH_USE_GC
#include "log.h"
#include "Key.h"
#include "fn_call.h"
Index: server/asobj/Key.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Key.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/asobj/Key.h 28 Mar 2008 16:23:08 -0000 1.37
+++ server/asobj/Key.h 21 Apr 2008 11:27:44 -0000 1.38
@@ -20,6 +20,7 @@
#ifndef __KEY_H__
#define __KEY_H__
+#include "smart_ptr.h" // GNASH_USE_GC
#include "as_object.h" // for inheritance
#include "fn_call.h"
#include "event_id.h"
Index: server/asobj/LoadVars.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/LoadVars.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- server/asobj/LoadVars.cpp 17 Apr 2008 08:05:37 -0000 1.47
+++ server/asobj/LoadVars.cpp 21 Apr 2008 11:27:44 -0000 1.48
@@ -17,15 +17,11 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
#include "LoadVars.h"
#include "as_object.h" // for inheritance
#include "log.h"
#include "fn_call.h"
-#include "smart_ptr.h" // for boost intrusive_ptr
+#include "smart_ptr.h" // GNASH_USE_GC
#include "builtin_function.h" // need builtin_function
#include "as_function.h" // for calling event handlers
#include "as_value.h" // for setting up a fn_call
@@ -279,7 +275,7 @@
callMethod(NSV::PROP_ON_DATA, dataVal);
#ifdef DEBUG_LOADS
- log_debug("Completed load, _loadThreads have now " SIZET_FMT "
elements", _loadThreads.size());
+ log_debug("Completed load, _loadThreads have now %d elements",
_loadThreads.size());
#endif
}
else
@@ -362,7 +358,7 @@
//
_loadThreads.push_front(lt.get());
#ifdef DEBUG_LOADS
- log_debug("Pushed thread %p to _loadThreads, number of LoadVars load
threads now: " SIZET_FMT, (void*)lt.get(), _loadThreads.size());
+ log_debug("Pushed thread %p to _loadThreads, number of LoadVars load
threads now: %d", (void*)lt.get(), _loadThreads.size());
#endif
lt.release();
Index: server/asobj/MovieClipLoader.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/MovieClipLoader.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- server/asobj/MovieClipLoader.cpp 28 Mar 2008 16:23:08 -0000 1.51
+++ server/asobj/MovieClipLoader.cpp 21 Apr 2008 11:27:44 -0000 1.52
@@ -21,6 +21,7 @@
#include "gnashconfig.h"
#endif
+#include "smart_ptr.h" // GNASH_USE_GC
#include "action.h" // for call_method
#include "as_value.h"
#include "as_object.h" // for inheritance
Index: server/asobj/NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- server/asobj/NetStream.cpp 7 Apr 2008 08:50:08 -0000 1.88
+++ server/asobj/NetStream.cpp 21 Apr 2008 11:27:44 -0000 1.89
@@ -24,6 +24,7 @@
#include "NetStream.h"
+#include "smart_ptr.h" // GNASH_USE_GC
#include "log.h"
#ifdef SOUND_GST
# include "NetStreamGst.h"
Index: server/asobj/NetStream.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- server/asobj/NetStream.h 7 Apr 2008 08:50:08 -0000 1.60
+++ server/asobj/NetStream.h 21 Apr 2008 11:27:44 -0000 1.61
@@ -27,6 +27,7 @@
#define __STDC_CONSTANT_MACROS
#endif
+#include "smart_ptr.h" // GNASH_USE_GC
#include "impl.h"
#include "video_stream_instance.h"
#include "NetConnection.h"
Index: server/asobj/SharedObject.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SharedObject.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/asobj/SharedObject.cpp 22 Mar 2008 02:35:57 -0000 1.37
+++ server/asobj/SharedObject.cpp 21 Apr 2008 11:27:44 -0000 1.38
@@ -399,7 +399,7 @@
vector<Element *>::iterator it;
vector<Element *> els = sol.getElements();
- log_debug("Read "SIZET_FMT" AMF objects from %s", els.size(),
newspec.c_str());
+ log_debug("Read %d AMF objects from %s", els.size(), newspec.c_str());
string_table& st = obj->getVM().getStringTable();
string_table::key dataKey = obj->getVM().getStringTable().find("data");
Index: server/asobj/Sound.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Sound.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- server/asobj/Sound.cpp 2 Apr 2008 15:50:51 -0000 1.30
+++ server/asobj/Sound.cpp 21 Apr 2008 11:27:44 -0000 1.31
@@ -43,8 +43,6 @@
#include <string>
-#define ONCE(x) { static bool warned=false; if (!warned) { warned=true; x; } }
-
namespace gnash {
static as_value sound_new(const fn_call& fn);
@@ -384,56 +382,56 @@
as_value
sound_getbytesloaded(const fn_call& /*fn*/)
{
- ONCE( log_unimpl ("Sound.getBytesLoaded()") );
+ LOG_ONCE( log_unimpl ("Sound.getBytesLoaded()") );
return as_value();
}
as_value
sound_getbytestotal(const fn_call& /*fn*/)
{
- ONCE( log_unimpl ("Sound.getBytesTotal()") );
+ LOG_ONCE( log_unimpl ("Sound.getBytesTotal()") );
return as_value();
}
as_value
sound_getpan(const fn_call& /*fn*/)
{
- ONCE( log_unimpl ("Sound.getDuration()") );
+ LOG_ONCE( log_unimpl ("Sound.getDuration()") );
return as_value();
}
as_value
sound_getDuration(const fn_call& /*fn*/)
{
- ONCE( log_unimpl ("Sound.getDuration()") );
+ LOG_ONCE( log_unimpl ("Sound.getDuration()") );
return as_value();
}
as_value
sound_setDuration(const fn_call& /*fn*/)
{
- ONCE( log_unimpl ("Sound.setDuration()") );
+ LOG_ONCE( log_unimpl ("Sound.setDuration()") );
return as_value();
}
as_value
sound_getPosition(const fn_call& /*fn*/)
{
- ONCE( log_unimpl ("Sound.getPosition()") );
+ LOG_ONCE( log_unimpl ("Sound.getPosition()") );
return as_value();
}
as_value
sound_setPosition(const fn_call& /*fn*/)
{
- ONCE( log_unimpl ("Sound.setPosition()") );
+ LOG_ONCE( log_unimpl ("Sound.setPosition()") );
return as_value();
}
as_value
sound_gettransform(const fn_call& /*fn*/)
{
- ONCE( log_unimpl ("Sound.getTransform()") );
+ LOG_ONCE( log_unimpl ("Sound.getTransform()") );
return as_value();
}
@@ -468,14 +466,14 @@
as_value
sound_setpan(const fn_call& /*fn*/)
{
- ONCE( log_unimpl ("Sound.setPan()") );
+ LOG_ONCE( log_unimpl ("Sound.setPan()") );
return as_value();
}
as_value
sound_settransform(const fn_call& /*fn*/)
{
- ONCE( log_unimpl ("Sound.setTransform()") );
+ LOG_ONCE( log_unimpl ("Sound.setTransform()") );
return as_value();
}
@@ -507,7 +505,7 @@
as_value
checkPolicyFile_getset(const fn_call& /*fn*/)
{
- ONCE( log_unimpl ("Sound.checkPolicyFile") );
+ LOG_ONCE( log_unimpl ("Sound.checkPolicyFile") );
return as_value();
}
@@ -520,7 +518,7 @@
//
// naive test shows this always being undefined..
//
- ONCE( log_unimpl ("Sound.areSoundsInaccessible()") );
+ LOG_ONCE( log_unimpl ("Sound.areSoundsInaccessible()") );
return as_value();
}
Index: server/asobj/Sound.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Sound.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/asobj/Sound.h 21 Jan 2008 20:55:58 -0000 1.9
+++ server/asobj/Sound.h 21 Apr 2008 11:27:44 -0000 1.10
@@ -27,6 +27,7 @@
#define __STDC_CONSTANT_MACROS
#endif
+#include "smart_ptr.h" // GNASH_USE_GC
#include "impl.h"
#include "as_object.h" // for inheritance
#include "NetConnection.h"
Index: server/asobj/TextFormat.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/TextFormat.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/asobj/TextFormat.cpp 11 Apr 2008 09:58:41 -0000 1.12
+++ server/asobj/TextFormat.cpp 21 Apr 2008 11:27:44 -0000 1.13
@@ -17,7 +17,6 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-
#include "log.h"
#include "Object.h" // for getObjectInterface
#include "TextFormat.h"
@@ -27,8 +26,7 @@
#include "VM.h"
#include "server/types.h" // for PIXELS_TO_TWIPS
#include "StringPredicates.h" // for parseAlignString
-
-#define ONCE(x) { static bool warned=false; if (!warned) { warned=true; x; } }
+#include "smart_ptr.h" // intrusive_ptr
namespace gnash {
@@ -88,21 +86,21 @@
as_value
TextFormat::display_getset(const fn_call& /*fn*/)
{
- ONCE( log_unimpl("TextField.display") );
+ LOG_ONCE( log_unimpl("TextField.display") );
return as_value();
}
as_value
TextFormat::bullet_getset(const fn_call& /*fn*/)
{
- ONCE( log_unimpl("TextField.bullet") );
+ LOG_ONCE( log_unimpl("TextField.bullet") );
return as_value();
}
as_value
TextFormat::tabStops_getset(const fn_call& /*fn*/)
{
- ONCE( log_unimpl("TextField.tabStops") );
+ LOG_ONCE( log_unimpl("TextField.tabStops") );
return as_value();
}
@@ -289,14 +287,14 @@
as_value
TextFormat::target_getset(const fn_call& /*fn*/)
{
- ONCE( log_unimpl("TextField.target") );
+ LOG_ONCE( log_unimpl("TextField.target") );
return as_value();
}
as_value
TextFormat::url_getset(const fn_call& /*fn*/)
{
- ONCE( log_unimpl("TextField.url") );
+ LOG_ONCE( log_unimpl("TextField.url") );
return as_value();
}
@@ -365,7 +363,7 @@
as_value
TextFormat::getTextExtent_method(const fn_call& /*fn*/)
{
- ONCE( log_unimpl("TextField.getTextExtent") );
+ LOG_ONCE( log_unimpl("TextField.getTextExtent") );
return as_value();
}
Index: server/asobj/string.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/string.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- server/asobj/string.cpp 8 Apr 2008 15:36:09 -0000 1.66
+++ server/asobj/string.cpp 21 Apr 2008 11:27:44 -0000 1.67
@@ -245,7 +245,7 @@
size_t retlen = end - start;
- log_debug("start: "SIZET_FMT", end: "SIZET_FMT", retlen: "SIZET_FMT,
start, end, retlen);
+ log_debug("start: %d, end: %d, retlen: %d", start, end, retlen);
return as_value(utf8::encodeCanonicalString(wstr.substr(start, retlen),
version));
}
Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- server/asobj/xml.cpp 17 Apr 2008 08:13:03 -0000 1.79
+++ server/asobj/xml.cpp 21 Apr 2008 11:27:45 -0000 1.80
@@ -439,7 +439,7 @@
//
_loadThreads.push_front(lt.get());
#ifdef DEBUG_XML_LOADS
- log_debug("Pushed thread %p to _loadThreads, number of XML load threads
now: " SIZET_FMT, (void*)lt.get(), _loadThreads.size());
+ log_debug("Pushed thread %p to _loadThreads, number of XML load threads
now: %d", (void*)lt.get(), _loadThreads.size());
#endif
lt.release();
@@ -533,7 +533,7 @@
callMethod(onDataKey, dataVal);
#ifdef DEBUG_XML_LOADS
- log_debug("Completed load, _loadThreads have now " SIZET_FMT "
elements", _loadThreads.size());
+ log_debug("Completed load, _loadThreads have now %d elements",
_loadThreads.size());
#endif
}
else
Index: server/asobj/xmlnode.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- server/asobj/xmlnode.cpp 28 Mar 2008 16:23:09 -0000 1.50
+++ server/asobj/xmlnode.cpp 21 Apr 2008 11:27:45 -0000 1.51
@@ -16,11 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h" // GNASH_USE_GC
-#endif
-
+#include "smart_ptr.h" // GNASH_USE_GC
#include "log.h"
#include "fn_call.h"
#include "builtin_function.h"
Index: server/asobj/xmlnode.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/asobj/xmlnode.h 28 Mar 2008 16:23:09 -0000 1.20
+++ server/asobj/xmlnode.h 21 Apr 2008 11:27:45 -0000 1.21
@@ -20,6 +20,7 @@
//#define DEBUG_MEMORY_ALLOCATION 1
+#include "smart_ptr.h" // GNASH_USE_GC
#include "action.h"
#include "impl.h"
Index: server/asobj/xmlsocket.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- server/asobj/xmlsocket.cpp 1 Apr 2008 09:26:54 -0000 1.45
+++ server/asobj/xmlsocket.cpp 21 Apr 2008 11:27:45 -0000 1.46
@@ -260,7 +260,7 @@
*eom = 0;
}
msgs.push_back( packet );
- log_debug(_("%d: Pushing Packet of size " SIZET_FMT " at %p"),
__LINE__, strlen(packet), packet);
+ log_debug(_("%d: Pushing Packet of size %d at %p"), __LINE__,
strlen(packet), packet);
processing(false);
return true;
}
@@ -660,10 +660,10 @@
std::vector<std::string > msgs;
if (obj.anydata(msgs))
{
- log_debug(_("Got " SIZET_FMT " messages: "), msgs.size());
+ log_debug(_("Got %d messages: "), msgs.size());
for (size_t i=0; i<msgs.size(); ++i)
{
- log_debug(_(" Message " SIZET_FMT " : %s "), i, msgs[i].c_str());
+ log_debug(_(" Message %d: %s "), i, msgs[i].c_str());
}
boost::intrusive_ptr<as_function> onDataHandler =
getEventHandler("onData");
Index: server/parser/BitmapMovieDefinition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/BitmapMovieDefinition.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/parser/BitmapMovieDefinition.cpp 12 Mar 2008 03:46:04 -0000
1.18
+++ server/parser/BitmapMovieDefinition.cpp 21 Apr 2008 11:27:45 -0000
1.19
@@ -17,11 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
-
+#include "smart_ptr.h" // GNASH_USE_GC
#include "BitmapMovieInstance.h"
#include "BitmapMovieDefinition.h"
#include "fill_style.h"
Index: server/parser/BitmapMovieDefinition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/BitmapMovieDefinition.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/parser/BitmapMovieDefinition.h 14 Feb 2008 19:17:03 -0000
1.13
+++ server/parser/BitmapMovieDefinition.h 21 Apr 2008 11:27:45 -0000
1.14
@@ -18,6 +18,7 @@
#ifndef GNASH_BITMAPMOVIEDEFINITION_H
#define GNASH_BITMAPMOVIEDEFINITION_H
+#include "smart_ptr.h" // GNASH_USE_GC
#include "movie_definition.h" // for inheritance
#include "rect.h" // for composition
#include "BitmapMovieInstance.h" // for create_movie_instance
Index: server/parser/bitmap_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/bitmap_character_def.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/parser/bitmap_character_def.h 21 Jan 2008 20:56:00 -0000
1.21
+++ server/parser/bitmap_character_def.h 21 Apr 2008 11:27:45 -0000
1.22
@@ -18,10 +18,7 @@
#ifndef GNASH_BITMAP_CHARACTER_DEF_H
#define GNASH_BITMAP_CHARACTER_DEF_H
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
+#include "smart_ptr.h" // GNASH_USE_GC
#include "gnash.h" // for bitmap_info definition
#include "ref_counted.h" // for character_def inheritance
#include "types.h"
Index: server/parser/button_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/button_character_def.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/parser/button_character_def.cpp 18 Apr 2008 21:30:54 -0000
1.32
+++ server/parser/button_character_def.cpp 21 Apr 2008 11:27:45 -0000
1.33
@@ -20,6 +20,7 @@
// Based on the public domain work of Thatcher Ulrich <address@hidden> 2003
+#include "smart_ptr.h" // GNASH_USE_GC
#include "button_character_def.h"
#include "button_character_instance.h" // for create_character_instance()
@@ -29,8 +30,6 @@
#include "filter_factory.h"
#include "gnash.h" // for gnash::key::codeMap
-#define ONCE(x) { static bool warned=false; if (!warned) { warned=true; x; } }
-
namespace gnash {
//
@@ -355,7 +354,7 @@
// Read the menu flag
// (this is a single bit, the other 7 bits are reserved)
m_menu = in->read_u8() != 0;
- if ( m_menu ) ONCE(log_unimpl("DEFINEBUTTON2 'menu' flag"));
+ if ( m_menu ) LOG_ONCE(log_unimpl("DEFINEBUTTON2 'menu' flag"));
// Read the action offset
unsigned button_2_action_offset = in->read_u16();
Index: server/parser/button_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/button_character_def.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/parser/button_character_def.h 18 Apr 2008 21:30:55 -0000
1.27
+++ server/parser/button_character_def.h 21 Apr 2008 11:27:45 -0000
1.28
@@ -22,7 +22,7 @@
#ifndef GNASH_BUTTON_CHARACTER_DEF_H
#define GNASH_BUTTON_CHARACTER_DEF_H
-
+#include "smart_ptr.h" // GNASH_USE_GC
#include "character_def.h"
#include "sound_definition.h"
#include "rect.h" // for get_bound
Index: server/parser/edit_text_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/edit_text_character_def.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/parser/edit_text_character_def.cpp 1 Apr 2008 18:36:22 -0000
1.19
+++ server/parser/edit_text_character_def.cpp 21 Apr 2008 11:27:45 -0000
1.20
@@ -20,6 +20,7 @@
// Based on the public domain text.cpp of Thatcher Ulrich <address@hidden> 2003
+#include "smart_ptr.h" // GNASH_USE_GC
#include "stream.h"
#include "log.h"
#include "movie_definition.h" // for m_root_def use
Index: server/parser/edit_text_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/edit_text_character_def.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/parser/edit_text_character_def.h 9 Apr 2008 20:52:46 -0000
1.27
+++ server/parser/edit_text_character_def.h 21 Apr 2008 11:27:45 -0000
1.28
@@ -18,6 +18,7 @@
#ifndef _GNASH_EDIT_TEXT_CHARACTER_DEF_H_
#define _GNASH_EDIT_TEXT_CHARACTER_DEF_H_
+#include "smart_ptr.h" // GNASH_USE_GC
#include "types.h"
#include "character_def.h" // for inheritance
#include "rect.h" // for composition
Index: server/parser/morph2_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/morph2_character_def.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/parser/morph2_character_def.h 1 Dec 2007 15:40:59 -0000
1.5
+++ server/parser/morph2_character_def.h 21 Apr 2008 11:27:45 -0000
1.6
@@ -6,6 +6,7 @@
#ifndef GNASH_MORPH2_H
#define GNASH_MORPH2_H
+#include "smart_ptr.h" // GNASH_USE_GC
#include "shape.h"
#include "shape_character_def.h" // for inheritance of morph2_character_def
Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- server/parser/movie_def_impl.cpp 19 Apr 2008 19:22:41 -0000 1.105
+++ server/parser/movie_def_impl.cpp 21 Apr 2008 11:27:45 -0000 1.106
@@ -21,6 +21,7 @@
#include "gnashconfig.h"
#endif
+#include "smart_ptr.h" // GNASH_USE_GC
#include "movie_def_impl.h"
#include "movie_definition.h" // for inheritance
#include "sprite_instance.h" // for ??
Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- server/parser/movie_def_impl.h 17 Apr 2008 10:58:01 -0000 1.71
+++ server/parser/movie_def_impl.h 21 Apr 2008 11:27:45 -0000 1.72
@@ -18,7 +18,7 @@
#ifndef GNASH_MOVIE_DEF_IMPL_H
#define GNASH_MOVIE_DEF_IMPL_H
-#include "smart_ptr.h"
+#include "smart_ptr.h" // GNASH_USE_GC
#include "fontlib.h"
#include "font.h"
#include "jpeg.h"
Index: server/parser/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- server/parser/shape_character_def.cpp 5 Mar 2008 03:56:03 -0000
1.68
+++ server/parser/shape_character_def.cpp 21 Apr 2008 11:27:45 -0000
1.69
@@ -22,8 +22,9 @@
// Quadratic bezier outline shapes are the basis for most SWF rendering.
-#include "shape_character_def.h"
+#include "shape_character_def.h"
+#include "smart_ptr.h" // GNASH_USE_GC
#include "impl.h"
#include "log.h"
#include "render.h"
Index: server/parser/shape_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/parser/shape_character_def.h 5 Mar 2008 03:56:03 -0000 1.21
+++ server/parser/shape_character_def.h 21 Apr 2008 11:27:45 -0000 1.22
@@ -9,8 +9,8 @@
#ifndef GNASH_SHAPE_CHARACTER_DEF_H
#define GNASH_SHAPE_CHARACTER_DEF_H
-
#include "character_def.h" // for inheritance of shape_character_def
+#include "smart_ptr.h" // GNASH_USE_GC
#include "shape.h" // for path
#include "rect.h" // for composition
Index: server/parser/sprite_definition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/parser/sprite_definition.cpp 10 Apr 2008 03:52:07 -0000 1.32
+++ server/parser/sprite_definition.cpp 21 Apr 2008 11:27:45 -0000 1.33
@@ -20,6 +20,7 @@
#include "gnashconfig.h"
#endif
+#include "smart_ptr.h" // GNASH_USE_GC
#include "sprite_instance.h"
#include "sprite_definition.h"
#include "ControlTag.h" // for dtor visibility
@@ -35,8 +36,6 @@
// members of classes registered to definitions.
//#define DEBUG_REGISTER_CLASS 1
-#define ONCE(x) { static bool warned=false; if (!warned) { warned=true; x; } }
-
namespace gnash {
character*
Index: server/parser/sprite_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- server/parser/sprite_definition.h 10 Apr 2008 03:52:07 -0000 1.41
+++ server/parser/sprite_definition.h 21 Apr 2008 11:27:46 -0000 1.42
@@ -20,12 +20,9 @@
#ifndef GNASH_SPRITE_DEFINITION_H
#define GNASH_SPRITE_DEFINITION_H
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
#include <vector>
-
+#include "smart_ptr.h" // GNASH_USE_GC
#include "movie_definition.h"
#include "stream.h"
#include "log.h"
Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -b -r1.194 -r1.195
--- server/swf/tag_loaders.cpp 9 Apr 2008 09:28:59 -0000 1.194
+++ server/swf/tag_loaders.cpp 21 Apr 2008 11:27:46 -0000 1.195
@@ -19,7 +19,7 @@
#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
+#include "gnashconfig.h" // HAVE_ZLIB_H
#endif
#include "tu_file.h"
@@ -60,8 +60,6 @@
#endif
#include <map>
-#define ONCE(x) { static bool warned=false; if (!warned) { warned=true; x; } }
-
namespace gnash {
// @@ TODO get rid of this; make it the normal mode.
@@ -1269,7 +1267,7 @@
// quoted from
//
http://www-lehre.informatik.uni-osnabrueck.de/~fbstark/diplom/docs/swf/Sounds.htm
//
- ONCE ( if ( delay_seek ) log_unimpl("MP3 delay seek") );
+ LOG_ONCE ( if ( delay_seek ) log_unimpl("MP3 delay seek") );
}
IF_VERBOSE_PARSE
@@ -1423,7 +1421,7 @@
{
in->ensureBytes(2);
latency = in->read_s16(); // UNUSED !!
- ONCE ( if ( latency ) log_unimpl("MP3 stream latency seek") );
+ LOG_ONCE ( if ( latency ) log_unimpl("MP3 stream latency seek")
);
}
catch (ParserException& ex)
{
@@ -1495,14 +1493,14 @@
// FIXME: use these values !
unsigned int samplesCount = in->read_u16(); UNUSED(samplesCount);
unsigned int seekSamples = in->read_u16();
- ONCE ( if ( seekSamples ) log_unimpl("MP3 soundblock seek samples") );
+ LOG_ONCE ( if ( seekSamples ) log_unimpl("MP3 soundblock seek samples")
);
}
unsigned int data_bytes = in->get_tag_end_position() - in->get_position();
if ( ! data_bytes )
{
IF_VERBOSE_MALFORMED_SWF(
- ONCE( log_swferror("Empty SOUNDSTREAMBLOCK tag, seems common waste of
space") );
+ LOG_ONCE( log_swferror("Empty SOUNDSTREAMBLOCK tag, seems common waste
of space") );
);
return;
}
Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -b -r1.226 -r1.227
--- server/vm/ASHandlers.cpp 4 Apr 2008 14:54:46 -0000 1.226
+++ server/vm/ASHandlers.cpp 21 Apr 2008 11:27:46 -0000 1.227
@@ -19,9 +19,10 @@
#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
+#include "gnashconfig.h" // SIZET_FMT
#endif
+#include "smart_ptr.h" // GNASH_USE_GC
#include "log.h"
#include "swf.h"
#include "rc.h"
Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- server/vm/ActionExec.cpp 17 Mar 2008 17:27:57 -0000 1.70
+++ server/vm/ActionExec.cpp 21 Apr 2008 11:27:46 -0000 1.71
@@ -19,7 +19,7 @@
#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
+#include "gnashconfig.h" // SIZET_FMT
#endif
#include "ActionExec.h"
Index: server/vm/ExecutableCode.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ExecutableCode.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/vm/ExecutableCode.h 28 Mar 2008 16:23:09 -0000 1.16
+++ server/vm/ExecutableCode.h 21 Apr 2008 11:27:46 -0000 1.17
@@ -23,7 +23,7 @@
#include "gnashconfig.h"
#endif
-#include "smart_ptr.h"
+#include "smart_ptr.h" // GNASH_USE_GC
#include "as_function.h"
#include "sprite_instance.h"
#include "ActionExec.h"
Index: server/vm/VM.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/VM.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/vm/VM.cpp 15 Apr 2008 15:18:02 -0000 1.34
+++ server/vm/VM.cpp 21 Apr 2008 11:27:46 -0000 1.35
@@ -22,6 +22,7 @@
#endif
#include "VM.h"
+#include "smart_ptr.h" // GNASH_USE_GC
#include "builtin_function.h"
#include "movie_definition.h"
#include "movie_instance.h"
Index: server/vm/VM.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/VM.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/vm/VM.h 15 Apr 2008 15:18:02 -0000 1.27
+++ server/vm/VM.h 21 Apr 2008 11:27:46 -0000 1.28
@@ -23,7 +23,7 @@
#include "gnashconfig.h"
#endif
-#include "smart_ptr.h" // for boost::intrusive_ptr
+#include "smart_ptr.h" // GNASH_USE_GC
#include "movie_root.h" // for composition
#include "GC.h" // for ineritance of VmGcRoot
#include "string_table.h" // for the string table
Index: libbase/log.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- libbase/log.h 10 Apr 2008 07:24:02 -0000 1.76
+++ libbase/log.h 21 Apr 2008 11:27:46 -0000 1.77
@@ -45,12 +45,9 @@
#define _(String) gettext (String)
#define N_(String) gettext_noop (String)
-// This macro should be used to add both boost formatting and
-// internationalization to log messages. The po directory
-// Makefile must also look for the BF macro for gettext
-// processing, otherwise they will not appear in the
-// translation (.po) files.
-//#define BF(x) logFormat(_(x))
+// Macro to prevent repeated logging calls for the same
+// event
+#define LOG_ONCE(x) { static bool warned = false; if (!warned) { warned =
true; x; } }
// Define to switch between printf-style log formatting
// and boost::format