Skip to content

Commit 3b0b892

Browse files
authored
Merge pull request #528 from beached/v2
Undeprecated daw_graph/graph_algorithms and bounded_vector
2 parents f6ac7cf + d0acd70 commit 3b0b892

10 files changed

+22
-23
lines changed

include/daw/deprecated/daw_bounded_array.h renamed to include/daw/daw_bounded_array.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
#pragma once
1010

11-
#include "daw/ciso646.h"
12-
#include "daw/daw_algorithm.h"
11+
#include "ciso646.h"
12+
#include "daw_algorithm.h"
1313

1414
#include <cstddef>
1515
#include <cstdint>

include/daw/deprecated/daw_bounded_vector.h renamed to include/daw/daw_bounded_vector.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88

99
#pragma once
1010

11-
#include "daw/ciso646.h"
12-
#include "daw/cpp_17.h"
13-
#include "daw/daw_algorithm.h"
14-
#include "daw/daw_construct_a.h"
15-
#include "daw/daw_math.h"
16-
#include "daw/daw_move.h"
17-
#include "daw/daw_swap.h"
11+
#include "ciso646.h"
12+
#include "cpp_17.h"
13+
#include "daw_algorithm.h"
1814
#include "daw_bounded_array.h"
15+
#include "daw_construct_a.h"
16+
#include "daw_math.h"
17+
#include "daw_move.h"
18+
#include "daw_swap.h"
1919

2020
#include <array>
2121
#include <exception>
File renamed without changes.

include/daw/deprecated/daw_graph_algorithm.h renamed to include/daw/daw_graph_algorithm.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88

99
#pragma once
1010

11-
#include "daw/ciso646.h"
12-
#include "daw/cpp_17.h"
13-
#include "daw/daw_move.h"
11+
#include "ciso646.h"
12+
#include "cpp_17.h"
1413
#include "daw_graph.h"
14+
#include "daw_move.h"
1515

1616
#include <algorithm>
1717
#include <deque>

tests/CMakeLists.txt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ set( TEST_SOURCES
2121
daw_arith_traits_test.cpp
2222
daw_array_test.cpp
2323
daw_benchmark_test.cpp
24+
daw_bounded_vector_test.cpp
2425
daw_constant_test.cpp
2526
daw_container_algorithm_test.cpp
2627
daw_cx_offset_of_test.cpp
@@ -29,12 +30,14 @@ set( TEST_SOURCES
2930
daw_exception_test.cpp
3031
daw_expected_test.cpp
3132
daw_fnv1a_hash_test.cpp
32-
daw_function_table_test.cpp
3333
daw_function_ref_test.cpp
34+
daw_function_table_test.cpp
3435
daw_function_test.cpp
3536
daw_function_view_test.cpp
3637
daw_fwd_pack_apply_test.cpp
3738
daw_generic_hash_test.cpp
39+
daw_graph_algorithm_test.cpp
40+
daw_graph_test.cpp
3841
daw_hash_set_test.cpp
3942
daw_integers_signed_test.cpp
4043
daw_is_any_of_test.cpp
@@ -109,20 +112,16 @@ set( TEST_SOURCES
109112

110113
set( DEPRECATED_TEST_SOURCES
111114
daw_cstring_test.cpp
112-
daw_bounded_array_test.cpp
113115
daw_bounded_graph_test.cpp
114116
daw_bounded_hash_map_test.cpp
115117
daw_bounded_hash_set_test.cpp
116118
daw_bounded_string_test.cpp
117-
daw_bounded_vector_test.cpp
118119
daw_carray_test.cpp
119120
daw_checked_expected_test.cpp
120121
daw_clumpy_sparsy_test.cpp
121122
daw_copiable_unique_ptr_test.cpp
122123
daw_fixed_array_test.cpp
123124
daw_fixed_lookup_test.cpp
124-
daw_graph_algorithm_test.cpp
125-
daw_graph_test.cpp
126125
daw_heap_array_test.cpp
127126
daw_heap_value_test.cpp
128127
daw_optional_poly_test.cpp

tests/deprecated/daw_bounded_array_test.cpp renamed to tests/daw_bounded_array_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Official repository: https://github.com/beached/header_libraries
77
//
88

9-
#include "daw/deprecated/daw_bounded_array.h"
9+
#include "daw/daw_bounded_array.h"
1010

1111
constexpr bool daw_bounded_array_test_001( ) {
1212
daw::bounded_array_t<int, 5> a = { 1, 2, 3, 4, 5 };

tests/deprecated/daw_bounded_vector_test.cpp renamed to tests/daw_bounded_vector_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Official repository: https://github.com/beached/header_libraries
77
//
88

9-
#include "daw/deprecated/daw_bounded_vector.h"
9+
#include "daw/daw_bounded_vector.h"
1010

1111
#include "daw/daw_benchmark.h"
1212

tests/deprecated/daw_graph_algorithm_test.cpp renamed to tests/daw_graph_algorithm_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
// Official repository: https://github.com/beached/header_libraries
77
//
88

9-
#include "daw/deprecated/daw_graph.h"
10-
#include "daw/deprecated/daw_graph_algorithm.h"
9+
#include "daw/daw_graph.h"
10+
#include "daw/daw_graph_algorithm.h"
1111

1212
#include "daw/daw_algorithm.h"
1313
#include "daw/daw_benchmark.h"

tests/deprecated/daw_graph_test.cpp renamed to tests/daw_graph_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Official repository: https://github.com/beached/header_libraries
77
//
88

9-
#include "daw/deprecated/daw_graph.h"
9+
#include "daw/daw_graph.h"
1010

1111
#include "daw/daw_benchmark.h"
1212

tests/daw_iterator_zipiter_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include "daw/iterator/daw_zipiter.h"
1010

11-
#include "daw/deprecated/daw_bounded_array.h"
11+
#include "daw/daw_bounded_array.h"
1212

1313
#include <algorithm>
1414
#include <cstdint>

0 commit comments

Comments
 (0)