Merge pull request #528 from beached/v2

beached · web-flow · commit 3b0b89263335 · 2024-08-25T13:40:10.000-04:00
Undeprecated daw_graph/graph_algorithms and bounded_vector
diff --git a/include/daw/daw_bounded_array.h b/include/daw/daw_bounded_array.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "daw/ciso646.h"
-#include "daw/daw_algorithm.h"
+#include "ciso646.h"
+#include "daw_algorithm.h"
 
 #include <cstddef>
 #include <cstdint>
diff --git a/include/daw/daw_bounded_vector.h b/include/daw/daw_bounded_vector.h
@@ -8,14 +8,14 @@
 
 #pragma once
 
-#include "daw/ciso646.h"
-#include "daw/cpp_17.h"
-#include "daw/daw_algorithm.h"
-#include "daw/daw_construct_a.h"
-#include "daw/daw_math.h"
-#include "daw/daw_move.h"
-#include "daw/daw_swap.h"
+#include "ciso646.h"
+#include "cpp_17.h"
+#include "daw_algorithm.h"
 #include "daw_bounded_array.h"
+#include "daw_construct_a.h"
+#include "daw_math.h"
+#include "daw_move.h"
+#include "daw_swap.h"
 
 #include <array>
 #include <exception>
diff --git a/include/daw/daw_graph.h b/include/daw/daw_graph.h
diff --git a/include/daw/daw_graph_algorithm.h b/include/daw/daw_graph_algorithm.h
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "daw/ciso646.h"
-#include "daw/cpp_17.h"
-#include "daw/daw_move.h"
+#include "ciso646.h"
+#include "cpp_17.h"
 #include "daw_graph.h"
+#include "daw_move.h"
 
 #include <algorithm>
 #include <deque>
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -21,6 +21,7 @@ set( TEST_SOURCES
 		 daw_arith_traits_test.cpp
 		 daw_array_test.cpp
 		 daw_benchmark_test.cpp
+		 daw_bounded_vector_test.cpp
 		 daw_constant_test.cpp
 		 daw_container_algorithm_test.cpp
 		 daw_cx_offset_of_test.cpp
@@ -29,12 +30,14 @@ set( TEST_SOURCES
 		 daw_exception_test.cpp
 		 daw_expected_test.cpp
 		 daw_fnv1a_hash_test.cpp
-		 daw_function_table_test.cpp
 		 daw_function_ref_test.cpp
+		 daw_function_table_test.cpp
 		 daw_function_test.cpp
 		 daw_function_view_test.cpp
 		 daw_fwd_pack_apply_test.cpp
 		 daw_generic_hash_test.cpp
+		 daw_graph_algorithm_test.cpp
+		 daw_graph_test.cpp
 		 daw_hash_set_test.cpp
 		 daw_integers_signed_test.cpp
 		 daw_is_any_of_test.cpp
@@ -109,20 +112,16 @@ set( TEST_SOURCES
 
 set( DEPRECATED_TEST_SOURCES
 		 daw_cstring_test.cpp
-		 daw_bounded_array_test.cpp
 		 daw_bounded_graph_test.cpp
 		 daw_bounded_hash_map_test.cpp
 		 daw_bounded_hash_set_test.cpp
 		 daw_bounded_string_test.cpp
-		 daw_bounded_vector_test.cpp
 		 daw_carray_test.cpp
 		 daw_checked_expected_test.cpp
 		 daw_clumpy_sparsy_test.cpp
 		 daw_copiable_unique_ptr_test.cpp
 		 daw_fixed_array_test.cpp
 		 daw_fixed_lookup_test.cpp
-		 daw_graph_algorithm_test.cpp
-		 daw_graph_test.cpp
 		 daw_heap_array_test.cpp
 		 daw_heap_value_test.cpp
 		 daw_optional_poly_test.cpp
diff --git a/tests/daw_bounded_array_test.cpp b/tests/daw_bounded_array_test.cpp
@@ -6,7 +6,7 @@
 // Official repository: https://github.com/beached/header_libraries
 //
 
-#include "daw/deprecated/daw_bounded_array.h"
+#include "daw/daw_bounded_array.h"
 
 constexpr bool daw_bounded_array_test_001( ) {
 	daw::bounded_array_t<int, 5> a = { 1, 2, 3, 4, 5 };
diff --git a/tests/daw_bounded_vector_test.cpp b/tests/daw_bounded_vector_test.cpp
@@ -6,7 +6,7 @@
 // Official repository: https://github.com/beached/header_libraries
 //
 
-#include "daw/deprecated/daw_bounded_vector.h"
+#include "daw/daw_bounded_vector.h"
 
 #include "daw/daw_benchmark.h"
 
diff --git a/tests/daw_graph_algorithm_test.cpp b/tests/daw_graph_algorithm_test.cpp
@@ -6,8 +6,8 @@
 // Official repository: https://github.com/beached/header_libraries
 //
 
-#include "daw/deprecated/daw_graph.h"
-#include "daw/deprecated/daw_graph_algorithm.h"
+#include "daw/daw_graph.h"
+#include "daw/daw_graph_algorithm.h"
 
 #include "daw/daw_algorithm.h"
 #include "daw/daw_benchmark.h"
diff --git a/tests/daw_graph_test.cpp b/tests/daw_graph_test.cpp
@@ -6,7 +6,7 @@
 // Official repository: https://github.com/beached/header_libraries
 //
 
-#include "daw/deprecated/daw_graph.h"
+#include "daw/daw_graph.h"
 
 #include "daw/daw_benchmark.h"
 
diff --git a/tests/daw_iterator_zipiter_test.cpp b/tests/daw_iterator_zipiter_test.cpp
@@ -8,7 +8,7 @@
 
 #include "daw/iterator/daw_zipiter.h"
 
-#include "daw/deprecated/daw_bounded_array.h"
+#include "daw/daw_bounded_array.h"
 
 #include <algorithm>
 #include <cstdint>
