diff options
| author | Ian Rogers <irogers@google.com> | 2014-11-05 10:50:13 -0800 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-11-05 10:50:13 -0800 |
| commit | a5e1285a6d5ef8e6602f39cf33277cde2f6bccbf (patch) | |
| tree | dffcb3954ff6ea3c9036033eec01fac0ba0e6865 /luni/src/test | |
| parent | 2d3e650f8ef1aed488f870aa3d1028775e353490 (diff) | |
| parent | f9a3c05f9ed2a8e0b4257f9fd1695cef2a6124b9 (diff) | |
| download | libcore-a5e1285a6d5ef8e6602f39cf33277cde2f6bccbf.zip libcore-a5e1285a6d5ef8e6602f39cf33277cde2f6bccbf.tar.gz libcore-a5e1285a6d5ef8e6602f39cf33277cde2f6bccbf.tar.bz2 | |
resolved conflicts for merge of f9a3c05f to stage-aosp-master
Change-Id: Id4220cfc2f845d04b32404171cde1fd144fe1585
Diffstat (limited to 'luni/src/test')
| -rw-r--r-- | luni/src/test/native/test_openssl_engine.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
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); |