From 42f71364ca631525e94a0c39727e1c4ebdc325da Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Mon, 17 Aug 2020 16:25:55 -0700 Subject: [PATCH] IXHttpClient.cpp: use std::array instead of std::unique_ptr for a fixed size array --- ixwebsocket/IXHttpClient.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ixwebsocket/IXHttpClient.cpp b/ixwebsocket/IXHttpClient.cpp index d34eeed3..9707d409 100644 --- a/ixwebsocket/IXHttpClient.cpp +++ b/ixwebsocket/IXHttpClient.cpp @@ -16,6 +16,7 @@ #include #include #include +#include #ifdef IXWEBSOCKET_USE_ZLIB #include @@ -700,14 +701,12 @@ namespace ix inflateState.next_in = (unsigned char*) (const_cast(in.data())); const int kBufferSize = 1 << 14; - - std::unique_ptr compressBuffer = - std::make_unique(kBufferSize); + std::array compressBuffer; do { inflateState.avail_out = (uInt) kBufferSize; - inflateState.next_out = compressBuffer.get(); + inflateState.next_out = &compressBuffer.front(); int ret = inflate(&inflateState, Z_SYNC_FLUSH); @@ -717,7 +716,7 @@ namespace ix return false; } - out.append(reinterpret_cast(compressBuffer.get()), + out.append(reinterpret_cast(&compressBuffer.front()), kBufferSize - inflateState.avail_out); } while (inflateState.avail_out == 0);