diff options
Diffstat (limited to 'luni/src/main/native/ZipUtilities.cpp')
| -rw-r--r-- | luni/src/main/native/ZipUtilities.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/luni/src/main/native/ZipUtilities.cpp b/luni/src/main/native/ZipUtilities.cpp index 745b3b1..b7d2209 100644 --- a/luni/src/main/native/ZipUtilities.cpp +++ b/luni/src/main/native/ZipUtilities.cpp @@ -15,9 +15,10 @@ * limitations under the License. */ +#include <memory> + #include "JniConstants.h" #include "JniException.h" -#include "UniquePtr.h" #include "ZipUtilities.h" void throwExceptionForZlibError(JNIEnv* env, const char* exceptionClassName, int error, @@ -31,7 +32,7 @@ void throwExceptionForZlibError(JNIEnv* env, const char* exceptionClassName, int } } -NativeZipStream::NativeZipStream() : input(NULL), inCap(0), mDict(NULL) { +NativeZipStream::NativeZipStream() : inCap(0), totalIn(0), totalOut(0) { // Let zlib use its default allocator. stream.opaque = Z_NULL; stream.zalloc = Z_NULL; @@ -43,7 +44,7 @@ NativeZipStream::~NativeZipStream() { void NativeZipStream::setDictionary(JNIEnv* env, jbyteArray javaDictionary, int off, int len, bool inflate) { - UniquePtr<jbyte[]> dictionaryBytes(new jbyte[len]); + std::unique_ptr<jbyte[]> dictionaryBytes(new jbyte[len]); if (dictionaryBytes.get() == NULL) { jniThrowOutOfMemoryError(env, NULL); return; |