From 224e55d9d27fba79491b8285f1581de954e60dca Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Wed, 21 Jun 2017 22:43:19 +0200
Subject: [PATCH] attempt to optimize includes in std extension

---
 alib2std/src/extensions/clone.hpp        | 1 -
 alib2std/src/extensions/forward_tree.hpp | 1 -
 alib2std/src/extensions/memory.hpp       | 1 -
 alib2std/src/extensions/pair.hpp         | 3 ---
 alib2std/src/extensions/tree.hpp         | 1 -
 alib2std/src/extensions/tree_base.hpp    | 1 -
 alib2std/src/extensions/trie.hpp         | 1 -
 alib2std/src/extensions/typeinfo.cpp     | 2 ++
 alib2std/src/extensions/typeinfo.hpp     | 6 ++----
 alib2std/src/extensions/variant.hpp      | 1 -
 10 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/alib2std/src/extensions/clone.hpp b/alib2std/src/extensions/clone.hpp
index d5780a92a9..fb6787b053 100644
--- a/alib2std/src/extensions/clone.hpp
+++ b/alib2std/src/extensions/clone.hpp
@@ -8,7 +8,6 @@
 #ifndef __CLONE_HPP_
 #define __CLONE_HPP_
 
-#include <type_traits>
 #include "type_traits.hpp"
 
 namespace std {
diff --git a/alib2std/src/extensions/forward_tree.hpp b/alib2std/src/extensions/forward_tree.hpp
index 816dc992fd..1976209bf7 100644
--- a/alib2std/src/extensions/forward_tree.hpp
+++ b/alib2std/src/extensions/forward_tree.hpp
@@ -12,7 +12,6 @@
 #include <vector>
 #include <deque>
 #include <tuple>
-#include <iterator>
 #include <string>
 #include <sstream>
 
diff --git a/alib2std/src/extensions/memory.hpp b/alib2std/src/extensions/memory.hpp
index c4882c7903..b65e7d0f8c 100644
--- a/alib2std/src/extensions/memory.hpp
+++ b/alib2std/src/extensions/memory.hpp
@@ -9,7 +9,6 @@
 #define __MEMORY_HPP_
 
 #include <memory>
-#include <type_traits>
 #include <utility>
 
 #include "compare.hpp"
diff --git a/alib2std/src/extensions/pair.hpp b/alib2std/src/extensions/pair.hpp
index 921ce06b93..c8c0aed93a 100644
--- a/alib2std/src/extensions/pair.hpp
+++ b/alib2std/src/extensions/pair.hpp
@@ -8,9 +8,6 @@
 #ifndef __PAIR_HPP_
 #define __PAIR_HPP_
 
-#include <utility>
-#include <type_traits>
-#include <cstddef>
 #include <string>
 #include <sstream>
 
diff --git a/alib2std/src/extensions/tree.hpp b/alib2std/src/extensions/tree.hpp
index 17a92b1070..3341e95305 100644
--- a/alib2std/src/extensions/tree.hpp
+++ b/alib2std/src/extensions/tree.hpp
@@ -11,7 +11,6 @@
 #include <memory>
 #include <vector>
 #include <deque>
-#include <iterator>
 #include <string>
 #include <sstream>
 
diff --git a/alib2std/src/extensions/tree_base.hpp b/alib2std/src/extensions/tree_base.hpp
index c2578e028e..be705b975c 100644
--- a/alib2std/src/extensions/tree_base.hpp
+++ b/alib2std/src/extensions/tree_base.hpp
@@ -8,7 +8,6 @@
 #ifndef __TREE_BASE_HPP_
 #define __TREE_BASE_HPP_
 
-#include <tuple>
 #include "tuple.hpp"
 
 namespace std {
diff --git a/alib2std/src/extensions/trie.hpp b/alib2std/src/extensions/trie.hpp
index 66d6ffe203..9c9d6906c3 100644
--- a/alib2std/src/extensions/trie.hpp
+++ b/alib2std/src/extensions/trie.hpp
@@ -10,7 +10,6 @@
 
 #include <memory>
 #include <map>
-#include <tuple>
 #include <iterator>
 #include <string>
 #include <sstream>
diff --git a/alib2std/src/extensions/typeinfo.cpp b/alib2std/src/extensions/typeinfo.cpp
index 70c866c5f1..a3e10a6a77 100644
--- a/alib2std/src/extensions/typeinfo.cpp
+++ b/alib2std/src/extensions/typeinfo.cpp
@@ -6,6 +6,8 @@
  */
 
 #include <typeinfo>
+#include <cstdlib>
+#include <cxxabi.h>
 
 namespace std {
 
diff --git a/alib2std/src/extensions/typeinfo.hpp b/alib2std/src/extensions/typeinfo.hpp
index 4072683db2..c82de1a7b5 100644
--- a/alib2std/src/extensions/typeinfo.hpp
+++ b/alib2std/src/extensions/typeinfo.hpp
@@ -9,12 +9,10 @@
 #define __TYPEINFO_HPP_
 
 #include <typeinfo>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <cxxabi.h>
 #include <typeindex>
 #include <string>
+#include <cstdio>
+#include <cstring>
 
 namespace std {
 
diff --git a/alib2std/src/extensions/variant.hpp b/alib2std/src/extensions/variant.hpp
index 6f3aaac487..88fb2815a3 100644
--- a/alib2std/src/extensions/variant.hpp
+++ b/alib2std/src/extensions/variant.hpp
@@ -14,7 +14,6 @@
 #include <iostream>
 #include <utility>
 #include <typeinfo>
-#include <type_traits>
 #include <string>
 #include <cstring>
 #include <sstream>
-- 
GitLab