From fb23168ed91697093ac9fe3ba21c923ca93cf418 Mon Sep 17 00:00:00 2001 From: John Hood Date: Wed, 15 Aug 2018 01:44:54 -0400 Subject: [PATCH] Always use std::min, std::max. --- src/frontend/mosh-server.cc | 8 ++++---- src/frontend/stmclient.cc | 4 ++-- src/frontend/terminaloverlay.cc | 1 - src/network/transportsender-impl.h | 6 +++--- src/terminal/terminalfunctions.cc | 2 +- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/frontend/mosh-server.cc b/src/frontend/mosh-server.cc index 1d48a54..cc938de 100644 --- a/src/frontend/mosh-server.cc +++ b/src/frontend/mosh-server.cc @@ -682,11 +682,11 @@ static void serve( int host_fd, Terminal::Complete &terminal, ServerConnection & int timeout = INT_MAX; uint64_t now = Network::timestamp(); - timeout = min( timeout, network.wait_time() ); - timeout = min( timeout, terminal.wait_time( now ) ); + timeout = std::min( timeout, network.wait_time() ); + timeout = std::min( timeout, terminal.wait_time( now ) ); if ( (!network.get_remote_state_num()) || network.shutdown_in_progress() ) { - timeout = min( timeout, 5000 ); + timeout = std::min( timeout, 5000 ); } /* * The server goes completely asleep if it has no remote peer. @@ -701,7 +701,7 @@ static void serve( int host_fd, Terminal::Complete &terminal, ServerConnection & /* 24 days might be too soon. That's OK. */ network_sleep = INT_MAX; } - timeout = min( timeout, static_cast(network_sleep) ); + timeout = std::min( timeout, static_cast(network_sleep) ); } /* poll for events */ diff --git a/src/frontend/stmclient.cc b/src/frontend/stmclient.cc index 22f4d75..8522ecd 100644 --- a/src/frontend/stmclient.cc +++ b/src/frontend/stmclient.cc @@ -439,11 +439,11 @@ bool STMClient::main( void ) try { output_new_frame(); - int wait_time = min( network->wait_time(), overlays.wait_time() ); + int wait_time = std::min( network->wait_time(), overlays.wait_time() ); /* Handle startup "Connecting..." message */ if ( still_connecting() ) { - wait_time = min( 250, wait_time ); + wait_time = std::min( 250, wait_time ); } /* poll for events */ diff --git a/src/frontend/terminaloverlay.cc b/src/frontend/terminaloverlay.cc index e5bfef7..adee673 100644 --- a/src/frontend/terminaloverlay.cc +++ b/src/frontend/terminaloverlay.cc @@ -39,7 +39,6 @@ #include "terminaloverlay.h" using namespace Overlay; -using std::max; void ConditionalOverlayCell::apply( Framebuffer &fb, uint64_t confirmed_epoch, int row, bool flag ) const { diff --git a/src/network/transportsender-impl.h b/src/network/transportsender-impl.h index 13b55dd..2f9969b 100644 --- a/src/network/transportsender-impl.h +++ b/src/network/transportsender-impl.h @@ -104,13 +104,13 @@ void TransportSender::calculate_timers( void ) mindelay_clock = now; } - next_send_time = max( mindelay_clock + SEND_MINDELAY, - sent_states.back().timestamp + send_interval() ); + next_send_time = std::max( mindelay_clock + SEND_MINDELAY, + sent_states.back().timestamp + send_interval() ); } else if ( !(current_state == assumed_receiver_state->state) && (last_heard + ACTIVE_RETRY_TIMEOUT > now) ) { next_send_time = sent_states.back().timestamp + send_interval(); if ( mindelay_clock != uint64_t( -1 ) ) { - next_send_time = max( next_send_time, mindelay_clock + SEND_MINDELAY ); + next_send_time = std::max( next_send_time, mindelay_clock + SEND_MINDELAY ); } } else if ( !(current_state == sent_states.front().state ) && (last_heard + ACTIVE_RETRY_TIMEOUT > now) ) { diff --git a/src/terminal/terminalfunctions.cc b/src/terminal/terminalfunctions.cc index c53a4fa..03c384d 100644 --- a/src/terminal/terminalfunctions.cc +++ b/src/terminal/terminalfunctions.cc @@ -619,7 +619,7 @@ void Dispatcher::OSC_dispatch( const Parser::OSC_End *act __attribute((unused)), bool set_title = cmd_num == 0 || cmd_num == 2; if ( set_icon || set_title ) { fb->set_title_initialized(); - int title_length = min(OSC_string.size(), (size_t)256); + int title_length = std::min(OSC_string.size(), (size_t)256); Terminal::Framebuffer::title_type newtitle( OSC_string.begin() + offset, OSC_string.begin() + title_length ); if ( set_icon ) { fb->set_icon_name( newtitle ); } if ( set_title ) { fb->set_window_title( newtitle ); }