Merge pull request #386 from leapmotion/murder-autodesired

Remove AutoDesired

autowiring/Autowired.h

@@ -350,40 +350,6 @@ class AutoEnable
   }
 };
 
-/// <summary>
-/// Attempts to create and inject a dependency, discarding any exceptions.
-/// </summary>
-/// <remarks>
-/// Like AutoRequired, AutoDesired attempts to create an instance of the type
-/// to be autowired. However, if creation of the dependency fails, the slot is
-/// created and the dependency is satisfied when an instance of the correct type
-/// is created and wired later.
-///
-/// \include snippets/Autowired_AutoDesired.txt
-///
-/// Use AutoDesired instead of AutoRequired or Autowired when creation of the dependency may fail,
-/// while, unlike Autowired, still creating the dependency when possible.
-///
-/// AutoDesired is functionally equivalent to the following:
-///
-/// \include snippets/Autowired_AutoDesired_Alternate.txt
-///
-/// If you want to know whether an exception was thrown, replace uses of AutoDesired with the above
-/// and perform your own exception handling.
-/// </remarks>
-template<class T>
-class AutoDesired:
-  public Autowired<T>
-{
-public:
-  AutoDesired(void) {
-    try { AutoRequired<T>(); }
-    catch(...) {
-      CoreContext::CurrentContext()->FilterException();
-    }
-  }
-};
-
 /// <summary>
 /// A version of AutoRequired that forwards constructor arguments to the injected
 /// type's constructor function.

autowiring/CoreContext.h

@@ -95,7 +95,7 @@ class AutoSearchLambdaDefault:
 /// * Thread ownership (BasicThread, CoreThread)
 /// * AutoPacket filter graph scope
 ///
-/// Dependencies can be injected into a context using AutoRequired (or its cousins Autowired and AutoDesired).
+/// Dependencies can be injected into a context using AutoRequired (or its cousin Autowired).
 /// The system looks in the current context for an existing object of the required type to satisfy the dependency.
 /// If one does not exist, it looks in parent contexts. Finally, if no existing object is found after searching up the
 /// context tree, a new instance of the required type is created. When another object of the same type is added to the

src/autowiring/AutoPacket.cpp

@@ -227,7 +227,7 @@ void AutoPacket::PulseSatisfaction(DecorationDisposition* pTypeSubs[], size_t nI
   {
     std::lock_guard<std::mutex> lk(m_lock);
     for(size_t i = nInfos; i--;)
-      for(const auto& cur : pTypeSubs[i]->m_subscribers)
+      for(SatCounter* cur : pTypeSubs[i]->m_subscribers)
         cur->Increment();
   }
 }

src/autowiring/test/AutowiringTest.cpp

@@ -80,34 +80,6 @@ TEST_F(AutowiringTest, PathologicalAutowiringRace) {
   AutoRequired<SimpleObject>();
 }
 
-class ChecksForExceptions:
-  public ExceptionFilter
-{
-public:
-  ChecksForExceptions(void):
-    m_called(false)
-  {}
-
-  bool m_called;
-
-  void Filter(void) override {
-    m_called = true;
-  }
-};
-
-class ThrowsExceptionInCtor {
-public:
-  ThrowsExceptionInCtor(void) {
-    throw std::exception();
-  }
-};
-
-TEST_F(AutowiringTest, AUTOTHROW_CanSeeThrownAutoDesiredExceptions) {
-  AutoRequired<ChecksForExceptions> cfe;
-  AutoDesired<ThrowsExceptionInCtor>();
-  ASSERT_TRUE(cfe->m_called) << "Exception was not caught by exception filter in Autowiring context";
-}
-
 class PublicBase {
 public:
   PublicBase(void) {}