From 5904d4f5e69dee04aeb3e28df410dd5622da9f75 Mon Sep 17 00:00:00 2001
From: Keegan McAllister <mcallister.keegan@gmail.com>
Date: Wed, 14 Mar 2012 01:55:52 -0400
Subject: [PATCH] Remove BOOST_AUTO from transportsender.cc

---
 src/network/transportsender.cc | 7 ++++---
 src/network/transportsender.h  | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/network/transportsender.cc b/src/network/transportsender.cc
index 2566bcc..1564d84 100644
--- a/src/network/transportsender.cc
+++ b/src/network/transportsender.cc
@@ -17,7 +17,6 @@
 */
 
 #include <boost/lambda/lambda.hpp>
-#include <boost/typeof/typeof.hpp>
 #include <algorithm>
 #include <list>
 #include <stdio.h>
@@ -184,7 +183,7 @@ void TransportSender<MyState>::add_sent_state( uint64_t the_timestamp, uint64_t
 {
   sent_states.push_back( TimestampedState<MyState>( the_timestamp, num, state ) );
   if ( sent_states.size() > 32 ) { /* limit on state queue */
-    BOOST_AUTO( last, sent_states.end() );
+    typename sent_states_t::iterator last = sent_states.end();
     for ( int i = 0; i < 16; i++ ) { last--; }
     sent_states.erase( last ); /* erase state from middle of queue */
   }
@@ -290,7 +289,9 @@ void TransportSender<MyState>::send_in_fragments( string diff, uint64_t new_num
 
   vector<Fragment> fragments = fragmenter.make_fragments( inst, connection->get_MTU() );
 
-  for ( BOOST_AUTO( i, fragments.begin() ); i != fragments.end(); i++ ) {
+  for ( vector<Fragment>::iterator i = fragments.begin();
+        i != fragments.end();
+        i++ ) {
     connection->send( i->tostring() );
 
     if ( verbose ) {
diff --git a/src/network/transportsender.h b/src/network/transportsender.h
index a47e6dd..7b88311 100644
--- a/src/network/transportsender.h
+++ b/src/network/transportsender.h
@@ -59,12 +59,13 @@ namespace Network {
 
     MyState current_state;
 
-    list< TimestampedState<MyState> > sent_states;
+    typedef list< TimestampedState<MyState> > sent_states_t;
+    sent_states_t sent_states;
     /* first element: known, acknowledged receiver state */
     /* last element: last sent state */
 
     /* somewhere in the middle: the assumed state of the receiver */
-    typename list< TimestampedState<MyState> >::iterator assumed_receiver_state;
+    typename sent_states_t::iterator assumed_receiver_state;
 
     /* for fragment creation */
     Fragmenter fragmenter;