[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash/libnet cque.cpp
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash/libnet cque.cpp |
Date: |
Mon, 07 Apr 2008 20:37:10 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/04/07 20:37:10
Modified files:
libnet : cque.cpp
Log message:
Fix ::merge to maintain order of buffers
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/cque.cpp?cvsroot=gnash&r1=1.12&r2=1.13
Patches:
Index: cque.cpp
===================================================================
RCS file: /sources/gnash/gnash/libnet/cque.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- cque.cpp 7 Apr 2008 20:25:15 -0000 1.12
+++ cque.cpp 7 Apr 2008 20:37:10 -0000 1.13
@@ -240,17 +240,7 @@
// Finally erase all merged elements, and replace with the composite one
Que::iterator nextIter = _que.erase(from, to);
-
- // NOTE: nextIter points now right after the last erased
- // element. Sounds like a good place to put the new merged buffer
- // to me, but the original code always did push_back so dunno
- // what's the correct behaviour
- //
- // Next line puts newbuf in place of the removed ones:
- //
- // _que.insert(nextIter, newbuf);
- //
- _que.push_back(newbuf.get()); // <-- this is what the old code was doing
+ _que.insert(nextIter, newbuf.get());
return newbuf.release(); // ownership is transferred. TODO: return auto_ptr
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash/libnet cque.cpp,
Sandro Santilli <=