From 84761bcc6ecfafc33449157e8c41365ba8367f2d Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 3 Nov 2026 11:21:15 +0000 Subject: [PATCH] Restore relative include paths to ETL headers --- include/etl/algorithm.h | 32 +++++++++---------- include/etl/basic_string.h | 4 +-- include/etl/fsm.h | 4 +-- .../message_router_cpp03_generator.h | 4 +-- include/etl/memory.h | 16 +++++----- include/etl/message_router.h | 16 +++++----- include/etl/priority_queue.h | 4 +-- include/etl/private/message_router_cpp03.h | 4 +-- 8 files changed, 42 insertions(+), 42 deletions(-) diff --git a/include/etl/algorithm.h b/include/etl/algorithm.h index 7e4bfd72..be8d3ef3 100644 --- a/include/etl/algorithm.h +++ b/include/etl/algorithm.h @@ -335,9 +335,9 @@ namespace etl template ETL_CONSTEXPR20 TIterator2 move_backward(TIterator1 sb, TIterator1 se, TIterator2 de) { - #include "etl/private/diagnostic_array_bounds_push.h" + #include "private/diagnostic_array_bounds_push.h" return std::move_backward(sb, se, de); - #include "etl/private/diagnostic_pop.h" + #include "private/diagnostic_pop.h" } #elif ETL_USING_CPP11 // For C++11 @@ -895,7 +895,7 @@ namespace etl { TDistance parent = (value_index - 1) / 2; -#include "etl/private/diagnostic_array_bounds_push.h" +#include "private/diagnostic_array_bounds_push.h" while ((value_index > top_index) && compare(*(first + parent), value)) { *(first + value_index) = ETL_MOVE(*(first + parent)); @@ -904,7 +904,7 @@ namespace etl } *(first + value_index) = ETL_MOVE(value); -#include "etl/private/diagnostic_pop.h" +#include "private/diagnostic_pop.h" } // Adjust Heap Helper @@ -914,7 +914,7 @@ namespace etl TDistance top_index = value_index; TDistance child2nd = (2 * value_index) + 2; -#include "etl/private/diagnostic_array_bounds_push.h" +#include "private/diagnostic_array_bounds_push.h" while (child2nd < length) { if (compare(*(first + child2nd), *(first + (child2nd - 1)))) @@ -932,7 +932,7 @@ namespace etl *(first + value_index) = ETL_MOVE(*(first + (child2nd - 1))); value_index = child2nd - 1; } -#include "etl/private/diagnostic_pop.h" +#include "private/diagnostic_pop.h" push_heap(first, value_index, top_index, ETL_MOVE(value), compare); } @@ -1365,9 +1365,9 @@ namespace etl value_type temp(ETL_MOVE(*first)); // Move the rest. -#include "etl/private/diagnostic_stringop_overread_push.h" +#include "private/diagnostic_stringop_overread_push.h" TIterator result = etl::move(etl::next(first), last, first); -#include "etl/private/diagnostic_pop.h" +#include "private/diagnostic_pop.h" // Restore the first item in its rotated position. *result = ETL_MOVE(temp); @@ -2823,9 +2823,9 @@ namespace etl d_size_type d_size = etl::distance(o_begin, o_end); min_size_type min_size = etl::min(s_size, d_size); - #include "etl/private/diagnostic_null_dereference_push.h" + #include "private/diagnostic_null_dereference_push.h" return etl::move(i_begin, i_begin + min_size, o_begin); - #include "etl/private/diagnostic_pop.h" + #include "private/diagnostic_pop.h" } //*************************************************************************** @@ -5852,7 +5852,7 @@ namespace etl { ETL_STATIC_ASSERT(etl::is_random_access_iterator::value, "partial_sort requires random access iterators"); - #include "etl/private/diagnostic_array_bounds_push.h" + #include "private/diagnostic_array_bounds_push.h" I last_it = ranges::next(first, last); @@ -5891,7 +5891,7 @@ namespace etl return last_it; - #include "etl/private/diagnostic_pop.h" + #include "private/diagnostic_pop.h" } template >> @@ -5945,7 +5945,7 @@ namespace etl { ETL_STATIC_ASSERT(etl::is_random_access_iterator::value, "partial_sort_copy requires the output to be random access iterators"); - #include "etl/private/diagnostic_array_bounds_push.h" + #include "private/diagnostic_array_bounds_push.h" I1 in_last = ranges::next(first, last); I2 out_last = ranges::next(result_first, result_last); @@ -5990,7 +5990,7 @@ namespace etl etl::iter_swap(result_first, result_first + heap_end); sift_down(result_first, decltype(heap_size){0}, heap_end, comp, proj2); } - #include "etl/private/diagnostic_pop.h" + #include "private/diagnostic_pop.h" return {etl::move(in_last), etl::move(r)}; } @@ -7038,7 +7038,7 @@ namespace etl { ETL_STATIC_ASSERT(etl::is_random_access_iterator::value, "pop_heap requires random access iterators"); - #include "etl/private/diagnostic_array_bounds_push.h" + #include "private/diagnostic_array_bounds_push.h" I last_it = ranges::next(first, last); @@ -7057,7 +7057,7 @@ namespace etl return ranges::next(first, last); - #include "etl/private/diagnostic_pop.h" + #include "private/diagnostic_pop.h" } template >> diff --git a/include/etl/basic_string.h b/include/etl/basic_string.h index d8256886..7735be68 100644 --- a/include/etl/basic_string.h +++ b/include/etl/basic_string.h @@ -2726,7 +2726,7 @@ namespace etl iterator>::type copy_characters(TIterator1 from, size_t n, iterator to) { -#include "etl/private/diagnostic_stringop_overflow_push.h" +#include "private/diagnostic_stringop_overflow_push.h" size_t count = 0; while (count != n) @@ -2735,7 +2735,7 @@ namespace etl ++count; } -#include "etl/private/diagnostic_pop.h" +#include "private/diagnostic_pop.h" return to; } diff --git a/include/etl/fsm.h b/include/etl/fsm.h index f38efd36..15a3e328 100644 --- a/include/etl/fsm.h +++ b/include/etl/fsm.h @@ -809,11 +809,11 @@ namespace etl } } - #include "etl/private/diagnostic_array_bounds_push.h" + #include "private/diagnostic_array_bounds_push.h" // If we get here, then we don't have a handler for this message type, so // pass it to the parent if we have one, otherwise call on_event_unknown. return (p_parent != nullptr) ? p_parent->process_event(message) : static_cast(this)->on_event_unknown(message); - #include "etl/private/diagnostic_pop.h" + #include "private/diagnostic_pop.h" } //********************************************** diff --git a/include/etl/generators/message_router_cpp03_generator.h b/include/etl/generators/message_router_cpp03_generator.h index e79f5aec..d001e0c5 100644 --- a/include/etl/generators/message_router_cpp03_generator.h +++ b/include/etl/generators/message_router_cpp03_generator.h @@ -440,12 +440,12 @@ public: void receive(const etl::imessage& msg) ETL_OVERRIDE { -#include "etl/private/diagnostic_array_bounds_push.h" +#include "private/diagnostic_array_bounds_push.h" if (has_successor()) { get_successor().receive(msg); } -#include "etl/private/diagnostic_pop.h" +#include "private/diagnostic_pop.h" } //********************************************** diff --git a/include/etl/memory.h b/include/etl/memory.h index a1ddcadf..47384290 100644 --- a/include/etl/memory.h +++ b/include/etl/memory.h @@ -921,10 +921,10 @@ namespace etl template TOutputIterator uninitialized_move(TInputIterator i_begin, TInputIterator i_end, TOutputIterator o_begin) { - #include "etl/private/diagnostic_array_bounds_push.h" - #include "etl/private/diagnostic_stringop_overflow_push.h" + #include "private/diagnostic_array_bounds_push.h" + #include "private/diagnostic_stringop_overflow_push.h" return std::uninitialized_move(i_begin, i_end, o_begin); - #include "etl/private/diagnostic_pop.h" + #include "private/diagnostic_pop.h" } //***************************************************************************** @@ -938,9 +938,9 @@ namespace etl { count += static_cast(etl::distance(i_begin, i_end)); - #include "etl/private/diagnostic_array_bounds_push.h" + #include "private/diagnostic_array_bounds_push.h" return std::uninitialized_move(i_begin, i_end, o_begin); - #include "etl/private/diagnostic_pop.h" + #include "private/diagnostic_pop.h" } #else //***************************************************************************** @@ -3380,10 +3380,10 @@ namespace etl ETL_STATIC_ASSERT(etl::is_trivially_copyable::value, "Cannot mem_move a non trivially copyable type"); #if ETL_USING_BUILTIN_MEMMOVE - #include "etl/private/diagnostic_array_bounds_push.h" - #include "etl/private/diagnostic_stringop_overread_push.h" + #include "private/diagnostic_array_bounds_push.h" + #include "private/diagnostic_stringop_overread_push.h" __builtin_memmove(reinterpret_cast(db), reinterpret_cast(sb), sizeof(T) * n); - #include "etl/private/diagnostic_pop.h" + #include "private/diagnostic_pop.h" #else ::memmove(reinterpret_cast(db), reinterpret_cast(sb), sizeof(T) * n); #endif diff --git a/include/etl/message_router.h b/include/etl/message_router.h index 6461da00..b16f6b87 100644 --- a/include/etl/message_router.h +++ b/include/etl/message_router.h @@ -517,9 +517,9 @@ namespace etl } else { - #include "etl/private/diagnostic_array_bounds_push.h" + #include "private/diagnostic_array_bounds_push.h" static_cast(this)->on_receive_unknown(msg); - #include "etl/private/diagnostic_pop.h" + #include "private/diagnostic_pop.h" } } @@ -531,9 +531,9 @@ namespace etl template < typename TMessage, typename etl::enable_if::value, int>::type = 0> void receive(const TMessage& msg) { - #include "etl/private/diagnostic_array_bounds_push.h" + #include "private/diagnostic_array_bounds_push.h" static_cast(this)->on_receive(msg); - #include "etl/private/diagnostic_pop.h" + #include "private/diagnostic_pop.h" } //********************************************** @@ -552,9 +552,9 @@ namespace etl } else { - #include "etl/private/diagnostic_array_bounds_push.h" + #include "private/diagnostic_array_bounds_push.h" static_cast(this)->on_receive_unknown(msg); - #include "etl/private/diagnostic_pop.h" + #include "private/diagnostic_pop.h" } } @@ -828,12 +828,12 @@ namespace etl //*********************************************** void receive(const etl::imessage& msg) ETL_OVERRIDE { - #include "etl/private/diagnostic_array_bounds_push.h" + #include "private/diagnostic_array_bounds_push.h" if (has_successor()) { get_successor().receive(msg); } - #include "etl/private/diagnostic_pop.h" + #include "private/diagnostic_pop.h" } //********************************************** diff --git a/include/etl/priority_queue.h b/include/etl/priority_queue.h index 50174501..e542269d 100644 --- a/include/etl/priority_queue.h +++ b/include/etl/priority_queue.h @@ -476,9 +476,9 @@ namespace etl //************************************************************************* void clone(const ipriority_queue& other) { -#include "etl/private/diagnostic_uninitialized_push.h" +#include "private/diagnostic_uninitialized_push.h" assign(other.container.cbegin(), other.container.cend()); -#include "etl/private/diagnostic_pop.h" +#include "private/diagnostic_pop.h" } #if ETL_USING_CPP11 diff --git a/include/etl/private/message_router_cpp03.h b/include/etl/private/message_router_cpp03.h index 976c64ca..12dafdc0 100644 --- a/include/etl/private/message_router_cpp03.h +++ b/include/etl/private/message_router_cpp03.h @@ -2422,12 +2422,12 @@ public: void receive(const etl::imessage& msg) ETL_OVERRIDE { -#include "etl/private/diagnostic_array_bounds_push.h" +#include "private/diagnostic_array_bounds_push.h" if (has_successor()) { get_successor().receive(msg); } -#include "etl/private/diagnostic_pop.h" +#include "private/diagnostic_pop.h" } //**********************************************