From fd205fb6f8edc73a0d867a6dfc5a34737bae6bb9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Feb 2016 15:32:48 +0100 Subject: [PATCH] ref: Add cast operator --- src/libstore/store-api.cc | 4 ++-- src/libutil/types.hh | 19 ++++++------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc index e205fd0e8..039d07e29 100644 --- a/src/libstore/store-api.cc +++ b/src/libstore/store-api.cc @@ -322,8 +322,8 @@ ref openStore(bool reserveSpace) } return mode == mDaemon - ? make_ref() - : make_ref(reserveSpace); + ? (ref) make_ref() + : (ref) make_ref(reserveSpace); } diff --git a/src/libutil/types.hh b/src/libutil/types.hh index 23eb52512..0eae46c5f 100644 --- a/src/libutil/types.hh +++ b/src/libutil/types.hh @@ -134,16 +134,18 @@ public: return p; } + template + operator ref () + { + return ref((std::shared_ptr) p); + } + private: template friend ref make_ref(Args&&... args); - template - friend ref - make_ref(Args&&... args); - }; template @@ -154,13 +156,4 @@ make_ref(Args&&... args) return ref(p); } -template -inline ref -make_ref(Args&&... args) -{ - auto p = std::make_shared(std::forward(args)...); - return ref(p); -} - - }