From: Steinar H. Gunderson Date: Sat, 20 Apr 2013 14:41:18 +0000 (+0200) Subject: Fix merge snafu in last commit. (Oops.) X-Git-Tag: 1.0.0~52 X-Git-Url: https://git.sesse.net/?p=cubemap;a=commitdiff_plain;h=ef7f588a9b7a63ba2153cd06ce5322db4453fa16 Fix merge snafu in last commit. (Oops.) --- diff --git a/stream.cpp b/stream.cpp index ae31308..37961fa 100644 --- a/stream.cpp +++ b/stream.cpp @@ -224,13 +224,6 @@ void Stream::add_data_deferred(const char *data, size_t bytes) } else { assert(encoding == Stream::STREAM_ENCODING_RAW); } - - // Add the data itself. - iovec iov; - iov.iov_base = new char[bytes]; - memcpy(iov.iov_base, data, bytes); - iov.iov_len = bytes; - queued_data.push_back(iov); } void Stream::process_queued_data()