Enable directly calling the underlying constructor for ptr

OkCupid · Nov 12, 2013 · 08847ac · 08847ac
1 parent 5b478d6
commit 08847ac
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/async/refcnt.C b/async/refcnt.C
@@ -46,6 +46,7 @@ bool __globaldestruction_t::started;
 
 #include "callback.h"
 
+const ptr_alloc_t ptr_alloc = {};
 
 static void
 ignore_void ()

diff --git a/async/refcnt.h b/async/refcnt.h
@@ -477,6 +477,13 @@ class ref : public refpriv, public refops<T> {
 /* To skip initialization of ptr's in BSS */
 struct __bss_init {};
 
+// Dummy argument to force the ptr to call the constructor for the underlying
+// class
+class ptr_alloc_t {};
+
+extern const ptr_alloc_t ptr_alloc;
+
+
 template<class T>
 class ptr : public refpriv, public refops <T> {
   friend class refpriv;
@@ -529,6 +536,11 @@ class ptr : public refpriv, public refops <T> {
   ptr (::ref<U>&& src) : ptr<T>(src) { }
 #endif
 
+  template <typename... Params>
+  ptr(const ptr_alloc_t&, Params&&... args) :
+    ptr(New refcounted<T>(std::forward<Params>(args)...))
+  {}
+
   ~ptr () { dec (); }
 
   ptr<T> &operator= (privtype *)