Combined 2 definitions of index_tuple and put it in its own header

autowiring/AutoCheckout.h

@@ -1,6 +1,5 @@
 // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved.
 #pragma once
-#include <algorithm>
 
 class AutoPacket;
 
@@ -66,4 +65,4 @@ class AutoCheckout {
     completion = rhs.completion;
     return *this;
   }
-};
+};

autowiring/AutoFuture.h

@@ -46,4 +46,3 @@ class AutoFuture
     return true;
   }
 };
-

autowiring/AutoInjectable.h

@@ -23,7 +23,7 @@ class AutoInjectableExpression:
   {}
 
   void operator()(AutoFuture* pFuture) const override {
-    auto added = CallByUnpackingTuple(typename gen_index_tuple<sizeof...(Args)>::type());
+    auto added = CallByUnpackingTuple(typename make_index_tuple<sizeof...(Args)>::type());
     if(pFuture)
       *pFuture += added;
   }

autowiring/AutowiringEvents.h

@@ -5,6 +5,10 @@
 struct AnySharedPointer;
 class CoreContext;
 
+/// <summary>
+/// These events are broadcast internally by Autowiring
+/// for visualizing internal behavior.
+/// </summary
 class AutowiringEvents {
 public:
   virtual void NewContext(CoreContext&)=0;

autowiring/BasicThreadStateBlock.h

@@ -16,4 +16,3 @@ struct BasicThreadStateBlock:
   // The current thread, if running
   std::thread m_thisThread;
 };
-

autowiring/Deserialize.h

@@ -40,49 +40,4 @@ namespace Auto {
       return t;
     }
   };
-
-
-  /// <summary>
-  /// Utility type which enables the composition of a sequence [0, sizeof...(Ts))
-  /// </summary>
-  template<unsigned ...Indicies>
-  struct index_tuple {
-
-    /// Generate an index_tuple with an additional element.
-    template<unsigned N>
-    struct append {
-      typedef index_tuple<Indicies..., N> type;
-    };
-  };
-
-  template<typename ...Members>
-  struct make_index_tuple; //So linux doesn't bitch
-
-  /// Unary metafunction that generates an index_tuple containing [0, Size)
-  template<typename Head, typename ...Tail>
-  struct make_index_tuple<Head, Tail...>{
-    typedef typename make_index_tuple<Tail...>::type::template append<sizeof...(Tail)>::type type;
-  };
-
-  // Terminal case of the recursive metafunction.
-  template<>
-  struct make_index_tuple<>{
-    typedef index_tuple<> type;
-  };
-
-  static_assert(
-    std::is_same<
-      make_index_tuple<>::type,
-      index_tuple<>
-    >::value,
-    "Index tuple base case was not correctly specialized"
-  );
-
-  static_assert(
-    std::is_same<
-      make_index_tuple<int, int, int>::type,
-      index_tuple<0, 1, 2>
-    >::value,
-    "Index tuple conversion function did not properly index a sample type"
-  );
-}
+}

autowiring/EventInputStream.h

@@ -2,6 +2,7 @@
 #pragma once
 #include "Decompose.h"
 #include "Deserialize.h"
+#include "index_tuple.h"
 #include <string>
 #include <sstream>
 #include <deque>
@@ -39,11 +40,11 @@ struct Expression<R(W::*)(ToBindArgs...) >: public ExpressionBase
   /// parameter pack expansion.
   /// </summary>
   void DeserializeAndForward(std::deque<std::string> & d){
-    DeserializeAndForward(d, typename Auto::make_index_tuple<ToBindArgs...>::type());
+    DeserializeAndForward(d, typename make_index_tuple<sizeof...(ToBindArgs)>::type());
   }
 
-  template<unsigned... I>
-  void DeserializeAndForward(std::deque<std::string> & d, Auto::index_tuple<I...>){
+  template<int... I>
+  void DeserializeAndForward(std::deque<std::string> & d, index_tuple<I...>){
     auto it = d.begin();
     AutoFired<W> sender;
     sender(m_memfunc)(Auto::deser<ToBindArgs>::deserialize(it[I])...);

autowiring/InvokeRelay.h

@@ -1,25 +1,14 @@
 // Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved.
 #pragma once
 #include "is_any.h"
+#include "index_tuple.h"
 #include "JunctionBox.h"
 
 class Deferred;
 
 template<typename T>
 class JunctionBox;
 
-// Generate and index tuple
-template<int ...>
-struct index_tuple {};
-
-template<int N, int... S>
-struct gen_index_tuple: gen_index_tuple<N - 1, N - 1, S...> {};
-
-template<int... S>
-struct gen_index_tuple<0, S...> {
-  typedef index_tuple<S...> type;
-};
-
 /// <summary>
 /// A fully bound member function call
 /// </summary>
@@ -55,7 +44,7 @@ class CurriedInvokeRelay:
 
 public:
   void operator()(void) override {
-    CallByUnpackingTuple(typename gen_index_tuple<sizeof...(Args)>::type());
+    CallByUnpackingTuple(typename make_index_tuple<sizeof...(Args)>::type());
   }
 };
 

autowiring/SharedPointerSlot.h

@@ -372,4 +372,4 @@ struct SharedPointerSlotT:
   T& operator*(void) const {
     return *get();
   }
-};
+};

autowiring/TypeUnifier.h

@@ -22,8 +22,7 @@ template<class T>
 class TypeUnifierSimple:
   public T,
   public TypeUnifier
-{
-};
+{};
 
 /// <summary>
 /// Utility class which allows us to either use the pure type T, or a unifier, as appropriate

autowiring/index_tuple.h

@@ -0,0 +1,23 @@
+// Copyright (C) 2012-2014 Leap Motion, Inc. All rights reserved.
+#pragma once
+
+/// <summary>
+/// Utility type which enables the composition of a sequence [0, sizeof...(Ts))
+template<int ...>
+struct index_tuple {};
+
+template<unsigned int N, unsigned int... S>
+struct make_index_tuple: make_index_tuple<N - 1, N - 1, S...> {};
+
+template<unsigned int... S>
+struct make_index_tuple<0, S...> {
+  typedef index_tuple<S...> type;
+};
+
+static_assert(
+  std::is_same<
+    make_index_tuple<3>::type,
+    index_tuple<0,1,2>
+  >::value,
+  "Index tuple base case was not correctly specialized"
+);

src/autowiring/AutowirableSlot.cpp

@@ -10,8 +10,7 @@ using namespace std;
 DeferrableAutowiring::DeferrableAutowiring(const std::shared_ptr<CoreContext>& context) :
   m_context(context),
   m_pFlink(nullptr)
-{
-}
+{}
 
 DeferrableAutowiring::~DeferrableAutowiring(void) {
   // Clients MUST call CancelAutowiring from their destructor--if this line is being hit,

src/autowiring/CMakeLists.txt

@@ -76,6 +76,7 @@ set(Autowiring_SRCS
   has_autofilter.h
   has_simple_constructor.h
   has_static_new.h
+  index_tuple.h
   is_any.h
   is_shared_ptr.h
   InterlockedExchange.h
@@ -98,6 +99,7 @@ set(Autowiring_SRCS
   ThreadStatusBlock.h
   ThreadStatusBlock.cpp
   thread_specific_ptr.h
+  TypeIdentifier.h
   TypeRegistry.h
   TypeRegistry.cpp
   TypeUnifier.h