diff options
| author | Andy Schwerin <schwerin@mongodb.com> | 2016-05-24 16:34:45 -0400 |
|---|---|---|
| committer | Andy Schwerin <schwerin@mongodb.com> | 2016-06-03 12:48:38 -0400 |
| commit | 910e782aa5d8329c5e8b2531cf0116052e8a187e (patch) | |
| tree | 8c7b17d5808ffaf4b8b9c4ff6a973e34d4b851eb /src/mongo/util/unowned_ptr.h | |
| parent | 0b5cbbadf49da830f20fba6e779b7278f211e394 (diff) | |
| download | mongo-910e782aa5d8329c5e8b2531cf0116052e8a187e.tar.gz | |
SERVER-23905 Unify lifetime management for LockState on OperationContexts into OperationContext.
This change also moves responsibility for registering OperationContexts to Clients into
ServiceContext::makeOperationContext.
Diffstat (limited to 'src/mongo/util/unowned_ptr.h')
| -rw-r--r-- | src/mongo/util/unowned_ptr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/util/unowned_ptr.h b/src/mongo/util/unowned_ptr.h index ecac433207f..775edd7c9f8 100644 --- a/src/mongo/util/unowned_ptr.h +++ b/src/mongo/util/unowned_ptr.h @@ -63,8 +63,8 @@ struct unowned_ptr { template <typename U, typename = IfConvertibleFrom<U>> unowned_ptr(const unowned_ptr<U>& p) : _p(p) {} - template <typename U, typename = IfConvertibleFrom<U>> - unowned_ptr(const std::unique_ptr<U>& p) : _p(p.get()) {} + template <typename U, typename Deleter, typename = IfConvertibleFrom<U>> + unowned_ptr(const std::unique_ptr<U, Deleter>& p) : _p(p.get()) {} template <typename U, typename = IfConvertibleFrom<U>> unowned_ptr(const std::shared_ptr<U>& p) : _p(p.get()) {} |