Merge pull request #65 from leapmotion/bug-libstdcpp-enum

Correcting libstdc++ compiler error

autowiring/MicroBolt.h

@@ -17,15 +17,26 @@ template<typename T, typename... Sigils>
 struct MicroBolt:
   public Bolt<Sigils...>
 {
+private:
+  template<class W>
+  static bool LoopInject(const std::shared_ptr<CoreContext>& ctxt) {
+    for(auto context : ContextEnumeratorT<W>(ctxt))
+      // Inject<W>() is idempotent, that makes this behavior safe
+      context->template Inject<T>();
+    return true;
+  }
+
 public:
   MicroBolt(void) {
-    // ASSERT: Inject<T>() is idempotent.
     // NOTE: Injection of T into all matching contexts may result in
     // multiple calls to Inject<T>() if a matching context
     // is created during traversal.
-    for(auto findSigil : {ContextEnumeratorT<Sigils>(CoreContext::CurrentContext())...})
-      for(auto context : findSigil)
-        context->template Inject<T>();
+    const auto ctxt = CoreContext::CurrentContext();
+    const bool dummy [] = {
+      LoopInject<Sigils>(ctxt)...,
+      false
+    };
+    (void)dummy;
   }
   void ContextCreated(void) override;
 };

src/autowiring/test/BoltTest.cpp

@@ -211,6 +211,7 @@ class TargetBoltable: public Boltable<target> {
   TargetBoltable() {++numCons;}
   ~TargetBoltable() {++numDest;}
 };
+
 template<class target>
 int TargetBoltable<target>::numCons = 0;
 template<class target>