Merge pull request #83 from leapmotion/ref-autoconstruct

AutoConstruct should not inherit AutoRequired
leapmotion · Aug 26, 2014 · 26e2a3a · 26e2a3a
2 parents ce334e3 + c98db1b
commit 26e2a3a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/autowiring/Autowired.h b/autowiring/Autowired.h
@@ -306,13 +306,17 @@ class AutoDesired:
 /// </summary>
 template<class T>
 class AutoConstruct:
-  public AutoRequired<T>
+  public std::shared_ptr<T>
 {
 public:
   template<class... Args>
   AutoConstruct(Args&&... args) :
-    AutoRequired<T>(CoreContext::CurrentContext(), std::forward<Args>(args)...)
+    std::shared_ptr<T>(CoreContext::CurrentContext()->template Construct<T>(std::forward<Args&&>(args)...))
   {}
+
+  operator bool(void) const { return IsAutowired(); }
+  operator T*(void) const { return std::shared_ptr<T>::get(); }
+  bool IsAutowired(void) const { return std::shared_ptr<T>::get() != nullptr; }
 };
 
 /// <summary>