From 9177608f4d3357d54a057c6bb9a730ba2d69bd95 Mon Sep 17 00:00:00 2001 From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz> Date: Thu, 22 Jun 2017 20:37:33 +0200 Subject: [PATCH] simplification of std overriding wrappers --- alib2std/src/algorithm | 7 +------ alib2std/src/bitset | 7 +------ alib2std/src/clone | 7 +------ alib2std/src/compare | 7 +------ alib2std/src/deque | 7 +------ alib2std/src/fdstream | 7 +------ alib2std/src/foreach | 7 +------ alib2std/src/forward_list | 7 +------ alib2std/src/forward_tree | 7 +------ alib2std/src/hexavigesimal | 7 +------ alib2std/src/iostream | 7 +------ alib2std/src/istream | 7 +------ alib2std/src/iterator | 7 +------ alib2std/src/linear_set | 7 +------ alib2std/src/list | 7 +------ alib2std/src/map | 7 +------ alib2std/src/memory | 7 +------ alib2std/src/pair | 7 +------ alib2std/src/random | 7 +------ alib2std/src/set | 7 +------ alib2std/src/string | 7 +------ alib2std/src/tree | 7 +------ alib2std/src/trie | 7 +------ alib2std/src/tuple | 7 +------ alib2std/src/type_traits | 7 +------ alib2std/src/typeindex | 7 +------ alib2std/src/typeinfo | 7 +------ alib2std/src/unordered_map | 7 +------ alib2std/src/utility | 7 +------ alib2std/src/variant | 7 +------ alib2std/src/vector | 7 +------ 31 files changed, 31 insertions(+), 186 deletions(-) diff --git a/alib2std/src/algorithm b/alib2std/src/algorithm index 5715229eca..ba1d6b4c43 100644 --- a/alib2std/src/algorithm +++ b/alib2std/src/algorithm @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __ALGORITHM_HEADER_WRAPPER_ - #define __ALGORITHM_HEADER_WRAPPER_ - - #include "extensions/algorithm.hpp" - - #endif /* __ALGORITHM_HEADER_WRAPPER_ */ + #include "extensions/algorithm.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/bitset b/alib2std/src/bitset index a62e8968bc..ec260061c4 100644 --- a/alib2std/src/bitset +++ b/alib2std/src/bitset @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __BITSET_HEADER_WRAPPER_ - #define __BITSET_HEADER_WRAPPER_ - - #include "extensions/bitset.hpp" - - #endif /* __BITSET_HEADER_WRAPPER_ */ + #include "extensions/bitset.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/clone b/alib2std/src/clone index e47057c50f..c2c1cab9f4 100644 --- a/alib2std/src/clone +++ b/alib2std/src/clone @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __CLONE_HEADER_WRAPPER_ - #define __CLONE_HEADER_WRAPPER_ - - #include "extensions/clone.hpp" - - #endif /* __CLONE_HEADER_WRAPPER_ */ + #include "extensions/clone.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/compare b/alib2std/src/compare index 5bf3f36233..588f53ec5f 100644 --- a/alib2std/src/compare +++ b/alib2std/src/compare @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __COMPARE_HEADER_WRAPPER_ - #define __COMPARE_HEADER_WRAPPER_ - - #include "extensions/compare.hpp" - - #endif /* __COMPARE_HEADER_WRAPPER_ */ + #include "extensions/compare.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/deque b/alib2std/src/deque index ad1e1b3ce5..de2f2b69cf 100644 --- a/alib2std/src/deque +++ b/alib2std/src/deque @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __DEQUE_HEADER_WRAPPER_ - #define __DEQUE_HEADER_WRAPPER_ - - #include "extensions/deque.hpp" - - #endif /* __DEQUE_HEADER_WRAPPER_ */ + #include "extensions/deque.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/fdstream b/alib2std/src/fdstream index 76662c0182..cb1cb7529d 100644 --- a/alib2std/src/fdstream +++ b/alib2std/src/fdstream @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __FDSTREAM_HEADER_WRAPPER_ - #define __FDSTREAM_HEADER_WRAPPER_ - - #include "extensions/fdstream.hpp" - - #endif /* __FDSTREAM_HEADER_WRAPPER_ */ + #include "extensions/fdstream.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/foreach b/alib2std/src/foreach index 7e09786bbb..f3fedd0055 100644 --- a/alib2std/src/foreach +++ b/alib2std/src/foreach @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __FOREACH_HEADER_WRAPPER_ - #define __FOREACH_HEADER_WRAPPER_ - - #include "extensions/foreach.hpp" - - #endif /* __FOREACH_HEADER_WRAPPER_ */ + #include "extensions/foreach.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/forward_list b/alib2std/src/forward_list index 1004f0fe32..4d324a1964 100644 --- a/alib2std/src/forward_list +++ b/alib2std/src/forward_list @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __LIST_HEADER_WRAPPER_ - #define __LIST_HEADER_WRAPPER_ - - #include "extensions/forward_list.hpp" - - #endif /* __LIST_HEADER_WRAPPER_ */ + #include "extensions/forward_list.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/forward_tree b/alib2std/src/forward_tree index 3055b577e2..bf26086d63 100644 --- a/alib2std/src/forward_tree +++ b/alib2std/src/forward_tree @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __TREE_HEADER_WRAPPER_ - #define __TREE_HEADER_WRAPPER_ - - #include "extensions/forward_tree.hpp" - - #endif /* __TREE_HEADER_WRAPPER_ */ + #include "extensions/forward_tree.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/hexavigesimal b/alib2std/src/hexavigesimal index 96c1d8e859..b48b310039 100644 --- a/alib2std/src/hexavigesimal +++ b/alib2std/src/hexavigesimal @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __HEXAVIGESIMAL_HEADER_WRAPPER_ - #define __HEXAVIGESIMAL_HEADER_WRAPPER_ - - #include "extensions/hexavigesimal.h" - - #endif /* __HEXAVIGESIMAL_HEADER_WRAPPER_ */ + #include "extensions/hexavigesimal.h" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/iostream b/alib2std/src/iostream index a7e4d85991..7f82572d89 100644 --- a/alib2std/src/iostream +++ b/alib2std/src/iostream @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __IOSTREAM_HEADER_WRAPPER_ - #define __IOSTREAM_HEADER_WRAPPER_ - - #include "extensions/iostream.hpp" - - #endif /* __IOSTREAM_HEADER_WRAPPER_ */ + #include "extensions/iostream.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/istream b/alib2std/src/istream index f9b8163622..ba909a44ec 100644 --- a/alib2std/src/istream +++ b/alib2std/src/istream @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __ISTREAM_HEADER_WRAPPER_ - #define __ISTREAM_HEADER_WRAPPER_ - - #include "extensions/istream.h" - - #endif /* __ISTREAM_HEADER_WRAPPER_ */ + #include "extensions/istream.h" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/iterator b/alib2std/src/iterator index 9313e7049e..5bebfca207 100644 --- a/alib2std/src/iterator +++ b/alib2std/src/iterator @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __ITERATOR_HEADER_WRAPPER_ - #define __ITERATOR_HEADER_WRAPPER_ - - #include "extensions/iterator.hpp" - - #endif /* __ITERATOR_HEADER_WRAPPER_ */ + #include "extensions/iterator.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/linear_set b/alib2std/src/linear_set index bbfbc8c45b..d8125b992b 100644 --- a/alib2std/src/linear_set +++ b/alib2std/src/linear_set @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __LINEAR_SET_HEADER_WRAPPER_ - #define __LINEAR_SET_HEADER_WRAPPER_ - - #include "extensions/linear_set.hpp" - - #endif /* __LINEAR_SET_HEADER_WRAPPER_ */ + #include "extensions/linear_set.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/list b/alib2std/src/list index 159ee14f66..48436dabb5 100644 --- a/alib2std/src/list +++ b/alib2std/src/list @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __LIST_HEADER_WRAPPER_ - #define __LIST_HEADER_WRAPPER_ - - #include "extensions/list.hpp" - - #endif /* __LIST_HEADER_WRAPPER_ */ + #include "extensions/list.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/map b/alib2std/src/map index 8871a1e118..fd5da8b78d 100644 --- a/alib2std/src/map +++ b/alib2std/src/map @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __MAP_HEADER_WRAPPER_ - #define __MAP_HEADER_WRAPPER_ - - #include "extensions/map.hpp" - - #endif /* __MAP_HEADER_WRAPPER_ */ + #include "extensions/map.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/memory b/alib2std/src/memory index 501cb904eb..bb445a08a1 100644 --- a/alib2std/src/memory +++ b/alib2std/src/memory @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __MEMORY_HEADER_WRAPPER_ - #define __MEMORY_HEADER_WRAPPER_ - - #include "extensions/memory.hpp" - - #endif /* __MEMORY_HEADER_WRAPPER_ */ + #include "extensions/memory.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/pair b/alib2std/src/pair index 8c18cf25b6..f7bc847929 100644 --- a/alib2std/src/pair +++ b/alib2std/src/pair @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __PAIR_HEADER_WRAPPER_ - #define __PAIR_HEADER_WRAPPER_ - - #include "extensions/pair.hpp" - - #endif /* __PAIR_HEADER_WRAPPER_ */ + #include "extensions/pair.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/random b/alib2std/src/random index 12d94bf5f8..a3880d60cb 100644 --- a/alib2std/src/random +++ b/alib2std/src/random @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __RANDOM_HEADER_WRAPPER_ - #define __RANDOM_HEADER_WRAPPER_ - - #include "extensions/random.hpp" - - #endif /* __RANDOM_HEADER_WRAPPER_ */ + #include "extensions/random.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/set b/alib2std/src/set index 12d9d8c321..55c6bf9e84 100644 --- a/alib2std/src/set +++ b/alib2std/src/set @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __SET_HEADER_WRAPPER_ - #define __SET_HEADER_WRAPPER_ - - #include "extensions/set.hpp" - - #endif /* __SET_HEADER_WRAPPER_ */ + #include "extensions/set.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/string b/alib2std/src/string index 73736c7089..f1139e50b6 100644 --- a/alib2std/src/string +++ b/alib2std/src/string @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __STRING_HEADER_WRAPPER_ - #define __STRING_HEADER_WRAPPER_ - - #include "extensions/string.hpp" - - #endif /* __STRING_HEADER_WRAPPER_ */ + #include "extensions/string.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/tree b/alib2std/src/tree index ad4feaeed1..8057f18714 100644 --- a/alib2std/src/tree +++ b/alib2std/src/tree @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __TREE_HEADER_WRAPPER_ - #define __TREE_HEADER_WRAPPER_ - - #include "extensions/tree.hpp" - - #endif /* __TREE_HEADER_WRAPPER_ */ + #include "extensions/tree.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/trie b/alib2std/src/trie index 014df07d80..c33cc65dc3 100644 --- a/alib2std/src/trie +++ b/alib2std/src/trie @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __TRIE_HEADER_WRAPPER_ - #define __TRIE_HEADER_WRAPPER_ - - #include "extensions/trie.hpp" - - #endif /* __TRIE_HEADER_WRAPPER_ */ + #include "extensions/trie.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/tuple b/alib2std/src/tuple index d3b5f452c2..af12226a67 100644 --- a/alib2std/src/tuple +++ b/alib2std/src/tuple @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __TUPLE_HEADER_WRAPPER_ - #define __TUPLE_HEADER_WRAPPER_ - - #include "extensions/tuple.hpp" - - #endif /* __TUPLE_HEADER_WRAPPER_ */ + #include "extensions/tuple.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/type_traits b/alib2std/src/type_traits index 8097e0371d..e67d17494d 100644 --- a/alib2std/src/type_traits +++ b/alib2std/src/type_traits @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __TYPE_TRAITS_HEADER_WRAPPER_ - #define __TYPE_TRAITS_HEADER_WRAPPER_ - - #include "extensions/type_traits.hpp" - - #endif /* __TYPE_TRAITS_HEADER_WRAPPER_ */ + #include "extensions/type_traits.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/typeindex b/alib2std/src/typeindex index 6253e0e03f..2649402658 100644 --- a/alib2std/src/typeindex +++ b/alib2std/src/typeindex @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __TYPEINDEX_HEADER_WRAPPER_ - #define __TYPEINDEX_HEADER_WRAPPER_ - - #include "extensions/typeindex.h" - - #endif /* __TYPEINDEX_HEADER_WRAPPER_ */ + #include "extensions/typeindex.h" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/typeinfo b/alib2std/src/typeinfo index de9b8adc05..13f047fd98 100644 --- a/alib2std/src/typeinfo +++ b/alib2std/src/typeinfo @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __TYPEINFO_HEADER_WRAPPER_ - #define __TYPEINFO_HEADER_WRAPPER_ - - #include "extensions/typeinfo.hpp" - - #endif /* __TYPEINFO_HEADER_WRAPPER_ */ + #include "extensions/typeinfo.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/unordered_map b/alib2std/src/unordered_map index c0f626797b..13480a4cd6 100644 --- a/alib2std/src/unordered_map +++ b/alib2std/src/unordered_map @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __UNORDERED_MAP_HEADER_WRAPPER_ - #define __UNORDERED_MAP_HEADER_WRAPPER_ - - #include "extensions/unordered_map.hpp" - - #endif /* __UNORDERED_MAP_HEADER_WRAPPER_ */ + #include "extensions/unordered_map.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/utility b/alib2std/src/utility index c4a542d3d1..8ef3c89653 100644 --- a/alib2std/src/utility +++ b/alib2std/src/utility @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __UTILITY_HEADER_WRAPPER_ - #define __UTILITY_HEADER_WRAPPER_ - - #include "extensions/utility.hpp" - - #endif /* __UTILITY_HEADER_WRAPPER_ */ + #include "extensions/utility.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/variant b/alib2std/src/variant index 6fa4554616..6fab1228c7 100644 --- a/alib2std/src/variant +++ b/alib2std/src/variant @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __VATIANT_HEADER_WRAPPER_ - #define __VATIANT_HEADER_WRAPPER_ - - #include "extensions/variant.hpp" - - #endif /* __VARIANT_HEADER_WRAPPER */ + #include "extensions/variant.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else diff --git a/alib2std/src/vector b/alib2std/src/vector index e4e751567e..fe6d226417 100644 --- a/alib2std/src/vector +++ b/alib2std/src/vector @@ -1,12 +1,7 @@ #ifndef __ALIB_INTERNAL_STD_EXTENSION_ #define __ALIB_INTERNAL_STD_EXTENSION_ - #ifndef __VECTOR_HEADER_WRAPPER_ - #define __VECTOR_HEADER_WRAPPER_ - - #include "extensions/vector.hpp" - - #endif /* __VECTOR_HEADER_WRAPPER_ */ + #include "extensions/vector.hpp" #undef __ALIB_INTERNAL_STD_EXTENSION_ #else -- GitLab