X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=stream.cpp;h=64bf2e8053e7c0edd79b17f43ba12160a3dd8795;hp=d416803fafb03dd23b4e591cf46bf061179a102b;hb=b757a4a2ce9d24835b52a185134835762af2f50c;hpb=1c4ef2d6d366e5539b98b408d797657ca8a17bc0

diff --git a/stream.cpp b/stream.cpp
index d416803..64bf2e8 100644
--- a/stream.cpp
+++ b/stream.cpp
@@ -144,7 +144,7 @@ void Stream::put_client_to_sleep(Client *client)
 vector<iovec> collect_iovecs(const vector<Stream::DataElement> &data, size_t bytes_wanted)
 {
 	vector<iovec> ret;
-	size_t max_iovecs = std::min<size_t>(data.size(), IOV_MAX);
+	size_t max_iovecs = min<size_t>(data.size(), IOV_MAX);
 	for (size_t i = 0; i < max_iovecs && bytes_wanted > 0; ++i) {
 		if (data[i].data.iov_len <= bytes_wanted) {
 			// Consume the entire iovec.
@@ -264,7 +264,7 @@ void Stream::add_data_deferred(const char *data, size_t bytes, StreamStartSuitab
 
 void Stream::process_queued_data()
 {
-	std::vector<DataElement> queued_data_copy;
+	vector<DataElement> queued_data_copy;
 
 	// Hold the lock for as short as possible, since add_data_raw() can possibly
 	// write to disk, which might disturb the input thread.