From 06fa8eaedb6c11af977fb3fa0da90571e01ad235 Mon Sep 17 00:00:00 2001 From: Keegan McAllister Date: Wed, 14 Mar 2012 04:09:17 -0400 Subject: [PATCH] Remove boost::lambda from PredictionEngine::get_or_make_row --- src/frontend/terminaloverlay.cc | 5 +++-- src/frontend/terminaloverlay.h | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/frontend/terminaloverlay.cc b/src/frontend/terminaloverlay.cc index ee8a615..be09a30 100644 --- a/src/frontend/terminaloverlay.cc +++ b/src/frontend/terminaloverlay.cc @@ -538,8 +538,9 @@ void PredictionEngine::cull( const Framebuffer &fb ) ConditionalOverlayRow & PredictionEngine::get_or_make_row( int row_num, int num_cols ) { - overlays_t::iterator it = find_if( overlays.begin(), overlays.end(), - (&_1)->*&ConditionalOverlayRow::row_num == row_num ); + overlays_t::iterator it = + find_if( overlays.begin(), overlays.end(), + bind2nd( mem_fun_ref( &ConditionalOverlayRow::row_num_eq ), row_num ) ); if ( it != overlays.end() ) { return *it; diff --git a/src/frontend/terminaloverlay.h b/src/frontend/terminaloverlay.h index 71ef3f2..a7210cb 100644 --- a/src/frontend/terminaloverlay.h +++ b/src/frontend/terminaloverlay.h @@ -117,6 +117,9 @@ namespace Overlay { void apply( Framebuffer &fb, uint64_t confirmed_epoch, bool flag ) const; + /* For use with find_if */ + bool row_num_eq( int v ) const { return row_num == v; } + ConditionalOverlayRow( int s_row_num ) : row_num( s_row_num ), overlay_cells() {} };