[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r10770: Fix paranoia build.
From: |
Benjamin Wolsey |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r10770: Fix paranoia build. |
Date: |
Sat, 04 Apr 2009 22:24:16 +0200 |
User-agent: |
Bazaar (1.5) |
------------------------------------------------------------
revno: 10770
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Sat 2009-04-04 22:24:16 +0200
message:
Fix paranoia build.
modified:
libcore/movie_root.cpp
libcore/movie_root.h
------------------------------------------------------------
revno: 10769.1.1
committer: Benjamin Wolsey <address@hidden>
branch nick: work
timestamp: Sat 2009-04-04 22:08:19 +0200
message:
Drop AdvanceableChar typedef as it seems to be a synonym for
DisplayObject*;
various kinds of DisplayObjects - not only MovieClips - need to advance on
each frame.
Fix paranoia build.
modified:
libcore/movie_root.cpp
libcore/movie_root.h
=== modified file 'libcore/movie_root.cpp'
--- a/libcore/movie_root.cpp 2009-04-04 15:35:18 +0000
+++ b/libcore/movie_root.cpp 2009-04-04 20:08:19 +0000
@@ -1985,7 +1985,7 @@
// Remove unloaded DisplayObjects from the _liveChars list
for (LiveChars::iterator i=_liveChars.begin(),
e=_liveChars.end(); i!=e;)
{
- AdvanceableCharacter ch = *i;
+ DisplayObject* ch = *i;
if ( ch->isUnloaded() )
{
// the sprite might have been destroyed already
=== modified file 'libcore/movie_root.h'
--- a/libcore/movie_root.h 2009-04-04 15:35:18 +0000
+++ b/libcore/movie_root.h 2009-04-04 20:08:19 +0000
@@ -605,7 +605,7 @@
assert(std::find(_liveChars.begin(), _liveChars.end(), ch) ==
_liveChars.end());
#endif
- _liveChars.push_front(ch);
+ _liveChars.push_front(ch.get());
}
/// Cleanup all resources and run the GC collector
@@ -922,16 +922,13 @@
/// Delete all elements on the timers list
void clearIntervalTimers();
- /// An element of the advanceable DisplayObjects
- typedef boost::intrusive_ptr<DisplayObject> AdvanceableCharacter;
-
/// A list of AdvanceableCharacters
//
/// This is a list (not a vector) as we want to allow
/// ::advance of each element to insert new DisplayObjects before
/// the start w/out invalidating iterators scanning the
/// list forward for proper movie advancement
- typedef std::list<AdvanceableCharacter> LiveChars;
+ typedef std::list<DisplayObject*> LiveChars;
/// The list of advanceable DisplayObject, in placement order
LiveChars _liveChars;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r10770: Fix paranoia build.,
Benjamin Wolsey <=