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

Remove BOOST_AUTO from transportsender.cc

Browse Source
This commit is contained in:
Keegan McAllister
2012-03-14 01:55:52 -04:00
committed by Keith Winstein
parent cc8b1f293a
commit 5904d4f5e6
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/transportsender.cc
+4 -3
View File
@@ -17,7 +17,6 @@
*/ */
#include <boost/lambda/lambda.hpp> #include <boost/lambda/lambda.hpp>
#include <boost/typeof/typeof.hpp>
#include <algorithm> #include <algorithm>
#include <list> #include <list>
#include <stdio.h> #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 ) ); sent_states.push_back( TimestampedState<MyState>( the_timestamp, num, state ) );
if ( sent_states.size() > 32 ) { /* limit on state queue */ 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--; } for ( int i = 0; i < 16; i++ ) { last--; }
sent_states.erase( last ); /* erase state from middle of queue */ 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() ); 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() ); connection->send( i->tostring() );
if ( verbose ) { if ( verbose ) {
src/network/transportsender.h
+3 -2
View File
@@ -59,12 +59,13 @@ namespace Network {
MyState current_state; 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 */ /* first element: known, acknowledged receiver state */
/* last element: last sent state */ /* last element: last sent state */
/* somewhere in the middle: the assumed state of the receiver */ /* 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 */ /* for fragment creation */
Fragmenter fragmenter; Fragmenter fragmenter;