[Gnash-commit] /srv/bzr/gnash/trunk r11995: Minor changes for swfmill version and other cleanups.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 11995 [merge]
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Mon 2010-03-08 20:59:09 +0100
message:
  Minor changes for swfmill version and other cleanups.
modified:
  configure.ac
  libcore/parser/SWFMovieDefinition.h

=== modified file 'configure.ac'
--- a/configure.ac      2010-02-26 03:34:11 +0000
+++ b/configure.ac      2010-03-08 19:32:13 +0000
@@ -1881,7 +1881,7 @@
 
 dnl SWFMILL versions older than 0.3 didn't get function2 flags order correctly
 AM_CONDITIONAL(SWFMILL_FUNCTION2_FLAGS_ORDER_CORRECT,
-        [ test x"$SWFMILL" != x && test $SWFMILL_VERSION -ge 00030000 ])
+        [ test x"$SWFMILL" != x && test $SWFMILL_VERSION -ge 00021206 ])
 
 AM_CONDITIONAL(ENABLE_AS3COMPILE, [ test x"$AS3COMPILE" != x ])
 AM_CONDITIONAL(ENABLE_MTASC, [ test x"$MTASC" != x ])

=== modified file 'libcore/parser/SWFMovieDefinition.h'
--- a/libcore/parser/SWFMovieDefinition.h       2010-01-18 09:07:31 +0000
+++ b/libcore/parser/SWFMovieDefinition.h       2010-03-08 19:32:07 +0000
@@ -35,6 +35,7 @@
 #include "StringPredicates.h" 
 #include "SWFRect.h"
 #include "GnashNumeric.h"
+#include "GnashAlgorithm.h"
 
 #include <map> // for CharacterDictionary
 #include <set> // for _importSources
@@ -45,7 +46,6 @@
 #include <boost/thread/barrier.hpp>
 #include <boost/scoped_ptr.hpp>
 
-//
 // Forward declarations
 namespace gnash {
     class SWFMovieDefinition;
@@ -57,13 +57,9 @@
     class Font;
 }
 
-namespace gnash
-{
+namespace gnash {
 
-/// \brief
-/// SWFMovieDefinition helper class handling start and execution of
-/// an SWF loading thread
-///
+/// Helper class handling start and execution of a loading thread
 class SWFMovieLoader
 {
 public:
@@ -154,10 +150,8 @@
     /// Mark all dictionary items to be reachable (for GC)
     void markReachableResources() const
     {
-        for(CharacterConstIterator i=_map.begin(), e=_map.end(); i!=e; ++i)
-        {
-            i->second->setReachable();
-        }
+        foreachSecond(_map.begin(), _map.end(),
+                boost::mem_fn(&SWF::DefinitionTag::setReachable));
     }
 #endif