Always use std::min, std::max.
This commit is contained in:
@@ -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<int>(network_sleep) );
|
||||
timeout = std::min( timeout, static_cast<int>(network_sleep) );
|
||||
}
|
||||
|
||||
/* poll for events */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user