Remove unneeded headers

leapmotion · Mar 1, 2016 · e32ef01 · e32ef01
1 parent f80eaf7
commit e32ef01
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 18 deletions.
diff --git a/src/autowiring/Decompose.h b/src/autowiring/Decompose.h
@@ -1,15 +1,12 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #pragma once
 #include "is_any.h"
-#include <tuple>
 #include <typeinfo>
 
 template<class... Ts>
 struct TemplatePack {
   static const int N = sizeof...(Ts);
 
-  typedef std::tuple<Ts...> t_args;
-
   /// <returns>
   /// An array of type T, parameterized by the bound function's arguments
   /// </returns>

diff --git a/src/autowiring/DecorationDisposition.h b/src/autowiring/DecorationDisposition.h
@@ -6,25 +6,24 @@
 #include <cassert>
 #include <set>
 #include <vector>
-#include TYPE_INDEX_HEADER
 
 struct SatCounter;
 
 struct DecorationKey {
   DecorationKey(void) = default;
-  
+
   explicit DecorationKey(auto_id id, int tshift) :
     id(id),
     tshift(tshift)
   {}
-  
+
   // The type index
   auto_id id;
 
   // Zero refers to a decoration created on this packet, a positive number [tshift] indicates
   // a decoration attached [tshift] packets ago.
   int tshift = -1;
-  
+
   bool operator==(const DecorationKey& rhs) const {
     return id == rhs.id && tshift == rhs.tshift;
   }
@@ -126,7 +125,7 @@ struct DecorationDisposition
 
   // The current state of this disposition
   DispositionState m_state = DispositionState::Unsatisfied;
-  
+
   /// <returns>
   /// True if all publishers have run on this disposition
   /// </summary>

diff --git a/src/autowiring/Parallel.h b/src/autowiring/Parallel.h
@@ -5,7 +5,6 @@
 #include "DispatchQueue.h"
 #include <iterator>
 #include <unordered_map>
-#include <typeindex>
 #include <deque>
 
 class CoreContext;

diff --git a/src/autowiring/auto_id.h b/src/autowiring/auto_id.h
@@ -1,8 +1,6 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #pragma once
 #include "fast_pointer_cast.h"
-#include <functional>
-#include TYPE_INDEX_HEADER
 
 class CoreObject;
 

diff --git a/src/autowiring/demangle.cpp b/src/autowiring/demangle.cpp
@@ -2,6 +2,8 @@
 #include "stdafx.h"
 #include "demangle.h"
 #include "AnySharedPointer.h"
+#include <sstream>
+#include <typeindex>
 
 #if __GNUG__ // Mac and linux
 #include <cxxabi.h>
@@ -16,7 +18,7 @@ static std::string demangle_name(const char* name) {
 
   if(status != 0)
     return std::string();
-  
+
   return std::string(res.get());
 }
 
@@ -36,7 +38,7 @@ static std::string demangle_name(const char* name) {
       name += 6;
       continue;
     }
-    
+
     if (strncmp(name, "struct ", 7) == 0) {
       name += 7;
       continue;

diff --git a/src/autowiring/demangle.h b/src/autowiring/demangle.h
@@ -1,11 +1,14 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #pragma once
 #include <string>
-#include <typeindex>
 
 struct AnySharedPointer;
 struct auto_id;
 
+namespace std {
+  class type_index;
+}
+
 //
 // Demangle type names on mac and linux.
 // Just returns type_info.name() on windows

diff --git a/src/autowiring/stdafx.h b/src/autowiring/stdafx.h
@@ -14,18 +14,14 @@
   #include <atomic>
   #include <chrono>
   #include <exception>
-  #include <functional>
   #include <iosfwd>
   #include <memory>
   #include <mutex>
   #include <queue>
   #include <set>
-  #include <sstream>
   #include <string>
   #include <thread>
-  #include <tuple>
   #include <type_traits>
-  #include <typeindex>
   #include <unordered_map>
   #include <vector>
 #endif