summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2015-11-18 23:00:20 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-19 07:01:23 +0000
commit0917ec4328dc20b59887d78f76b9f075e12e5f7f (patch)
treee2e24def30f3b6619eb1b92d570b055bfcef9672 /crypto
parentd076ca806251e4b636b421eb46ca04d14366b2cc (diff)
downloadchromium_src-0917ec4328dc20b59887d78f76b9f075e12e5f7f.zip
chromium_src-0917ec4328dc20b59887d78f76b9f075e12e5f7f.tar.gz
chromium_src-0917ec4328dc20b59887d78f76b9f075e12e5f7f.tar.bz2
Use std::default_delete as the default deleter for scoped_ptr.
The aim is to make scoped_ptr and std::unique_ptr functionally identical so scoped_ptr can simply be a typedef. BUG=554298 Review URL: https://codereview.chromium.org/1445003002 Cr-Commit-Position: refs/heads/master@{#360539}
Diffstat (limited to 'crypto')
-rw-r--r--crypto/scoped_nss_types.h2
-rw-r--r--crypto/scoped_openssl_types.h1
2 files changed, 0 insertions, 3 deletions
diff --git a/crypto/scoped_nss_types.h b/crypto/scoped_nss_types.h
index fdfb83c..8e96e8d 100644
--- a/crypto/scoped_nss_types.h
+++ b/crypto/scoped_nss_types.h
@@ -16,7 +16,6 @@ namespace crypto {
template <typename Type, void (*Destroyer)(Type*)>
struct NSSDestroyer {
- typedef void AllowSelfReset;
void operator()(Type* ptr) const {
Destroyer(ptr);
}
@@ -24,7 +23,6 @@ struct NSSDestroyer {
template <typename Type, void (*Destroyer)(Type*, PRBool), PRBool freeit>
struct NSSDestroyer1 {
- typedef void AllowSelfReset;
void operator()(Type* ptr) const {
Destroyer(ptr, freeit);
}
diff --git a/crypto/scoped_openssl_types.h b/crypto/scoped_openssl_types.h
index 73f7632..bdae6aa 100644
--- a/crypto/scoped_openssl_types.h
+++ b/crypto/scoped_openssl_types.h
@@ -23,7 +23,6 @@ namespace crypto {
// base::internal::RunnableAdapter<>, but that's far too heavy weight.
template <typename Type, void (*Destroyer)(Type*)>
struct OpenSSLDestroyer {
- using AllowSelfReset = void;
void operator()(Type* ptr) const { Destroyer(ptr); }
};