// If this client doesn't exist anymore, just ignore it
// (it was deleted earlier).
- std::map<int, Client>::iterator client_it = clients.find(connect_time_and_fd.second);
+ map<int, Client>::iterator client_it = clients.find(connect_time_and_fd.second);
if (client_it == clients.end()) {
clients_ordered_by_connect_time.pop();
continue;
}
}
-int Server::lookup_stream_by_url(const std::string &url) const
+int Server::lookup_stream_by_url(const string &url) const
{
map<string, int>::const_iterator url_it = url_map.find(url);
if (url_it == url_map.end()) {
Stream *stream = client->stream;
if (client->stream_pos == size_t(-2)) {
// Start sending from the beginning of the backlog.
- client->stream_pos = std::min<size_t>(
+ client->stream_pos = min<size_t>(
stream->bytes_received - stream->backlog_size,
0);
client->state = Client::SENDING_DATA;