diff options
| author | Martin Thomson <martin.thomson@gmail.com> | 2017-08-24 10:16:13 +1000 |
|---|---|---|
| committer | Martin Thomson <martin.thomson@gmail.com> | 2017-08-24 10:16:13 +1000 |
| commit | 0ec9a2703f77ec33765b318cc1ec519206faec26 (patch) | |
| tree | bae90a4678ce056d51fcf594c67fa16976a7b5b5 /cpputil | |
| parent | daa71317c427f1e96ba7819df1b5e8dfbf0d39bb (diff) | |
| parent | ae7880aaf35321274152907955868ef50c0255d1 (diff) | |
| download | nss-hg-0ec9a2703f77ec33765b318cc1ec519206faec26.tar.gz | |
Merge NSS trunk to NSS_TLS13_DRAFT19_BRANCH, a=merge
Diffstat (limited to 'cpputil')
| -rw-r--r-- | cpputil/scoped_ptrs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cpputil/scoped_ptrs.h b/cpputil/scoped_ptrs.h index 9f224dfc0..b92b8132b 100644 --- a/cpputil/scoped_ptrs.h +++ b/cpputil/scoped_ptrs.h @@ -36,6 +36,7 @@ struct ScopedDelete { void operator()(PK11URI* uri) { PK11URI_DestroyURI(uri); } void operator()(PLArenaPool* arena) { PORT_FreeArena(arena, PR_FALSE); } void operator()(PK11Context* context) { PK11_DestroyContext(context, true); } + void operator()(PK11GenericObject* obj) { PK11_DestroyGenericObject(obj); } }; template <class T> @@ -66,6 +67,7 @@ SCOPED(SECKEYPrivateKeyList); SCOPED(PK11URI); SCOPED(PLArenaPool); SCOPED(PK11Context); +SCOPED(PK11GenericObject); #undef SCOPED |