izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove boost::lambda remaining instances from terminaloverlay.cc

Browse Source
This commit is contained in:
Keegan McAllister
2012-03-14 05:00:33 -04:00
committed by Keith Winstein
parent 06fa8eaedb
commit 2675f13676
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontend/terminaloverlay.cc
+11 -6
View File
@@ -16,8 +16,6 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <boost/lambda/lambda.hpp>
#include <boost/lambda/bind.hpp>
#include <algorithm> #include <algorithm>
#include <wchar.h> #include <wchar.h>
#include <list> #include <list>
@@ -26,7 +24,6 @@
#include "terminaloverlay.h" #include "terminaloverlay.h"
using namespace boost::lambda;
using namespace Overlay; using namespace Overlay;
using std::max; using std::max;
using std::mem_fun_ref; using std::mem_fun_ref;
@@ -330,7 +327,7 @@ void PredictionEngine::apply( Framebuffer &fb ) const
void PredictionEngine::kill_epoch( uint64_t epoch, const Framebuffer &fb ) void PredictionEngine::kill_epoch( uint64_t epoch, const Framebuffer &fb )
{ {
cursors.remove_if( bind( &ConditionalCursorMove::tentative, _1, epoch - 1 ) ); cursors.remove_if( bind2nd( mem_fun_ref( &ConditionalCursorMove::tentative ), epoch - 1 ) );
cursors.push_back( ConditionalCursorMove( local_frame_sent + 1, cursors.push_back( ConditionalCursorMove( local_frame_sent + 1,
fb.ds.get_cursor_row(), fb.ds.get_cursor_row(),
@@ -532,8 +529,16 @@ void PredictionEngine::cull( const Framebuffer &fb )
} }
} }
cursors.remove_if( bind( &ConditionalCursorMove::get_validity, _1, var(fb), /* NB: switching from list to another STL container could break this code.
local_frame_acked, local_frame_late_acked ) != Pending ); So we don't use the cursors_t typedef. */
for ( list<ConditionalCursorMove>::iterator it = cursors.begin();
it != cursors.end(); ) {
if ( it->get_validity( fb, local_frame_acked, local_frame_late_acked ) != Pending ) {
it = cursors.erase( it );
} else {
it++;
}
}
} }
ConditionalOverlayRow & PredictionEngine::get_or_make_row( int row_num, int num_cols ) ConditionalOverlayRow & PredictionEngine::get_or_make_row( int row_num, int num_cols )