[Gnash-commit] /srv/bzr/gnash/trunk r11999: Minor cleanups.

[Bastiaan Jacques]

------------------------------------------------------------
revno: 11999
committer: Bastiaan Jacques <address@hidden>
branch nick: trunk
timestamp: Tue 2010-03-09 03:52:16 +0100
message:
  Minor cleanups.
modified:
  libcore/asobj/flash/net/SharedObject_as.cpp
  libcore/movie_root.cpp
  libcore/parser/SWFMovieDefinition.h

=== modified file 'libcore/asobj/flash/net/SharedObject_as.cpp'
--- a/libcore/asobj/flash/net/SharedObject_as.cpp       2010-02-20 07:55:10 
+0000
+++ b/libcore/asobj/flash/net/SharedObject_as.cpp       2010-03-09 02:52:16 
+0000
@@ -458,7 +458,7 @@
 SharedObjectLibrary::markReachableResources() const
 {
     foreachSecond(_soLib.begin(), _soLib.end(),
-            std::mem_fun(&SharedObject_as::setReachable));
+                  &SharedObject_as::setReachable);
 }
 
 /// The SharedObjectLibrary keeps all known SharedObjects alive. They must

=== modified file 'libcore/movie_root.cpp'
--- a/libcore/movie_root.cpp    2010-01-18 15:16:10 +0000
+++ b/libcore/movie_root.cpp    2010-03-09 02:52:16 +0000
@@ -1630,7 +1630,7 @@
     }
 
     foreachSecond(expiredTimers.begin(), expiredTimers.end(),
-            std::mem_fun(&Timer::executeAndReset));
+                  &Timer::executeAndReset);
 
     if (!expiredTimers.empty()) processActionQueue();
 
@@ -1640,8 +1640,7 @@
 void
 movie_root::markReachableResources() const
 {
-    foreachSecond(_movies.rbegin(), _movies.rend(),
-            std::mem_fun(&MovieClip::setReachable));
+    foreachSecond(_movies.rbegin(), _movies.rend(), &MovieClip::setReachable);
 
     // Mark original top-level movie
     // This should always be in _movies, but better make sure
@@ -1652,7 +1651,7 @@
     
     // Mark timer targets
     foreachSecond(_intervalTimers.begin(), _intervalTimers.end(),
-            std::mem_fun(&Timer::markReachableResources));
+                  &Timer::markReachableResources);
 
     std::for_each(_objectCallbacks.begin(), _objectCallbacks.end(),
             std::mem_fun(&ActiveRelay::setReachable));
@@ -1773,7 +1772,7 @@
     //       in local display lists must happen at the *end* of global action
     //       queue processing.
     foreachSecond(_movies.rbegin(), _movies.rend(),
-            std::mem_fun(&MovieClip::cleanupDisplayList));
+                  &MovieClip::cleanupDisplayList);
 
     // Now remove from the instance list any unloaded DisplayObject
     // Note that some DisplayObjects may be unloaded but not yet destroyed,

=== modified file 'libcore/parser/SWFMovieDefinition.h'
--- a/libcore/parser/SWFMovieDefinition.h       2010-03-08 19:32:07 +0000
+++ b/libcore/parser/SWFMovieDefinition.h       2010-03-09 02:52:16 +0000
@@ -150,8 +150,8 @@
     /// Mark all dictionary items to be reachable (for GC)
     void markReachableResources() const
     {
-        foreachSecond(_map.begin(), _map.end(),
-                boost::mem_fn(&SWF::DefinitionTag::setReachable));
+        foreachSecond(_map.begin(), _map.end(), 
+                      &SWF::DefinitionTag::setReachable);
     }
 #endif