refs #113 Правильное место для метафункций

izvolov · Jun 20, 2020 · 07b064c · 07b064c
1 parent 2283e62
commit 07b064c
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 32 deletions.
diff --git a/include/burst/algorithm/detail/counting_sort.hpp b/include/burst/algorithm/detail/counting_sort.hpp
@@ -2,7 +2,8 @@
 #define BURST_ALGORITHM_DETAIL_COUNTING_SORT_HPP
 
 #include <burst/container/access/cback.hpp>
-#include <burst/iterator/traits.hpp>
+#include <burst/type_traits/iterator_difference.hpp>
+#include <burst/type_traits/iterator_value.hpp>
 
 #include <algorithm>
 #include <iterator>

diff --git a/include/burst/algorithm/detail/move_assign_please.hpp b/include/burst/algorithm/detail/move_assign_please.hpp
@@ -1,7 +1,7 @@
 #ifndef BURST_ALGORITHM_DETAIL_MOVE_ASSIGN_PLEASE_HPP
 #define BURST_ALGORITHM_DETAIL_MOVE_ASSIGN_PLEASE_HPP
 
-#include <burst/iterator/traits/iterator_value.hpp>
+#include <burst/type_traits/iterator_value.hpp>
 
 #include <iterator>
 #include <type_traits>

diff --git a/include/burst/algorithm/detail/radix_sort.hpp b/include/burst/algorithm/detail/radix_sort.hpp
@@ -5,7 +5,8 @@
 #include <burst/algorithm/detail/move_assign_please.hpp>
 #include <burst/algorithm/detail/nth_radix.hpp>
 #include <burst/algorithm/detail/radix_sort_traits.hpp>
-#include <burst/iterator/traits.hpp>
+#include <burst/type_traits/iterator_difference.hpp>
+#include <burst/type_traits/iterator_value.hpp>
 #include <burst/variadic.hpp>
 
 #include <algorithm>

diff --git a/include/burst/iterator/join_iterator.hpp b/include/burst/iterator/join_iterator.hpp
@@ -3,7 +3,7 @@
 
 #include <burst/iterator/detail/join_iterator.hpp>
 #include <burst/iterator/end_tag.hpp>
-#include <burst/range/pure_traversal.hpp>
+#include <burst/type_traits/range_pure_traversal.hpp>
 
 #include <boost/iterator/minimum_category.hpp>
 #include <boost/range/value_type.hpp>

diff --git a/include/burst/iterator/traits.hpp b/include/burst/iterator/traits.hpp
diff --git a/...rst/iterator/traits/iterator_category.hpp → ...e/burst/type_traits/iterator_category.hpp b/...rst/iterator/traits/iterator_category.hpp → ...e/burst/type_traits/iterator_category.hpp
@@ -1,5 +1,5 @@
-#ifndef BURST_ITERATOR_TRAITS_ITERATOR_CATEGORY_HPP
-#define BURST_ITERATOR_TRAITS_ITERATOR_CATEGORY_HPP
+#ifndef BURST_TYPE_TRAITS_ITERATOR_CATEGORY_HPP
+#define BURST_TYPE_TRAITS_ITERATOR_CATEGORY_HPP
 
 #include <iterator>
 
@@ -9,4 +9,4 @@ namespace burst
     using iterator_category_t = typename std::iterator_traits<Iterator>::iterator_category;
 }
 
-#endif // BURST_ITERATOR_TRAITS_ITERATOR_CATEGORY_HPP
+#endif // BURST_TYPE_TRAITS_ITERATOR_CATEGORY_HPP
diff --git a/...t/iterator/traits/iterator_difference.hpp → ...burst/type_traits/iterator_difference.hpp b/...t/iterator/traits/iterator_difference.hpp → ...burst/type_traits/iterator_difference.hpp
@@ -1,5 +1,5 @@
-#ifndef BURST_ITERATOR_TRAITS_ITERATOR_DIFFERENCE_HPP
-#define BURST_ITERATOR_TRAITS_ITERATOR_DIFFERENCE_HPP
+#ifndef BURST_TYPE_TRAITS_ITERATOR_DIFFERENCE_HPP
+#define BURST_TYPE_TRAITS_ITERATOR_DIFFERENCE_HPP
 
 #include <iterator>
 
@@ -9,4 +9,4 @@ namespace burst
     using iterator_difference_t = typename std::iterator_traits<Iterator>::difference_type;
 }
 
-#endif // BURST_ITERATOR_TRAITS_ITERATOR_DIFFERENCE_HPP
+#endif // BURST_TYPE_TRAITS_ITERATOR_DIFFERENCE_HPP
diff --git a/...urst/iterator/traits/iterator_pointer.hpp → ...de/burst/type_traits/iterator_pointer.hpp b/...urst/iterator/traits/iterator_pointer.hpp → ...de/burst/type_traits/iterator_pointer.hpp
@@ -1,5 +1,5 @@
-#ifndef BURST_ITERATOR_TRAITS_ITERATOR_POINTER_HPP
-#define BURST_ITERATOR_TRAITS_ITERATOR_POINTER_HPP
+#ifndef BURST_TYPE_TRAITS_ITERATOR_POINTER_HPP
+#define BURST_TYPE_TRAITS_ITERATOR_POINTER_HPP
 
 #include <iterator>
 
@@ -9,4 +9,4 @@ namespace burst
     using iterator_pointer_t = typename std::iterator_traits<Iterator>::pointer;
 }
 
-#endif // BURST_ITERATOR_TRAITS_ITERATOR_POINTER_HPP
+#endif // BURST_TYPE_TRAITS_ITERATOR_POINTER_HPP
diff --git a/...st/iterator/traits/iterator_reference.hpp → .../burst/type_traits/iterator_reference.hpp b/...st/iterator/traits/iterator_reference.hpp → .../burst/type_traits/iterator_reference.hpp
@@ -1,5 +1,5 @@
-#ifndef BURST_ITERATOR_TRAITS_ITERATOR_REFERENCE_HPP
-#define BURST_ITERATOR_TRAITS_ITERATOR_REFERENCE_HPP
+#ifndef BURST_TYPE_TRAITS_ITERATOR_REFERENCE_HPP
+#define BURST_TYPE_TRAITS_ITERATOR_REFERENCE_HPP
 
 #include <iterator>
 
@@ -9,4 +9,4 @@ namespace burst
     using iterator_reference_t = typename std::iterator_traits<Iterator>::reference;
 }
 
-#endif // BURST_ITERATOR_TRAITS_ITERATOR_REFERENCE_HPP
+#endif // BURST_TYPE_TRAITS_ITERATOR_REFERENCE_HPP
diff --git a/.../burst/iterator/traits/iterator_value.hpp → include/burst/type_traits/iterator_value.hpp b/.../burst/iterator/traits/iterator_value.hpp → include/burst/type_traits/iterator_value.hpp
@@ -1,5 +1,5 @@
-#ifndef BURST_ITERATOR_TRAITS_ITERATOR_VALUE_HPP
-#define BURST_ITERATOR_TRAITS_ITERATOR_VALUE_HPP
+#ifndef BURST_TYPE_TRAITS_ITERATOR_VALUE_HPP
+#define BURST_TYPE_TRAITS_ITERATOR_VALUE_HPP
 
 #include <iterator>
 
@@ -9,4 +9,4 @@ namespace burst
     using iterator_value_t = typename std::iterator_traits<Iterator>::value_type;
 }
 
-#endif // BURST_ITERATOR_TRAITS_ITERATOR_VALUE_HPP
+#endif // BURST_TYPE_TRAITS_ITERATOR_VALUE_HPP
diff --git a/include/burst/range/pure_traversal.hpp → ...urst/type_traits/range_pure_traversal.hpp b/include/burst/range/pure_traversal.hpp → ...urst/type_traits/range_pure_traversal.hpp
@@ -1,5 +1,5 @@
-#ifndef BURST_RANGE_PURE_TRAVERSAL_HPP
-#define BURST_RANGE_PURE_TRAVERSAL_HPP
+#ifndef BURST_TYPE_TRAITS_RANGE_PURE_TRAVERSAL_HPP
+#define BURST_TYPE_TRAITS_RANGE_PURE_TRAVERSAL_HPP
 
 #include <boost/iterator/iterator_categories.hpp>
 #include <boost/range/traversal.hpp>
@@ -21,4 +21,4 @@ namespace burst
     using range_pure_traversal_t = typename range_pure_traversal<Range>::type;
 } // namespace burst
 
-#endif // BURST_RANGE_PURE_TRAVERSAL_HPP
+#endif // BURST_TYPE_TRAITS_RANGE_PURE_TRAVERSAL_HPP