From 83694977a75e3681d3b738147f3553d30fbc4c4d Mon Sep 17 00:00:00 2001
From: Keegan McAllister <mcallister.keegan@gmail.com>
Date: Wed, 14 Mar 2012 03:36:43 -0400
Subject: [PATCH] Remove boost::lambda from transportsender.cc

---
 src/network/transportsender.cc | 9 ++++-----
 src/network/transportstate.h   | 4 ++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/network/transportsender.cc b/src/network/transportsender.cc
index 1564d84..86fb31c 100644
--- a/src/network/transportsender.cc
+++ b/src/network/transportsender.cc
@@ -16,7 +16,6 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <boost/lambda/lambda.hpp>
 #include <algorithm>
 #include <list>
 #include <stdio.h>
@@ -26,7 +25,6 @@
 #include "transportsender.h"
 #include "transportfragment.h"
 
-using namespace boost::lambda;
 using namespace Network;
 using namespace std;
 
@@ -312,9 +310,10 @@ void TransportSender<MyState>::process_acknowledgment_through( uint64_t ack_num
 {
   /* Ignore ack if we have culled the state it's acknowledging */
 
-  if ( sent_states.end() != find_if( sent_states.begin(), sent_states.end(),
-				     (&_1)->*&TimestampedState<MyState>::num == ack_num ) ) {
-    sent_states.remove_if( (&_1)->*&TimestampedState<MyState>::num < ack_num );
+  if ( sent_states.end() !=
+       find_if( sent_states.begin(), sent_states.end(),
+		bind2nd( mem_fun_ref( &TimestampedState<MyState>::num_eq ), ack_num ) ) ) {
+    sent_states.remove_if( bind2nd( mem_fun_ref( &TimestampedState<MyState>::num_lt ), ack_num ) );
   }
 
   assert( !sent_states.empty() );
diff --git a/src/network/transportstate.h b/src/network/transportstate.h
index d88efef..09a3a75 100644
--- a/src/network/transportstate.h
+++ b/src/network/transportstate.h
@@ -31,6 +31,10 @@ namespace Network {
     TimestampedState( uint64_t s_timestamp, uint64_t s_num, State &s_state )
       : timestamp( s_timestamp ), num( s_num ), state( s_state )
     {}
+
+    /* For use with find_if, remove_if */
+    bool num_eq( uint64_t v ) const { return num == v; }
+    bool num_lt( uint64_t v ) const { return num <  v; }
   };
 }