#21 Segregated headers to generator, operator and sink directories

bartop · Dec 3, 2017 · 24da6ff · 24da6ff
1 parent bc6a563
commit 24da6ff
Show file tree

Hide file tree

Showing 35 changed files with 22 additions and 20 deletions.
diff --git a/tests/all_test.cpp b/tests/all_test.cpp
@@ -1,7 +1,7 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
 #include <catch.hpp>
 
-#include "all.hpp"
+#include <sink/all.hpp>
 
 #include <vector>
 

diff --git a/tests/any_test.cpp b/tests/any_test.cpp
@@ -1,7 +1,7 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
 #include <catch.hpp>
 
-#include "any.hpp"
+#include <sink/any.hpp>
 
 #include <vector>
 

diff --git a/tests/copy_to_test.cpp b/tests/copy_to_test.cpp
@@ -1,7 +1,7 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
 #include <catch.hpp>
 
-#include <copy_to.hpp>
+#include <sink/copy_to.hpp>
 
 #include <vector>
 

diff --git a/tests/count_test.cpp b/tests/count_test.cpp
@@ -1,7 +1,7 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
 #include <catch.hpp>
 
-#include "count.hpp"
+#include <sink/count.hpp>
 
 #include <vector>
 

diff --git a/tests/enumerable_traits_test.cpp b/tests/enumerable_traits_test.cpp
@@ -2,8 +2,8 @@
 #include <catch.hpp>
 
 #include <meta/enumerable_traits.hpp>
-#include <filtered.hpp>
-#include <transformed.hpp>
+#include <operator/filtered.hpp>
+#include <operator/transformed.hpp>
 
 #include <vector>
 #include <map>

diff --git a/tests/filtered_test.cpp b/tests/filtered_test.cpp
@@ -1,7 +1,7 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
 #include <catch.hpp>
 
-#include "filtered.hpp"
+#include <operator/filtered.hpp>
 
 #include <vector>
 

diff --git a/tests/flattened_test.cpp b/tests/flattened_test.cpp
@@ -1,7 +1,7 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
 #include <catch.hpp>
 
-#include <flattened.hpp>
+#include <operator/flattened.hpp>
 
 #include <vector>
 

diff --git a/tests/fold_left_test.cpp b/tests/fold_left_test.cpp
@@ -1,7 +1,7 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
 #include <catch.hpp>
 
-#include <fold_left.hpp>
+#include <sink/fold_left.hpp>
 
 #include <vector>
 

diff --git a/tests/generator_test.cpp b/tests/generator_test.cpp
@@ -1,7 +1,7 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
 #include <catch.hpp>
 
-#include <generator.hpp>
+#include <generator/generator.hpp>
 
 #include <string>
 #include <algorithm>

diff --git a/tests/infinite_test.cpp b/tests/infinite_test.cpp
@@ -1,7 +1,7 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
 #include <catch.hpp>
 
-#include <infinite.hpp>
+#include <generator/infinite.hpp>
 
 #include <string>
 #include <algorithm>

diff --git a/tests/is_associative_test.cpp b/tests/is_associative_test.cpp
@@ -2,8 +2,8 @@
 #include <catch.hpp>
 
 #include <meta/is_associative.hpp>
-#include <filtered.hpp>
-#include <transformed.hpp>
+#include <operator/filtered.hpp>
+#include <operator/transformed.hpp>
 
 #include <vector>
 #include <map>

diff --git a/tests/keys_test.cpp b/tests/keys_test.cpp
@@ -1,7 +1,7 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
 #include <catch.hpp>
 
-#include <keys.hpp>
+#include <operator/keys.hpp>
 
 #include <vector>
 

diff --git a/tests/mapped_values_test.cpp b/tests/mapped_values_test.cpp
@@ -1,7 +1,7 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
 #include <catch.hpp>
 
-#include <mapped_values.hpp>
+#include <operator/mapped_values.hpp>
 
 #include <vector>
 

diff --git a/tests/sorted_test.cpp b/tests/sorted_test.cpp
@@ -1,7 +1,7 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
 #include <catch.hpp>
 
-#include "sorted.hpp"
+#include <operator/sorted.hpp>
 
 #include <vector>
 

diff --git a/tests/transformed_test.cpp b/tests/transformed_test.cpp
@@ -1,7 +1,7 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
 #include <catch.hpp>
 
-#include "transformed.hpp"
+#include <operator/transformed.hpp>
 
 #include <vector>
 

diff --git a/tests/zipped_test.cpp b/tests/zipped_test.cpp
@@ -1,7 +1,7 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
 #include <catch.hpp>
 
-#include <zipped.hpp>
+#include <operator/zipped.hpp>
 
 #include <vector>
 

diff --git a/tpl/pointer_proxy.hpp → tpl/detail/pointer_proxy.hpp b/tpl/pointer_proxy.hpp → tpl/detail/pointer_proxy.hpp
diff --git a/tpl/generator.hpp → tpl/generator/generator.hpp b/tpl/generator.hpp → tpl/generator/generator.hpp
diff --git a/tpl/infinite.hpp → tpl/generator/infinite.hpp b/tpl/infinite.hpp → tpl/generator/infinite.hpp
diff --git a/tpl/filtered.hpp → tpl/operator/filtered.hpp b/tpl/filtered.hpp → tpl/operator/filtered.hpp
diff --git a/tpl/flattened.hpp → tpl/operator/flattened.hpp b/tpl/flattened.hpp → tpl/operator/flattened.hpp
diff --git a/tpl/keys.hpp → tpl/operator/keys.hpp b/tpl/keys.hpp → tpl/operator/keys.hpp
diff --git a/tpl/mapped_values.hpp → tpl/operator/mapped_values.hpp b/tpl/mapped_values.hpp → tpl/operator/mapped_values.hpp
diff --git a/tpl/sorted.hpp → tpl/operator/sorted.hpp b/tpl/sorted.hpp → tpl/operator/sorted.hpp
diff --git a/tpl/transformed.hpp → tpl/operator/transformed.hpp b/tpl/transformed.hpp → tpl/operator/transformed.hpp
@@ -4,7 +4,8 @@
 #include "meta/is_enumerable.hpp"
 #include "meta/is_associative.hpp"
 #include "meta/enumerable_traits.hpp"
-#include "pointer_proxy.hpp"
+
+#include "../detail/pointer_proxy.hpp"
 
 #include <iterator>
 #include <type_traits>

diff --git a/tpl/zipped.hpp → tpl/operator/zipped.hpp b/tpl/zipped.hpp → tpl/operator/zipped.hpp
@@ -4,7 +4,8 @@
 #include "meta/is_enumerable.hpp"
 #include "meta/is_associative.hpp"
 #include "meta/enumerable_traits.hpp"
-#include "pointer_proxy.hpp"
+
+#include "../detail/pointer_proxy.hpp"
 
 #include <iterator>
 #include <algorithm>

diff --git a/tpl/all.hpp → tpl/sink/all.hpp b/tpl/all.hpp → tpl/sink/all.hpp
diff --git a/tpl/any.hpp → tpl/sink/any.hpp b/tpl/any.hpp → tpl/sink/any.hpp
diff --git a/tpl/copy_to.hpp → tpl/sink/copy_to.hpp b/tpl/copy_to.hpp → tpl/sink/copy_to.hpp
diff --git a/tpl/count.hpp → tpl/sink/count.hpp b/tpl/count.hpp → tpl/sink/count.hpp
diff --git a/tpl/fold_left.hpp → tpl/sink/fold_left.hpp b/tpl/fold_left.hpp → tpl/sink/fold_left.hpp
diff --git a/tpl/fold_left_default.hpp → tpl/sink/fold_left_default.hpp b/tpl/fold_left_default.hpp → tpl/sink/fold_left_default.hpp
diff --git a/tpl/fold_left_default_msvc.hpp → tpl/sink/fold_left_default_msvc.hpp b/tpl/fold_left_default_msvc.hpp → tpl/sink/fold_left_default_msvc.hpp
diff --git a/tpl/fold_left_initialized.hpp → tpl/sink/fold_left_initialized.hpp b/tpl/fold_left_initialized.hpp → tpl/sink/fold_left_initialized.hpp
diff --git a/tpl/fold_left_initialized_msvc.hpp → tpl/sink/fold_left_initialized_msvc.hpp b/tpl/fold_left_initialized_msvc.hpp → tpl/sink/fold_left_initialized_msvc.hpp