diff options
20 files changed, 46 insertions, 49 deletions
diff --git a/NativeCode.mk b/NativeCode.mk index 0ae615e..f7fa793 100644 --- a/NativeCode.mk +++ b/NativeCode.mk @@ -87,7 +87,7 @@ LOCAL_STATIC_LIBRARIES += $(core_static_libraries) libziparchive LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libjavacore LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk -include external/stlport/libstlport.mk +LOCAL_CXX_STL := libc++ include $(BUILD_SHARED_LIBRARY) # Test JNI library. @@ -102,7 +102,7 @@ LOCAL_SHARED_LIBRARIES += libcrypto LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libjavacoretests LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk -include external/stlport/libstlport.mk +LOCAL_CXX_STL := libc++ include $(BUILD_SHARED_LIBRARY) endif # LIBCORE_SKIP_TESTS diff --git a/luni/src/main/native/IcuUtilities.cpp b/luni/src/main/native/IcuUtilities.cpp index 7ce2168..b740719 100644 --- a/luni/src/main/native/IcuUtilities.cpp +++ b/luni/src/main/native/IcuUtilities.cpp @@ -22,7 +22,6 @@ #include "JniException.h" #include "ScopedLocalRef.h" #include "ScopedUtfChars.h" -#include "UniquePtr.h" #include "cutils/log.h" #include "unicode/strenum.h" #include "unicode/uloc.h" diff --git a/luni/src/main/native/ZipUtilities.cpp b/luni/src/main/native/ZipUtilities.cpp index 745b3b1..50da6f6 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) { // 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; diff --git a/luni/src/main/native/ZipUtilities.h b/luni/src/main/native/ZipUtilities.h index fe0f977..0c27bb8 100644 --- a/luni/src/main/native/ZipUtilities.h +++ b/luni/src/main/native/ZipUtilities.h @@ -18,13 +18,13 @@ #ifndef ZIP_UTILITIES_H_included #define ZIP_UTILITIES_H_included -#include "UniquePtr.h" +#include <memory> #include "jni.h" #include "zlib.h" class NativeZipStream { public: - UniquePtr<jbyte[]> input; + std::unique_ptr<jbyte[]> input; int inCap; z_stream stream; @@ -34,7 +34,7 @@ public: void setInput(JNIEnv* env, jbyteArray buf, jint off, jint len); private: - UniquePtr<jbyte[]> mDict; + std::unique_ptr<jbyte[]> mDict; // Disallow copy and assignment. NativeZipStream(const NativeZipStream&); diff --git a/luni/src/main/native/java_math_NativeBN.cpp b/luni/src/main/native/java_math_NativeBN.cpp index e27ef03..7e77e23 100644 --- a/luni/src/main/native/java_math_NativeBN.cpp +++ b/luni/src/main/native/java_math_NativeBN.cpp @@ -21,12 +21,12 @@ #include "JniException.h" #include "ScopedPrimitiveArray.h" #include "ScopedUtfChars.h" -#include "UniquePtr.h" #include "jni.h" #include <openssl/bn.h> #include <openssl/crypto.h> #include <openssl/err.h> #include <stdio.h> +#include <memory> #if defined(OPENSSL_IS_BORINGSSL) /* BoringSSL no longer exports |bn_check_top|. */ @@ -45,7 +45,7 @@ struct BN_CTX_Deleter { BN_CTX_free(p); } }; -typedef UniquePtr<BN_CTX, BN_CTX_Deleter> Unique_BN_CTX; +typedef std::unique_ptr<BN_CTX, BN_CTX_Deleter> Unique_BN_CTX; static BIGNUM* toBigNum(jlong address) { return reinterpret_cast<BIGNUM*>(static_cast<uintptr_t>(address)); diff --git a/luni/src/main/native/java_text_Bidi.cpp b/luni/src/main/native/java_text_Bidi.cpp index d9ef35d..6a3e751 100644 --- a/luni/src/main/native/java_text_Bidi.cpp +++ b/luni/src/main/native/java_text_Bidi.cpp @@ -22,14 +22,14 @@ #include "JniConstants.h" #include "JniException.h" #include "ScopedPrimitiveArray.h" -#include "UniquePtr.h" #include "unicode/ubidi.h" #include <stdlib.h> #include <string.h> +#include <memory> struct BiDiData { - BiDiData(UBiDi* biDi) : mBiDi(biDi), mEmbeddingLevels(NULL) { + BiDiData(UBiDi* biDi) : mBiDi(biDi) { } ~BiDiData() { @@ -50,7 +50,7 @@ struct BiDiData { private: UBiDi* mBiDi; - UniquePtr<jbyte[]> mEmbeddingLevels; + std::unique_ptr<jbyte[]> mEmbeddingLevels; // Disallow copy and assignment. BiDiData(const BiDiData&); @@ -98,7 +98,7 @@ static jlong Bidi_ubidi_setLine(JNIEnv* env, jclass, jlong ptr, jint start, jint if (maybeThrowIcuException(env, "ubidi_openSized", status)) { return 0; } - UniquePtr<BiDiData> lineData(new BiDiData(sized)); + std::unique_ptr<BiDiData> lineData(new BiDiData(sized)); ubidi_setLine(uBiDi(ptr), start, limit, lineData->uBiDi(), &status); maybeThrowIcuException(env, "ubidi_setLine", status); return reinterpret_cast<uintptr_t>(lineData.release()); @@ -168,7 +168,7 @@ static jintArray Bidi_ubidi_reorderVisual(JNIEnv* env, jclass, jbyteArray javaLe const UBiDiLevel* levels = reinterpret_cast<const UBiDiLevel*>(levelBytes.get()); - UniquePtr<int[]> indexMap(new int[length]); + std::unique_ptr<int[]> indexMap(new int[length]); ubidi_reorderVisual(levels, length, &indexMap[0]); jintArray result = env->NewIntArray(length); diff --git a/luni/src/main/native/java_util_jar_StrictJarFile.cpp b/luni/src/main/native/java_util_jar_StrictJarFile.cpp index b10ec43..f0cdbed 100644 --- a/luni/src/main/native/java_util_jar_StrictJarFile.cpp +++ b/luni/src/main/native/java_util_jar_StrictJarFile.cpp @@ -17,13 +17,13 @@ #define LOG_TAG "StrictJarFile" +#include <memory> #include <string> #include "JNIHelp.h" #include "JniConstants.h" #include "ScopedLocalRef.h" #include "ScopedUtfChars.h" -#include "UniquePtr.h" #include "jni.h" #include "ziparchive/zip_archive.h" #include "cutils/log.h" @@ -124,7 +124,7 @@ static jobject StrictJarFile_nativeNextEntry(JNIEnv* env, jobject, jlong iterati return NULL; } - UniquePtr<char[]> entryNameCString(new char[entryName.name_length + 1]); + std::unique_ptr<char[]> entryNameCString(new char[entryName.name_length + 1]); memcpy(entryNameCString.get(), entryName.name, entryName.name_length); entryNameCString[entryName.name_length] = '\0'; ScopedLocalRef<jstring> entryNameString(env, env->NewStringUTF(entryNameCString.get())); diff --git a/luni/src/main/native/java_util_regex_Matcher.cpp b/luni/src/main/native/java_util_regex_Matcher.cpp index 2e5259e..f2f1bf3 100644 --- a/luni/src/main/native/java_util_regex_Matcher.cpp +++ b/luni/src/main/native/java_util_regex_Matcher.cpp @@ -23,7 +23,6 @@ #include "JniConstants.h" #include "JniException.h" #include "ScopedPrimitiveArray.h" -#include "UniquePtr.h" #include "jni.h" #include "unicode/parseerr.h" #include "unicode/regex.h" diff --git a/luni/src/main/native/java_util_zip_Deflater.cpp b/luni/src/main/native/java_util_zip_Deflater.cpp index 1afd36e..43adae7 100644 --- a/luni/src/main/native/java_util_zip_Deflater.cpp +++ b/luni/src/main/native/java_util_zip_Deflater.cpp @@ -40,7 +40,7 @@ static jint Deflater_getAdlerImpl(JNIEnv*, jobject, jlong handle) { } static jlong Deflater_createStream(JNIEnv * env, jobject, jint level, jint strategy, jboolean noHeader) { - UniquePtr<NativeZipStream> jstream(new NativeZipStream); + std::unique_ptr<NativeZipStream> jstream(new NativeZipStream); if (jstream.get() == NULL) { jniThrowOutOfMemoryError(env, NULL); return -1; diff --git a/luni/src/main/native/java_util_zip_Inflater.cpp b/luni/src/main/native/java_util_zip_Inflater.cpp index ca3ee09..a8a4744 100644 --- a/luni/src/main/native/java_util_zip_Inflater.cpp +++ b/luni/src/main/native/java_util_zip_Inflater.cpp @@ -25,7 +25,7 @@ #include <errno.h> static jlong Inflater_createStream(JNIEnv* env, jobject, jboolean noHeader) { - UniquePtr<NativeZipStream> jstream(new NativeZipStream); + std::unique_ptr<NativeZipStream> jstream(new NativeZipStream); if (jstream.get() == NULL) { jniThrowOutOfMemoryError(env, NULL); return -1; diff --git a/luni/src/main/native/libcore_icu_DateIntervalFormat.cpp b/luni/src/main/native/libcore_icu_DateIntervalFormat.cpp index a3258c1..5221baa 100644 --- a/luni/src/main/native/libcore_icu_DateIntervalFormat.cpp +++ b/luni/src/main/native/libcore_icu_DateIntervalFormat.cpp @@ -20,7 +20,6 @@ #include "JniConstants.h" #include "ScopedIcuLocale.h" #include "ScopedJavaUnicodeString.h" -#include "UniquePtr.h" #include "cutils/log.h" #include "unicode/dtitvfmt.h" diff --git a/luni/src/main/native/libcore_icu_ICU.cpp b/luni/src/main/native/libcore_icu_ICU.cpp index 7b92b1d..34b8ee0 100644 --- a/luni/src/main/native/libcore_icu_ICU.cpp +++ b/luni/src/main/native/libcore_icu_ICU.cpp @@ -25,7 +25,6 @@ #include "ScopedJavaUnicodeString.h" #include "ScopedLocalRef.h" #include "ScopedUtfChars.h" -#include "UniquePtr.h" #include "cutils/log.h" #include "toStringArray.h" #include "unicode/brkiter.h" @@ -62,6 +61,7 @@ #include <sys/types.h> #include <time.h> #include <unistd.h> +#include <memory> #include <vector> class ScopedResourceBundle { @@ -379,7 +379,7 @@ static void setNumberPatterns(JNIEnv* env, jobject obj, Locale& locale) { UErrorCode status = U_ZERO_ERROR; UnicodeString pattern; - UniquePtr<DecimalFormat> fmt(static_cast<DecimalFormat*>(NumberFormat::createInstance(locale, UNUM_CURRENCY, status))); + std::unique_ptr<DecimalFormat> fmt(static_cast<DecimalFormat*>(NumberFormat::createInstance(locale, UNUM_CURRENCY, status))); pattern = fmt->toPattern(pattern.remove()); setStringField(env, obj, "currencyPattern", pattern); @@ -514,7 +514,7 @@ static bool getYesterdayTodayAndTomorrow(JNIEnv* env, jobject localeData, const } // We title-case the strings so they have consistent capitalization (http://b/14493853). - UniquePtr<BreakIterator> brk(BreakIterator::createSentenceInstance(locale, status)); + std::unique_ptr<BreakIterator> brk(BreakIterator::createSentenceInstance(locale, status)); if (U_FAILURE(status)) { ALOGE("Error getting yesterday/today/tomorrow break iterator for %s: %s", locale_name, u_errorName(status)); return false; @@ -584,7 +584,7 @@ static jboolean ICU_initLocaleDataNative(JNIEnv* env, jclass, jstring javaLangua } status = U_ZERO_ERROR; - UniquePtr<Calendar> cal(Calendar::createInstance(icuLocale.locale(), status)); + std::unique_ptr<Calendar> cal(Calendar::createInstance(icuLocale.locale(), status)); if (U_FAILURE(status)) { return JNI_FALSE; } @@ -739,7 +739,7 @@ static jstring ICU_getBestDateTimePatternNative(JNIEnv* env, jclass, jstring jav } UErrorCode status = U_ZERO_ERROR; - UniquePtr<DateTimePatternGenerator> generator(DateTimePatternGenerator::createInstance(icuLocale.locale(), status)); + std::unique_ptr<DateTimePatternGenerator> generator(DateTimePatternGenerator::createInstance(icuLocale.locale(), status)); if (maybeThrowIcuException(env, "DateTimePatternGenerator::createInstance", status)) { return NULL; } diff --git a/luni/src/main/native/libcore_icu_NativeCollation.cpp b/luni/src/main/native/libcore_icu_NativeCollation.cpp index 4ce42ec..f27d72e 100644 --- a/luni/src/main/native/libcore_icu_NativeCollation.cpp +++ b/luni/src/main/native/libcore_icu_NativeCollation.cpp @@ -15,10 +15,10 @@ #include "JniException.h" #include "ScopedStringChars.h" #include "ScopedUtfChars.h" -#include "UniquePtr.h" #include "unicode/ucol.h" #include "unicode/ucoleitr.h" #include <cutils/log.h> +#include <memory> // Manages a UCollationElements instance along with the jchar // array it is iterating over. The associated array can be unpinned @@ -124,7 +124,7 @@ static jlong NativeCollation_getCollationElementIterator(JNIEnv* env, jclass, jl return -1; } - UniquePtr<CollationElements> ce(new CollationElements); + std::unique_ptr<CollationElements> ce(new CollationElements); UErrorCode status = ce->start(env, javaSource, toCollator(address)); maybeThrowIcuException(env, "ucol_openElements", status); if (status == U_ZERO_ERROR) { @@ -156,7 +156,7 @@ static jbyteArray NativeCollation_getSortKey(JNIEnv* env, jclass, jlong address, const UCollator* collator = toCollator(address); // The buffer size prevents reallocation for most strings. uint8_t byteArray[128]; - UniquePtr<uint8_t[]> largerByteArray; + std::unique_ptr<uint8_t[]> largerByteArray; uint8_t* usedByteArray = byteArray; size_t byteArraySize = ucol_getSortKey(collator, source.get(), source.size(), usedByteArray, sizeof(byteArray) - 1); if (byteArraySize > sizeof(byteArray) - 1) { diff --git a/luni/src/main/native/libcore_icu_NativeConverter.cpp b/luni/src/main/native/libcore_icu_NativeConverter.cpp index 8dd439a..717bfc3 100644 --- a/luni/src/main/native/libcore_icu_NativeConverter.cpp +++ b/luni/src/main/native/libcore_icu_NativeConverter.cpp @@ -23,7 +23,6 @@ #include "ScopedPrimitiveArray.h" #include "ScopedStringChars.h" #include "ScopedUtfChars.h" -#include "UniquePtr.h" #include "cutils/log.h" #include "toStringArray.h" #include "unicode/ucnv.h" @@ -32,6 +31,7 @@ #include "unicode/ustring.h" #include "unicode/utypes.h" +#include <memory> #include <vector> #include <stdlib.h> @@ -150,7 +150,7 @@ static jstring getJavaCanonicalName(JNIEnv* env, const char* icuCanonicalName) { if (name == NULL) { name = icuCanonicalName; } - UniquePtr<char[]> result(new char[2 + strlen(name) + 1]); + std::unique_ptr<char[]> result(new char[2 + strlen(name) + 1]); strcpy(&result[0], "x-"); strcat(&result[0], name); return env->NewStringUTF(&result[0]); diff --git a/luni/src/main/native/libcore_icu_NativeDecimalFormat.cpp b/luni/src/main/native/libcore_icu_NativeDecimalFormat.cpp index 8e440e9..0527213 100644 --- a/luni/src/main/native/libcore_icu_NativeDecimalFormat.cpp +++ b/luni/src/main/native/libcore_icu_NativeDecimalFormat.cpp @@ -19,6 +19,7 @@ #include <stdlib.h> #include <string.h> +#include <memory> #include <vector> #include "cutils/log.h" @@ -36,7 +37,6 @@ #include "unicode/numfmt.h" #include "unicode/unum.h" #include "unicode/ustring.h" -#include "UniquePtr.h" #include "valueOf.h" static DecimalFormat* toDecimalFormat(jlong addr) { @@ -179,7 +179,7 @@ static jstring NativeDecimalFormat_getTextAttribute(JNIEnv* env, jclass, jlong a UNumberFormatTextAttribute attr = static_cast<UNumberFormatTextAttribute>(javaAttr); // Find out how long the result will be... - UniquePtr<UChar[]> chars; + std::unique_ptr<UChar[]> chars; uint32_t charCount = 0; uint32_t desiredCount = unum_getTextAttribute(fmt, attr, chars.get(), charCount, &status); if (status == U_BUFFER_OVERFLOW_ERROR) { diff --git a/luni/src/main/native/libcore_icu_TimeZoneNames.cpp b/luni/src/main/native/libcore_icu_TimeZoneNames.cpp index a7c9098..2fa06c7 100644 --- a/luni/src/main/native/libcore_icu_TimeZoneNames.cpp +++ b/luni/src/main/native/libcore_icu_TimeZoneNames.cpp @@ -16,6 +16,8 @@ #define LOG_TAG "TimeZoneNames" +#include <memory> + #include "IcuUtilities.h" #include "JNIHelp.h" #include "JniConstants.h" @@ -24,7 +26,6 @@ #include "ScopedJavaUnicodeString.h" #include "ScopedLocalRef.h" #include "ScopedUtfChars.h" -#include "UniquePtr.h" #include "unicode/calendar.h" #include "unicode/timezone.h" #include "unicode/tznames.h" @@ -67,7 +68,7 @@ static void TimeZoneNames_fillZoneStrings(JNIEnv* env, jclass, jstring javaLocal } UErrorCode status = U_ZERO_ERROR; - UniquePtr<TimeZoneNames> names(TimeZoneNames::createInstance(icuLocale.locale(), status)); + std::unique_ptr<TimeZoneNames> names(TimeZoneNames::createInstance(icuLocale.locale(), status)); if (maybeThrowIcuException(env, "TimeZoneNames::createInstance", status)) { return; } @@ -123,7 +124,7 @@ static jstring TimeZoneNames_getExemplarLocation(JNIEnv* env, jclass, jstring ja } UErrorCode status = U_ZERO_ERROR; - UniquePtr<TimeZoneNames> names(TimeZoneNames::createInstance(icuLocale.locale(), status)); + std::unique_ptr<TimeZoneNames> names(TimeZoneNames::createInstance(icuLocale.locale(), status)); if (maybeThrowIcuException(env, "TimeZoneNames::createInstance", status)) { return NULL; } diff --git a/luni/src/main/native/libcore_io_Memory.cpp b/luni/src/main/native/libcore_io_Memory.cpp index 9edbfb8..70bd9e4 100644 --- a/luni/src/main/native/libcore_io_Memory.cpp +++ b/luni/src/main/native/libcore_io_Memory.cpp @@ -21,7 +21,6 @@ #include "Portability.h" #include "ScopedBytes.h" #include "ScopedPrimitiveArray.h" -#include "UniquePtr.h" #include <errno.h> #include <stdlib.h> diff --git a/luni/src/main/native/libcore_io_Posix.cpp b/luni/src/main/native/libcore_io_Posix.cpp index 6808dd6..9ae2378 100644 --- a/luni/src/main/native/libcore_io_Posix.cpp +++ b/luni/src/main/native/libcore_io_Posix.cpp @@ -31,7 +31,6 @@ #include "ScopedPrimitiveArray.h" #include "ScopedUtfChars.h" #include "toStringArray.h" -#include "UniquePtr.h" #include <arpa/inet.h> #include <errno.h> @@ -61,7 +60,7 @@ #include <sys/wait.h> #include <termios.h> #include <unistd.h> - +#include <memory> #ifndef __unused #define __unused __attribute__((__unused__)) @@ -451,7 +450,7 @@ private: } JNIEnv* mEnv; - UniquePtr<char[]> mBuffer; + std::unique_ptr<char[]> mBuffer; size_t mBufferSize; struct passwd mPwd; struct passwd* mResult; @@ -684,7 +683,7 @@ static jobjectArray Posix_android_getaddrinfo(JNIEnv* env, jobject, jstring java addrinfo* addressList = NULL; errno = 0; int rc = android_getaddrinfofornet(node.c_str(), NULL, &hints, netId, 0, &addressList); - UniquePtr<addrinfo, addrinfo_deleter> addressListDeleter(addressList); + std::unique_ptr<addrinfo, addrinfo_deleter> addressListDeleter(addressList); if (rc != 0) { throwGaiException(env, "android_getaddrinfo", rc); return NULL; @@ -1069,7 +1068,7 @@ static jint Posix_poll(JNIEnv* env, jobject, jobjectArray javaStructs, jint time // Turn the Java android.system.StructPollfd[] into a C++ struct pollfd[]. size_t arrayLength = env->GetArrayLength(javaStructs); - UniquePtr<struct pollfd[]> fds(new struct pollfd[arrayLength]); + std::unique_ptr<struct pollfd[]> fds(new struct pollfd[arrayLength]); memset(fds.get(), 0, sizeof(struct pollfd) * arrayLength); size_t count = 0; // Some trailing array elements may be irrelevant. (See below.) for (size_t i = 0; i < arrayLength; ++i) { diff --git a/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp b/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp index 2ea8806..ed0ee8b 100644 --- a/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp +++ b/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp @@ -24,11 +24,12 @@ #include "ScopedPrimitiveArray.h" #include "ScopedStringChars.h" #include "ScopedUtfChars.h" -#include "UniquePtr.h" #include "jni.h" #include "cutils/log.h" #include "unicode/unistr.h" +#include <memory> + #include <string.h> #include <libexpat/expat.h> @@ -253,7 +254,7 @@ static int hashString(const char* s) { */ static InternedString* newInternedString(JNIEnv* env, const char* bytes, int hash) { // Allocate a new wrapper. - UniquePtr<InternedString> wrapper(new InternedString); + std::unique_ptr<InternedString> wrapper(new InternedString); if (wrapper.get() == NULL) { jniThrowOutOfMemoryError(env, NULL); return NULL; @@ -962,7 +963,7 @@ static void notationDecl(void* data, const char* name, const char* /*base*/, con static jlong ExpatParser_initialize(JNIEnv* env, jobject object, jstring javaEncoding, jboolean processNamespaces) { // Allocate parsing context. - UniquePtr<ParsingContext> context(new ParsingContext(object)); + std::unique_ptr<ParsingContext> context(new ParsingContext(object)); if (context.get() == NULL) { jniThrowOutOfMemoryError(env, NULL); return 0; diff --git a/luni/src/test/native/test_openssl_engine.cpp b/luni/src/test/native/test_openssl_engine.cpp index 9a0f3b3..4fb1ee1 100644 --- a/luni/src/test/native/test_openssl_engine.cpp +++ b/luni/src/test/native/test_openssl_engine.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#include "UniquePtr.h" - #include <stdarg.h> #include <string.h> #include <unistd.h> @@ -24,6 +22,7 @@ #include <openssl/engine.h> #include <openssl/evp.h> #include <openssl/pem.h> +#include <memory> #define DYNAMIC_ENGINE #define TEST_ENGINE_ID "javacoretests" @@ -34,7 +33,7 @@ struct RSA_Delete { RSA_free(p); } }; -typedef UniquePtr<RSA, RSA_Delete> Unique_RSA; +typedef std::unique_ptr<RSA, RSA_Delete> Unique_RSA; static const char* HMAC_TAG = "-HMAC-"; static const size_t HMAC_TAG_LEN = strlen(HMAC_TAG); |