From 5320fbd346bb5ee1d3f1a03cbcc37c691e8273ce Mon Sep 17 00:00:00 2001 From: Keegan McAllister Date: Wed, 14 Mar 2012 02:08:10 -0400 Subject: [PATCH] Remove BOOST_AUTO from completeterminal.cc --- src/statesync/completeterminal.cc | 7 ++++--- src/statesync/completeterminal.h | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/statesync/completeterminal.cc b/src/statesync/completeterminal.cc index 8f37145..9f8f97c 100644 --- a/src/statesync/completeterminal.cc +++ b/src/statesync/completeterminal.cc @@ -16,7 +16,6 @@ along with this program. If not, see . */ -#include #include #include "completeterminal.h" @@ -112,7 +111,9 @@ bool Complete::set_echo_ack( uint64_t now ) bool ret = false; uint64_t newest_echo_ack = 0; - for ( BOOST_AUTO( i, input_history.begin() ); i != input_history.end(); i++ ) { + for ( input_history_t::const_iterator i = input_history.begin(); + i != input_history.end(); + i++ ) { if ( i->second < now - ECHO_TIMEOUT ) { newest_echo_ack = i->first; } @@ -140,7 +141,7 @@ int Complete::wait_time( uint64_t now ) const return INT_MAX; } - BOOST_AUTO( it, input_history.begin() ); + input_history_t::const_iterator it = input_history.begin(); it++; uint64_t next_echo_ack_time = it->second + ECHO_TIMEOUT; diff --git a/src/statesync/completeterminal.h b/src/statesync/completeterminal.h index 384adc1..53bac2f 100644 --- a/src/statesync/completeterminal.h +++ b/src/statesync/completeterminal.h @@ -34,7 +34,8 @@ namespace Terminal { Terminal::Emulator terminal; Terminal::Display display; - std::list< std::pair > input_history; + typedef std::list< std::pair > input_history_t; + input_history_t input_history; uint64_t echo_ack; static const int ECHO_TIMEOUT = 50; /* for late ack */