From 87554af4f8a2b8743d729b911d5723b92f7a031e Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Wed, 10 Mar 2021 12:50:07 +0000 Subject: [PATCH] Updated file id macros --- include/etl/array_view.h | 9 ++------- include/etl/array_wrapper.h | 7 +------ include/etl/basic_string.h | 13 ++++--------- include/etl/binary.h | 7 +------ include/etl/bitset.h | 9 ++------- include/etl/callback_timer.h | 5 ----- include/etl/circular_buffer.h | 7 +------ include/etl/delegate.h | 7 +------ include/etl/deque.h | 13 ++++--------- include/etl/flat_map.h | 5 ----- include/etl/flat_multimap.h | 5 ----- include/etl/flat_multiset.h | 5 ----- include/etl/flat_set.h | 5 ----- include/etl/forward_list.h | 13 ++++--------- include/etl/fsm.h | 13 ++++--------- include/etl/generators/fsm_generator.h | 13 ++++--------- include/etl/generators/message_packet_generator.h | 5 ----- include/etl/generators/message_router_generator.h | 7 +------ include/etl/generators/type_lookup_generator.h | 5 ----- include/etl/generators/type_select_generator.h | 5 ----- include/etl/generators/variant_pool_generator.h | 9 ++------- include/etl/ihash.h | 7 +------ include/etl/indirect_vector.h | 7 +------ include/etl/intrusive_forward_list.h | 13 ++++--------- include/etl/intrusive_links.h | 6 +----- include/etl/intrusive_list.h | 11 +++-------- include/etl/intrusive_queue.h | 7 +------ include/etl/intrusive_stack.h | 7 +------ include/etl/ipool.h | 11 +++-------- include/etl/list.h | 15 +++++---------- include/etl/map.h | 11 +++-------- include/etl/message.h | 7 +------ include/etl/message_bus.h | 7 +------ include/etl/message_packet.h | 5 ----- include/etl/message_router.h | 7 +------ include/etl/message_router_registry.h | 7 +------ include/etl/message_timer.h | 5 ----- include/etl/multi_range.h | 7 +------ include/etl/multimap.h | 11 +++-------- include/etl/multiset.h | 11 +++-------- include/etl/null_type.h | 5 ----- include/etl/observer.h | 7 +------ include/etl/packet.h | 5 ----- include/etl/priority_queue.h | 9 ++------- include/etl/private/vector_base.h | 13 ++++--------- include/etl/queue.h | 9 ++------- include/etl/queue_lockable.h | 5 ----- include/etl/queue_mpmc_mutex.h | 5 ----- include/etl/queue_spsc_atomic.h | 5 ----- include/etl/queue_spsc_isr.h | 5 ----- include/etl/queue_spsc_locked.h | 5 ----- include/etl/reference_counted_message_pool.h | 9 ++------- include/etl/reference_flat_map.h | 9 ++------- include/etl/reference_flat_multimap.h | 11 +++-------- include/etl/reference_flat_multiset.h | 8 ++------ include/etl/reference_flat_set.h | 8 ++------ include/etl/scheduler.h | 11 +++-------- include/etl/set.h | 11 +++-------- include/etl/span.h | 5 ----- include/etl/stack.h | 9 ++------- include/etl/string_view.h | 9 ++------- include/etl/task.h | 5 ----- include/etl/type_lookup.h | 5 ----- include/etl/type_select.h | 5 ----- include/etl/unordered_map.h | 11 +++-------- include/etl/unordered_multimap.h | 11 +++-------- include/etl/unordered_multiset.h | 11 +++-------- include/etl/unordered_set.h | 11 +++-------- include/etl/variant.h | 7 +------ 69 files changed, 108 insertions(+), 450 deletions(-) diff --git a/include/etl/array_view.h b/include/etl/array_view.h index a2507020..c74331ee 100644 --- a/include/etl/array_view.h +++ b/include/etl/array_view.h @@ -46,9 +46,6 @@ SOFTWARE. /// A wrapper for arrays ///\ingroup containers -#undef ETL_FILE -#define ETL_FILE ETL_ARRAY_VIEW_FILE_ID - namespace etl { //*************************************************************************** @@ -73,7 +70,7 @@ namespace etl public: array_view_bounds(string_type file_name_, numeric_type line_number_) - : array_view_exception(ETL_ERROR_TEXT("array_view:bounds", ETL_FILE"A"), file_name_, line_number_) + : array_view_exception(ETL_ERROR_TEXT("array_view:bounds", ETL_ARRAY_VIEW_FILE_ID"A"), file_name_, line_number_) { } }; @@ -87,7 +84,7 @@ namespace etl public: array_view_uninitialised(string_type file_name_, numeric_type line_number_) - : array_view_exception(ETL_ERROR_TEXT("array_view:uninitialised", ETL_FILE"B"), file_name_, line_number_) + : array_view_exception(ETL_ERROR_TEXT("array_view:uninitialised", ETL_ARRAY_VIEW_FILE_ID"B"), file_name_, line_number_) { } }; @@ -549,6 +546,4 @@ void swap(etl::array_view& lhs, etl::array_view& rhs) lhs.swap(rhs); } -#undef ETL_FILE - #endif diff --git a/include/etl/array_wrapper.h b/include/etl/array_wrapper.h index cf72edb2..c486b764 100644 --- a/include/etl/array_wrapper.h +++ b/include/etl/array_wrapper.h @@ -45,9 +45,6 @@ SOFTWARE. /// A wrapper for arrays ///\ingroup containers -#undef ETL_FILE -#define ETL_FILE "42" - namespace etl { //*************************************************************************** @@ -72,7 +69,7 @@ namespace etl public: array_wrapper_bounds(string_type file_name_, numeric_type line_number_) - : array_wrapper_exception(ETL_ERROR_TEXT("array_wrapper:bounds", ETL_FILE"A"), file_name_, line_number_) + : array_wrapper_exception(ETL_ERROR_TEXT("array_wrapper:bounds", ETL_ARRAY_WRAPPER_FILE_ID"A"), file_name_, line_number_) { } }; @@ -417,7 +414,5 @@ void swap(etl::array_wrapper& lhs, #define ETL_ARRAY_WRAPPER(arraytype, arrayobject) etl::array_wrapper -#undef ETL_FILE - #endif diff --git a/include/etl/basic_string.h b/include/etl/basic_string.h index f4337b06..011d9f5c 100644 --- a/include/etl/basic_string.h +++ b/include/etl/basic_string.h @@ -54,9 +54,6 @@ SOFTWARE. #include "binary.h" #include "flags.h" -#undef ETL_FILE -#define ETL_FILE "27" - #ifdef ETL_COMPILER_GCC #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" @@ -95,7 +92,7 @@ namespace etl public: string_empty(string_type file_name_, numeric_type line_number_) - : string_exception(ETL_ERROR_TEXT("string:empty", ETL_FILE"A"), file_name_, line_number_) + : string_exception(ETL_ERROR_TEXT("string:empty", ETL_STRING_FILE_ID"A"), file_name_, line_number_) { } }; @@ -109,7 +106,7 @@ namespace etl public: string_out_of_bounds(string_type file_name_, numeric_type line_number_) - : string_exception(ETL_ERROR_TEXT("string:bounds", ETL_FILE"B"), file_name_, line_number_) + : string_exception(ETL_ERROR_TEXT("string:bounds", ETL_STRING_FILE_ID"B"), file_name_, line_number_) { } }; @@ -123,7 +120,7 @@ namespace etl public: string_iterator(string_type file_name_, numeric_type line_number_) - : string_exception(ETL_ERROR_TEXT("string:iterator", ETL_FILE"C"), file_name_, line_number_) + : string_exception(ETL_ERROR_TEXT("string:iterator", ETL_STRING_FILE_ID"C"), file_name_, line_number_) { } }; @@ -137,7 +134,7 @@ namespace etl public: string_truncation(string_type file_name_, numeric_type line_number_) - : string_exception(ETL_ERROR_TEXT("string:iterator", ETL_FILE"D"), file_name_, line_number_) + : string_exception(ETL_ERROR_TEXT("string:iterator", ETL_STRING_FILE_ID"D"), file_name_, line_number_) { } }; @@ -2603,6 +2600,4 @@ namespace etl #pragma GCC diagnostic pop #endif -#undef ETL_FILE - #endif diff --git a/include/etl/binary.h b/include/etl/binary.h index be575f60..cebaa91f 100644 --- a/include/etl/binary.h +++ b/include/etl/binary.h @@ -46,9 +46,6 @@ SOFTWARE. #include "exception.h" #include "error_handler.h" -#undef ETL_FILE -#define ETL_FILE "50" - namespace etl { //*************************************************************************** @@ -74,7 +71,7 @@ namespace etl public: binary_out_of_range(string_type file_name_, numeric_type line_number_) - : etl::binary_exception(ETL_ERROR_TEXT("binary:out of range", ETL_FILE"A"), file_name_, line_number_) + : etl::binary_exception(ETL_ERROR_TEXT("binary:out of range", ETL_BINARY_FILE_ID"A"), file_name_, line_number_) { } }; @@ -1484,6 +1481,4 @@ namespace etl }; } -#undef ETL_FILE - #endif diff --git a/include/etl/bitset.h b/include/etl/bitset.h index e918df76..b9914710 100644 --- a/include/etl/bitset.h +++ b/include/etl/bitset.h @@ -54,9 +54,6 @@ SOFTWARE. #include "private/minmax_push.h" -#undef ETL_FILE -#define ETL_FILE "52" - #if defined(ETL_COMPILER_KEIL) #pragma diag_suppress 1300 #endif @@ -92,7 +89,7 @@ namespace etl public: bitset_nullptr(string_type file_name_, numeric_type line_number_) - : bitset_exception(ETL_ERROR_TEXT("bitset:null pointer", ETL_FILE"A"), file_name_, line_number_) + : bitset_exception(ETL_ERROR_TEXT("bitset:null pointer", ETL_BITSET_FILE_ID"A"), file_name_, line_number_) { } }; @@ -106,7 +103,7 @@ namespace etl public: bitset_type_too_small(string_type file_name_, numeric_type line_number_) - : bitset_exception(ETL_ERROR_TEXT("bitset:type_too_small", ETL_FILE"B"), file_name_, line_number_) + : bitset_exception(ETL_ERROR_TEXT("bitset:type_too_small", ETL_BITSET_FILE_ID"B"), file_name_, line_number_) { } }; @@ -1207,6 +1204,4 @@ void swap(etl::bitset& lhs, etl::bitset& rhs) #include "private/minmax_pop.h" -#undef ETL_FILE - #endif diff --git a/include/etl/callback_timer.h b/include/etl/callback_timer.h index 0e2c43a0..b0e37c21 100644 --- a/include/etl/callback_timer.h +++ b/include/etl/callback_timer.h @@ -45,9 +45,6 @@ SOFTWARE. #include "delegate.h" #endif -#undef ETL_FILE -#define ETL_FILE "43" - #if defined(ETL_IN_UNIT_TEST) && ETL_NOT_USING_STL #define ETL_DISABLE_TIMER_UPDATES #define ETL_ENABLE_TIMER_UPDATES @@ -772,6 +769,4 @@ namespace etl #undef ETL_ENABLE_TIMER_UPDATES #undef ETL_TIMER_UPDATES_ENABLED -#undef ETL_FILE - #endif diff --git a/include/etl/circular_buffer.h b/include/etl/circular_buffer.h index e4b8246d..ddf2d993 100644 --- a/include/etl/circular_buffer.h +++ b/include/etl/circular_buffer.h @@ -41,9 +41,6 @@ SOFTWARE. #include "iterator.h" #include "static_assert.h" -#undef ETL_FILE -#define ETL_FILE "56" - namespace etl { //*************************************************************************** @@ -67,7 +64,7 @@ namespace etl public: circular_buffer_empty(string_type file_name_, numeric_type line_number_) - : etl::circular_buffer_exception(ETL_ERROR_TEXT("circular_buffer:empty", ETL_FILE"A"), file_name_, line_number_) + : etl::circular_buffer_exception(ETL_ERROR_TEXT("circular_buffer:empty", ETL_CIRCULAR_BUFFER_FILE_ID"A"), file_name_, line_number_) { } }; @@ -1323,6 +1320,4 @@ namespace etl } } -#undef ETL_FILE - #endif diff --git a/include/etl/delegate.h b/include/etl/delegate.h index 4c5ee7d0..a84f540e 100644 --- a/include/etl/delegate.h +++ b/include/etl/delegate.h @@ -57,9 +57,6 @@ Original publication: https://www.codeproject.com/Articles/1170503/The-Impossibl #error NOT SUPPORTED FOR C++03 OR BELOW #endif -#undef ETL_FILE -#define ETL_FILE ETL_DELEGATE_FILE_ID - namespace etl { //*************************************************************************** @@ -83,7 +80,7 @@ namespace etl public: delegate_uninitialised(string_type file_name_, numeric_type line_number_) - : delegate_exception(ETL_ERROR_TEXT("delegate:uninitialised", ETL_FILE"A"), file_name_, line_number_) + : delegate_exception(ETL_ERROR_TEXT("delegate:uninitialised", ETL_DELEGATE_FILE_ID"A"), file_name_, line_number_) { } }; @@ -385,6 +382,4 @@ namespace etl }; } -#undef ETL_FILE - #endif diff --git a/include/etl/deque.h b/include/etl/deque.h index 9afbba61..7aa61a54 100644 --- a/include/etl/deque.h +++ b/include/etl/deque.h @@ -54,9 +54,6 @@ SOFTWARE. #include "private/minmax_push.h" -#undef ETL_FILE -#define ETL_FILE "1" - //***************************************************************************** ///\defgroup deque deque /// A double ended queue with the capacity defined at compile time. @@ -88,7 +85,7 @@ namespace etl public: deque_full(string_type file_name_, numeric_type line_number_) - : etl::deque_exception(ETL_ERROR_TEXT("deque:full", ETL_FILE"A"), file_name_, line_number_) + : etl::deque_exception(ETL_ERROR_TEXT("deque:full", ETL_DEQUE_FILE_ID"A"), file_name_, line_number_) { } }; @@ -102,7 +99,7 @@ namespace etl public: deque_empty(string_type file_name_, numeric_type line_number_) - : etl::deque_exception(ETL_ERROR_TEXT("deque:empty", ETL_FILE"B"), file_name_, line_number_) + : etl::deque_exception(ETL_ERROR_TEXT("deque:empty", ETL_DEQUE_FILE_ID"B"), file_name_, line_number_) { } }; @@ -116,7 +113,7 @@ namespace etl public: deque_out_of_bounds(string_type file_name_, numeric_type line_number_) - : etl::deque_exception(ETL_ERROR_TEXT("deque:bounds", ETL_FILE"C"), file_name_, line_number_) + : etl::deque_exception(ETL_ERROR_TEXT("deque:bounds", ETL_DEQUE_FILE_ID"C"), file_name_, line_number_) { } }; @@ -130,7 +127,7 @@ namespace etl public: deque_incompatible_type(string_type file_name_, numeric_type line_number_) - : deque_exception(ETL_ERROR_TEXT("deque:type", ETL_FILE"D"), file_name_, line_number_) + : deque_exception(ETL_ERROR_TEXT("deque:type", ETL_DEQUE_FILE_ID"D"), file_name_, line_number_) { } }; @@ -2556,8 +2553,6 @@ namespace etl } } -#undef ETL_FILE - #include "private/minmax_pop.h" #endif diff --git a/include/etl/flat_map.h b/include/etl/flat_map.h index 4fc40714..632a92ae 100644 --- a/include/etl/flat_map.h +++ b/include/etl/flat_map.h @@ -41,9 +41,6 @@ SOFTWARE. #endif #include "utility.h" -#undef ETL_FILE -#define ETL_FILE "2" - //***************************************************************************** ///\defgroup flat_map flat_map /// A flat_map based on a sorted vector with the capacity defined at @@ -1016,6 +1013,4 @@ namespace etl #endif } -#undef ETL_FILE - #endif diff --git a/include/etl/flat_multimap.h b/include/etl/flat_multimap.h index cea492f0..76450176 100644 --- a/include/etl/flat_multimap.h +++ b/include/etl/flat_multimap.h @@ -41,9 +41,6 @@ SOFTWARE. #include #endif -#undef ETL_FILE -#define ETL_FILE "3" - //***************************************************************************** ///\defgroup flat_multimap flat_multimap /// A flat_multimap with the capacity defined at compile time. @@ -919,6 +916,4 @@ namespace etl #endif } -#undef ETL_FILE - #endif diff --git a/include/etl/flat_multiset.h b/include/etl/flat_multiset.h index 2d7347cd..846f4679 100644 --- a/include/etl/flat_multiset.h +++ b/include/etl/flat_multiset.h @@ -40,9 +40,6 @@ SOFTWARE. #include #endif -#undef ETL_FILE -#define ETL_FILE "4" - //***************************************************************************** ///\defgroup flat_multiset flat_multiset /// A flat_multiset with the capacity defined at compile time. @@ -869,6 +866,4 @@ namespace etl #endif } -#undef ETL_FILE - #endif diff --git a/include/etl/flat_set.h b/include/etl/flat_set.h index f2b1b3c1..95a646f9 100644 --- a/include/etl/flat_set.h +++ b/include/etl/flat_set.h @@ -40,9 +40,6 @@ SOFTWARE. #include #endif -#undef ETL_FILE -#define ETL_FILE "5" - //***************************************************************************** ///\defgroup flat_set flat_set /// A flat_set with the capacity defined at compile time. @@ -954,6 +951,4 @@ namespace etl #endif } -#undef ETL_FILE - #endif diff --git a/include/etl/forward_list.h b/include/etl/forward_list.h index 00e471fb..9d7bf1ff 100644 --- a/include/etl/forward_list.h +++ b/include/etl/forward_list.h @@ -56,9 +56,6 @@ SOFTWARE. #include "private/minmax_push.h" -#undef ETL_FILE -#define ETL_FILE "6" - //***************************************************************************** ///\defgroup forward_list forward_list /// A linked forward_list with the capacity defined at compile time. @@ -90,7 +87,7 @@ namespace etl public: forward_list_full(string_type file_name_, numeric_type line_number_) - : etl::forward_list_exception(ETL_ERROR_TEXT("forward_list:full", ETL_FILE"A"), file_name_, line_number_) + : etl::forward_list_exception(ETL_ERROR_TEXT("forward_list:full", ETL_FORWARD_LIST_FILE_ID"A"), file_name_, line_number_) { } }; @@ -104,7 +101,7 @@ namespace etl public: forward_list_empty(string_type file_name_, numeric_type line_number_) - : etl::forward_list_exception(ETL_ERROR_TEXT("forward_list:empty", ETL_FILE"B"), file_name_, line_number_) + : etl::forward_list_exception(ETL_ERROR_TEXT("forward_list:empty", ETL_FORWARD_LIST_FILE_ID"B"), file_name_, line_number_) { } }; @@ -118,7 +115,7 @@ namespace etl public: forward_list_iterator(string_type file_name_, numeric_type line_number_) - : etl::forward_list_exception(ETL_ERROR_TEXT("forward_list:iterator", ETL_FILE"C"), file_name_, line_number_) + : etl::forward_list_exception(ETL_ERROR_TEXT("forward_list:iterator", ETL_FORWARD_LIST_FILE_ID"C"), file_name_, line_number_) { } }; @@ -132,7 +129,7 @@ namespace etl public: forward_list_no_pool(string_type file_name_, numeric_type line_number_) - : forward_list_exception(ETL_ERROR_TEXT("list:no pool", ETL_FILE"D"), file_name_, line_number_) + : forward_list_exception(ETL_ERROR_TEXT("list:no pool", ETL_FORWARD_LIST_FILE_ID"D"), file_name_, line_number_) { } }; @@ -1991,6 +1988,4 @@ namespace etl #include "private/minmax_pop.h" -#undef ETL_FILE - #endif diff --git a/include/etl/fsm.h b/include/etl/fsm.h index 30309404..d4873e71 100644 --- a/include/etl/fsm.h +++ b/include/etl/fsm.h @@ -63,9 +63,6 @@ SOFTWARE. #include "integral_limits.h" #include "largest.h" -#undef ETL_FILE -#define ETL_FILE "34" - #include "private/minmax_push.h" namespace etl @@ -103,7 +100,7 @@ namespace etl public: fsm_null_state_exception(string_type file_name_, numeric_type line_number_) - : etl::fsm_exception(ETL_ERROR_TEXT("fsm:null state", ETL_FILE"A"), file_name_, line_number_) + : etl::fsm_exception(ETL_ERROR_TEXT("fsm:null state", ETL_FSM_FILE_ID"A"), file_name_, line_number_) { } }; @@ -116,7 +113,7 @@ namespace etl public: fsm_state_id_exception(string_type file_name_, numeric_type line_number_) - : etl::fsm_exception(ETL_ERROR_TEXT("fsm:state id", ETL_FILE"B"), file_name_, line_number_) + : etl::fsm_exception(ETL_ERROR_TEXT("fsm:state id", ETL_FSM_FILE_ID"B"), file_name_, line_number_) { } }; @@ -129,7 +126,7 @@ namespace etl public: fsm_state_list_exception(string_type file_name_, numeric_type line_number_) - : etl::fsm_exception(ETL_ERROR_TEXT("fsm:state list", ETL_FILE"C"), file_name_, line_number_) + : etl::fsm_exception(ETL_ERROR_TEXT("fsm:state list", ETL_FSM_FILE_ID"C"), file_name_, line_number_) { } }; @@ -142,7 +139,7 @@ namespace etl public: fsm_state_list_order_exception(string_type file_name_, numeric_type line_number_) - : etl::fsm_exception(ETL_ERROR_TEXT("fsm:state list order", ETL_FILE"D"), file_name_, line_number_) + : etl::fsm_exception(ETL_ERROR_TEXT("fsm:state list order", ETL_FSM_FILE_ID"D"), file_name_, line_number_) { } }; @@ -1325,8 +1322,6 @@ namespace etl }; } -#undef ETL_FILE - #include "private/minmax_pop.h" #endif diff --git a/include/etl/generators/fsm_generator.h b/include/etl/generators/fsm_generator.h index 17048906..4a1fbfb8 100644 --- a/include/etl/generators/fsm_generator.h +++ b/include/etl/generators/fsm_generator.h @@ -75,9 +75,6 @@ cog.outl("//******************************************************************** #include "integral_limits.h" #include "largest.h" -#undef ETL_FILE -#define ETL_FILE "34" - #include "private/minmax_push.h" namespace etl @@ -115,7 +112,7 @@ namespace etl public: fsm_null_state_exception(string_type file_name_, numeric_type line_number_) - : etl::fsm_exception(ETL_ERROR_TEXT("fsm:null state", ETL_FILE"A"), file_name_, line_number_) + : etl::fsm_exception(ETL_ERROR_TEXT("fsm:null state", ETL_FSM_FILE_ID"A"), file_name_, line_number_) { } }; @@ -128,7 +125,7 @@ namespace etl public: fsm_state_id_exception(string_type file_name_, numeric_type line_number_) - : etl::fsm_exception(ETL_ERROR_TEXT("fsm:state id", ETL_FILE"B"), file_name_, line_number_) + : etl::fsm_exception(ETL_ERROR_TEXT("fsm:state id", ETL_FSM_FILE_ID"B"), file_name_, line_number_) { } }; @@ -141,7 +138,7 @@ namespace etl public: fsm_state_list_exception(string_type file_name_, numeric_type line_number_) - : etl::fsm_exception(ETL_ERROR_TEXT("fsm:state list", ETL_FILE"C"), file_name_, line_number_) + : etl::fsm_exception(ETL_ERROR_TEXT("fsm:state list", ETL_FSM_FILE_ID"C"), file_name_, line_number_) { } }; @@ -154,7 +151,7 @@ namespace etl public: fsm_state_list_order_exception(string_type file_name_, numeric_type line_number_) - : etl::fsm_exception(ETL_ERROR_TEXT("fsm:state list order", ETL_FILE"D"), file_name_, line_number_) + : etl::fsm_exception(ETL_ERROR_TEXT("fsm:state list order", ETL_FSM_FILE_ID"D"), file_name_, line_number_) { } }; @@ -592,8 +589,6 @@ namespace etl /*[[[end]]]*/ } -#undef ETL_FILE - #include "private/minmax_pop.h" #endif diff --git a/include/etl/generators/message_packet_generator.h b/include/etl/generators/message_packet_generator.h index 0661da8c..b68c1865 100644 --- a/include/etl/generators/message_packet_generator.h +++ b/include/etl/generators/message_packet_generator.h @@ -72,9 +72,6 @@ cog.outl("//******************************************************************** #include -#undef ETL_FILE -#define ETL_FILE "55" - namespace etl { /*[[[cog @@ -465,6 +462,4 @@ namespace etl /*[[[end]]]*/ } -#undef ETL_FILE - #endif diff --git a/include/etl/generators/message_router_generator.h b/include/etl/generators/message_router_generator.h index 6a6d70e0..eda0338f 100644 --- a/include/etl/generators/message_router_generator.h +++ b/include/etl/generators/message_router_generator.h @@ -78,9 +78,6 @@ cog.outl("//******************************************************************** #include "placement_new.h" #include "successor.h" -#undef ETL_FILE -#define ETL_FILE "35" - namespace etl { //*************************************************************************** @@ -104,7 +101,7 @@ namespace etl public: message_router_illegal_id(string_type file_name_, numeric_type line_number_) - : message_router_exception(ETL_ERROR_TEXT("message router:illegal id", ETL_FILE"A"), file_name_, line_number_) + : message_router_exception(ETL_ERROR_TEXT("message router:illegal id", ETL_MESSAGE_ROUTER_FILE_ID"A"), file_name_, line_number_) { } }; @@ -541,6 +538,4 @@ namespace etl /*[[[end]]]*/ } -#undef ETL_FILE - #endif diff --git a/include/etl/generators/type_lookup_generator.h b/include/etl/generators/type_lookup_generator.h index 901ec71d..718769cc 100644 --- a/include/etl/generators/type_lookup_generator.h +++ b/include/etl/generators/type_lookup_generator.h @@ -37,9 +37,6 @@ SOFTWARE. #include "integral_limits.h" #include "null_type.h" -#undef ETL_FILE -#define ETL_FILE "45" - /*[[[cog import cog cog.outl("#if 0") @@ -341,6 +338,4 @@ namespace etl #endif } -#undef ETL_FILE - #endif diff --git a/include/etl/generators/type_select_generator.h b/include/etl/generators/type_select_generator.h index cb0e9ce6..bdf1d833 100644 --- a/include/etl/generators/type_select_generator.h +++ b/include/etl/generators/type_select_generator.h @@ -34,9 +34,6 @@ SOFTWARE. #include "type_traits.h" #include "null_type.h" -#undef ETL_FILE -#define ETL_FILE "49" - /*[[[cog import cog cog.outl("#if 0") @@ -173,6 +170,4 @@ namespace etl #endif } -#undef ETL_FILE - #endif diff --git a/include/etl/generators/variant_pool_generator.h b/include/etl/generators/variant_pool_generator.h index cd93e5e3..4810efb0 100644 --- a/include/etl/generators/variant_pool_generator.h +++ b/include/etl/generators/variant_pool_generator.h @@ -77,9 +77,6 @@ cog.outl("//******************************************************************** #include "utility.h" -#undef ETL_FILE -#define ETL_FILE "40" - namespace etl { //*************************************************************************** @@ -99,7 +96,7 @@ namespace etl public: variant_pool_cannot_create(string_type file_name_, numeric_type line_number_) - : variant_pool_exception(ETL_ERROR_TEXT("variant_pool:cannot create", ETL_FILE"A"), file_name_, line_number_) + : variant_pool_exception(ETL_ERROR_TEXT("variant_pool:cannot create", ETL_VARIANT_POOL_FILE_ID"A"), file_name_, line_number_) { } }; @@ -110,7 +107,7 @@ namespace etl public: variant_pool_did_not_create(string_type file_name_, numeric_type line_number_) - : variant_pool_exception(ETL_ERROR_TEXT("variant_pool:did not create", ETL_FILE"B"), file_name_, line_number_) + : variant_pool_exception(ETL_ERROR_TEXT("variant_pool:did not create", ETL_VARIANT_POOL_FILE_ID"B"), file_name_, line_number_) { } }; @@ -473,6 +470,4 @@ namespace etl }; } -#undef ETL_FILE - #endif diff --git a/include/etl/ihash.h b/include/etl/ihash.h index 22160f91..6f48b382 100644 --- a/include/etl/ihash.h +++ b/include/etl/ihash.h @@ -43,9 +43,6 @@ SOFTWARE. ///\defgroup ihash Common data for all hash type classes. ///\ingroup hash -#undef ETL_FILE -#define ETL_FILE "19" - namespace etl { //*************************************************************************** @@ -70,7 +67,7 @@ namespace etl public: hash_finalised(string_type file_name_, numeric_type line_number_) - : hash_exception(ETL_ERROR_TEXT("ihash:finalised", ETL_FILE"A"), file_name_, line_number_) + : hash_exception(ETL_ERROR_TEXT("ihash:finalised", ETL_IHASH_FILE_ID"A"), file_name_, line_number_) {} }; @@ -78,6 +75,4 @@ namespace etl typedef hash_finalised hash_finalized; } -#undef ETL_FILE - #endif diff --git a/include/etl/indirect_vector.h b/include/etl/indirect_vector.h index a5256922..87cf2802 100644 --- a/include/etl/indirect_vector.h +++ b/include/etl/indirect_vector.h @@ -48,9 +48,6 @@ SOFTWARE. #pragma GCC diagnostic ignored "-Wunused-variable" #endif -#undef ETL_FILE -#define ETL_FILE "53" - //***************************************************************************** ///\defgroup indirect_vector indirect_vector /// A indirect_vector with the capacity defined at compile time. Objects are allocated from a pool and stored as pointers. @@ -68,7 +65,7 @@ namespace etl public: indirect_vector_buffer_missmatch(string_type file_name_, numeric_type line_number_) - : vector_exception(ETL_ERROR_TEXT("indirect_vector:buffer_missmatch", ETL_FILE"A"), file_name_, line_number_) + : vector_exception(ETL_ERROR_TEXT("indirect_vector:buffer_missmatch", INDIRECT_VECTOR_FILE_ID"A"), file_name_, line_number_) { } }; @@ -1544,7 +1541,5 @@ namespace etl #pragma GCC diagnostic pop #endif -#undef ETL_FILE - #endif diff --git a/include/etl/intrusive_forward_list.h b/include/etl/intrusive_forward_list.h index 02700c8b..5090d719 100644 --- a/include/etl/intrusive_forward_list.h +++ b/include/etl/intrusive_forward_list.h @@ -50,9 +50,6 @@ SOFTWARE. #include "algorithm.h" #include "iterator.h" -#undef ETL_FILE -#define ETL_FILE "20" - namespace etl { //*************************************************************************** @@ -78,7 +75,7 @@ namespace etl public: intrusive_forward_list_empty(string_type file_name_, numeric_type line_number_) - : intrusive_forward_list_exception(ETL_ERROR_TEXT("intrusive_forward_list:empty", ETL_FILE"A"), file_name_, line_number_) + : intrusive_forward_list_exception(ETL_ERROR_TEXT("intrusive_forward_list:empty", ETL_INTRUSIVE_FORWARD_LIST_FILE_ID"A"), file_name_, line_number_) { } }; @@ -92,7 +89,7 @@ namespace etl public: intrusive_forward_list_iterator_exception(string_type file_name_, numeric_type line_number_) - : intrusive_forward_list_exception(ETL_ERROR_TEXT("intrusive_forward_list:iterator", ETL_FILE"B"), file_name_, line_number_) + : intrusive_forward_list_exception(ETL_ERROR_TEXT("intrusive_forward_list:iterator", ETL_INTRUSIVE_FORWARD_LIST_FILE_ID"B"), file_name_, line_number_) { } }; @@ -106,7 +103,7 @@ namespace etl public: intrusive_forward_list_index_exception(string_type file_name_, numeric_type line_number_) - : intrusive_forward_list_exception(ETL_ERROR_TEXT("intrusive_forward_list:bounds", ETL_FILE"C"), file_name_, line_number_) + : intrusive_forward_list_exception(ETL_ERROR_TEXT("intrusive_forward_list:bounds", ETL_INTRUSIVE_FORWARD_LIST_FILE_ID"C"), file_name_, line_number_) { } }; @@ -120,7 +117,7 @@ namespace etl public: intrusive_forward_list_unsorted(string_type file_name_, numeric_type line_number_) - : intrusive_forward_list_exception(ETL_ERROR_TEXT("intrusive_forward_list:unsorted", ETL_FILE"D"), file_name_, line_number_) + : intrusive_forward_list_exception(ETL_ERROR_TEXT("intrusive_forward_list:unsorted", ETL_INTRUSIVE_FORWARD_LIST_FILE_ID"D"), file_name_, line_number_) { } }; @@ -1069,6 +1066,4 @@ namespace etl #include "private/minmax_pop.h" -#undef ETL_FILE - #endif diff --git a/include/etl/intrusive_links.h b/include/etl/intrusive_links.h index e25c816f..334d5f63 100644 --- a/include/etl/intrusive_links.h +++ b/include/etl/intrusive_links.h @@ -42,9 +42,6 @@ SOFTWARE. #include "utility.h" #include "algorithm.h" -#undef ETL_FILE -#define ETL_FILE "22" - //***************************************************************************** // Note: // The link functions work slightly differently to the STL 'insert' convention @@ -79,7 +76,7 @@ namespace etl public: not_unlinked_exception(string_type file_name_, numeric_type line_number_) - : link_exception(ETL_ERROR_TEXT("link:still linked", ETL_FILE"A"), file_name_, line_number_) + : link_exception(ETL_ERROR_TEXT("link:still linked", ETL_INTRUSIVE_LINKS_FILE_ID"A"), file_name_, line_number_) { } }; @@ -794,5 +791,4 @@ namespace etl } } -#undef ETL_FILE #endif diff --git a/include/etl/intrusive_list.h b/include/etl/intrusive_list.h index 19594226..2ba28ba9 100644 --- a/include/etl/intrusive_list.h +++ b/include/etl/intrusive_list.h @@ -51,9 +51,6 @@ SOFTWARE. #include "iterator.h" #include "functional.h" -#undef ETL_FILE -#define ETL_FILE "21" - namespace etl { //*************************************************************************** @@ -79,7 +76,7 @@ namespace etl public: intrusive_list_empty(string_type file_name_, numeric_type line_number_) - : intrusive_list_exception(ETL_ERROR_TEXT("intrusive_list:empty", ETL_FILE"A"), file_name_, line_number_) + : intrusive_list_exception(ETL_ERROR_TEXT("intrusive_list:empty", ETL_INTRUSIVE_LIST_FILE_ID"A"), file_name_, line_number_) { } }; @@ -93,7 +90,7 @@ namespace etl public: intrusive_list_iterator_exception(string_type file_name_, numeric_type line_number_) - : intrusive_list_exception(ETL_ERROR_TEXT("intrusive_list:iterator", ETL_FILE"B"), file_name_, line_number_) + : intrusive_list_exception(ETL_ERROR_TEXT("intrusive_list:iterator", ETL_INTRUSIVE_LIST_FILE_ID"B"), file_name_, line_number_) { } }; @@ -107,7 +104,7 @@ namespace etl public: intrusive_list_unsorted(string_type file_name_, numeric_type line_number_) - : intrusive_list_exception(ETL_ERROR_TEXT("intrusive_list:unsorted", ETL_FILE"C"), file_name_, line_number_) + : intrusive_list_exception(ETL_ERROR_TEXT("intrusive_list:unsorted", ETL_INTRUSIVE_LIST_FILE_ID"C"), file_name_, line_number_) { } }; @@ -1101,6 +1098,4 @@ namespace etl #include "private/minmax_pop.h" -#undef ETL_FILE - #endif diff --git a/include/etl/intrusive_queue.h b/include/etl/intrusive_queue.h index 8c7ac764..c622a438 100644 --- a/include/etl/intrusive_queue.h +++ b/include/etl/intrusive_queue.h @@ -38,9 +38,6 @@ SOFTWARE. #include "error_handler.h" #include "intrusive_links.h" -#undef ETL_FILE -#define ETL_FILE "29" - namespace etl { //*************************************************************************** @@ -66,7 +63,7 @@ namespace etl public: intrusive_queue_empty(string_type file_name_, numeric_type line_number_) - : intrusive_queue_exception(ETL_ERROR_TEXT("intrusive_queue:empty", ETL_FILE"A"), file_name_, line_number_) + : intrusive_queue_exception(ETL_ERROR_TEXT("intrusive_queue:empty", ETL_INTRUSIVE_QUEUE_FILE_ID"A"), file_name_, line_number_) { } }; @@ -274,6 +271,4 @@ namespace etl }; } -#undef ETL_FILE - #endif diff --git a/include/etl/intrusive_stack.h b/include/etl/intrusive_stack.h index 42966898..3c336224 100644 --- a/include/etl/intrusive_stack.h +++ b/include/etl/intrusive_stack.h @@ -38,9 +38,6 @@ SOFTWARE. #include "error_handler.h" #include "intrusive_links.h" -#undef ETL_FILE -#define ETL_FILE "28" - namespace etl { //*************************************************************************** @@ -66,7 +63,7 @@ namespace etl public: intrusive_stack_empty(string_type file_name_, numeric_type line_number_) - : intrusive_stack_exception(ETL_ERROR_TEXT("intrusive_stack:empty", ETL_FILE"A"), file_name_, line_number_) + : intrusive_stack_exception(ETL_ERROR_TEXT("intrusive_stack:empty", ETL_INTRUSIVE_STACK_FILE_ID"A"), file_name_, line_number_) { } }; @@ -259,6 +256,4 @@ namespace etl }; } -#undef ETL_FILE - #endif diff --git a/include/etl/ipool.h b/include/etl/ipool.h index 19e038f4..44802f81 100644 --- a/include/etl/ipool.h +++ b/include/etl/ipool.h @@ -39,9 +39,6 @@ SOFTWARE. #include "memory.h" #include "placement_new.h" -#undef ETL_FILE -#define ETL_FILE ETL_POOL_ID - #define ETL_POOL_CPP03_CODE 0 namespace etl @@ -68,7 +65,7 @@ namespace etl public: explicit pool_no_allocation(string_type file_name_, numeric_type line_number_) - : pool_exception(ETL_ERROR_TEXT("pool:allocation", ETL_FILE"A"), file_name_, line_number_) + : pool_exception(ETL_ERROR_TEXT("pool:allocation", ETL_POOL_FILE_ID"A"), file_name_, line_number_) {} }; @@ -81,7 +78,7 @@ namespace etl public: pool_object_not_in_pool(string_type file_name_, numeric_type line_number_) - : pool_exception(ETL_ERROR_TEXT("pool:not in pool", ETL_FILE"B"), file_name_, line_number_) + : pool_exception(ETL_ERROR_TEXT("pool:not in pool", ETL_POOL_FILE_ID"B"), file_name_, line_number_) {} }; @@ -94,7 +91,7 @@ namespace etl public: pool_element_size(string_type file_name_, numeric_type line_number_) - : pool_exception(ETL_ERROR_TEXT("pool:element size", ETL_FILE"C"), file_name_, line_number_) + : pool_exception(ETL_ERROR_TEXT("pool:element size", ETL_POOL_FILE_ID"C"), file_name_, line_number_) {} }; @@ -449,7 +446,5 @@ namespace etl }; } -#undef ETL_FILE - #endif diff --git a/include/etl/list.h b/include/etl/list.h index eb266e8b..c1d05fa1 100644 --- a/include/etl/list.h +++ b/include/etl/list.h @@ -57,9 +57,6 @@ SOFTWARE. #include "private/minmax_push.h" -#undef ETL_FILE -#define ETL_FILE "7" - //***************************************************************************** ///\defgroup list list /// A linked list with the capacity defined at compile time. @@ -91,7 +88,7 @@ namespace etl public: list_full(string_type file_name_, numeric_type line_number_) - : list_exception(ETL_ERROR_TEXT("list:full", ETL_FILE"A"), file_name_, line_number_) + : list_exception(ETL_ERROR_TEXT("list:full", ETL_LIST_FILE_ID"A"), file_name_, line_number_) { } }; @@ -105,7 +102,7 @@ namespace etl public: list_empty(string_type file_name_, numeric_type line_number_) - : list_exception(ETL_ERROR_TEXT("list:empty", ETL_FILE"B"), file_name_, line_number_) + : list_exception(ETL_ERROR_TEXT("list:empty", ETL_LIST_FILE_ID"B"), file_name_, line_number_) { } }; @@ -119,7 +116,7 @@ namespace etl public: list_iterator(string_type file_name_, numeric_type line_number_) - : list_exception(ETL_ERROR_TEXT("list:iterator", ETL_FILE"C"), file_name_, line_number_) + : list_exception(ETL_ERROR_TEXT("list:iterator", ETL_LIST_FILE_ID"C"), file_name_, line_number_) { } }; @@ -133,7 +130,7 @@ namespace etl public: list_unsorted(string_type file_name_, numeric_type line_number_) - : list_exception(ETL_ERROR_TEXT("list:unsorted", ETL_FILE"D"), file_name_, line_number_) + : list_exception(ETL_ERROR_TEXT("list:unsorted", ETL_LIST_FILE_ID"D"), file_name_, line_number_) { } }; @@ -147,7 +144,7 @@ namespace etl public: list_no_pool(string_type file_name_, numeric_type line_number_) - : list_exception(ETL_ERROR_TEXT("list:no pool", ETL_FILE"E"), file_name_, line_number_) + : list_exception(ETL_ERROR_TEXT("list:no pool", ETL_LIST_FILE_ID"E"), file_name_, line_number_) { } }; @@ -2427,6 +2424,4 @@ namespace etl #include "private/minmax_pop.h" -#undef ETL_FILE - #endif diff --git a/include/etl/map.h b/include/etl/map.h index 1e7efd66..886dba2f 100644 --- a/include/etl/map.h +++ b/include/etl/map.h @@ -55,9 +55,6 @@ SOFTWARE. #include "private/minmax_push.h" -#undef ETL_FILE -#define ETL_FILE "8" - //***************************************************************************** ///\defgroup map map /// A map with the capacity defined at compile time. @@ -89,7 +86,7 @@ namespace etl public: map_full(string_type file_name_, numeric_type line_number_) - : etl::map_exception("map:full", file_name_, line_number_) + : etl::map_exception(ETL_ERROR_TEXT("map:full", ETL_MAP_FILE_ID"A"), file_name_, line_number_) { } }; @@ -103,7 +100,7 @@ namespace etl public: map_out_of_bounds(string_type file_name_, numeric_type line_number_) - : etl::map_exception("map:bounds", file_name_, line_number_) + : etl::map_exception(ETL_ERROR_TEXT("map:bounds", ETL_MAP_FILE_ID"B"), file_name_, line_number_) { } }; @@ -117,7 +114,7 @@ namespace etl public: map_iterator(string_type file_name_, numeric_type line_number_) - : etl::map_exception("map:iterator", file_name_, line_number_) + : etl::map_exception(ETL_ERROR_TEXT("map:iterator", ETL_MAP_FILE_ID"C"), file_name_, line_number_) { } }; @@ -2387,6 +2384,4 @@ namespace etl #include "private/minmax_pop.h" -#undef ETL_FILE - #endif diff --git a/include/etl/message.h b/include/etl/message.h index d718be16..5b625c1c 100644 --- a/include/etl/message.h +++ b/include/etl/message.h @@ -36,9 +36,6 @@ SOFTWARE. #include "exception.h" #include "message_types.h" -#undef ETL_FILE -#define ETL_FILE "38" - namespace etl { //*************************************************************************** @@ -58,7 +55,7 @@ namespace etl public: unhandled_message_exception(string_type file_name_, numeric_type line_number_) - : message_exception(ETL_ERROR_TEXT("message:unknown", ETL_FILE"A"), file_name_, line_number_) + : message_exception(ETL_ERROR_TEXT("message:unknown", ETL_MESSAGE_FILE_ID"A"), file_name_, line_number_) { } }; @@ -97,6 +94,4 @@ namespace etl }; } -#undef ETL_FILE - #endif diff --git a/include/etl/message_bus.h b/include/etl/message_bus.h index af05bb5e..6ac1f24a 100644 --- a/include/etl/message_bus.h +++ b/include/etl/message_bus.h @@ -42,9 +42,6 @@ SOFTWARE. #include "message.h" #include "message_router.h" -#undef ETL_FILE -#define ETL_FILE "39" - namespace etl { //*************************************************************************** @@ -68,7 +65,7 @@ namespace etl public: message_bus_too_many_subscribers(string_type file_name_, numeric_type line_number_) - : message_bus_exception(ETL_ERROR_TEXT("message bus:too many subscribers", ETL_FILE"A"), file_name_, line_number_) + : message_bus_exception(ETL_ERROR_TEXT("message bus:too many subscribers", ETL_MESSAGE_BUS_FILE_ID"A"), file_name_, line_number_) { } }; @@ -436,6 +433,4 @@ namespace etl } } -#undef ETL_FILE - #endif diff --git a/include/etl/message_packet.h b/include/etl/message_packet.h index fa76295a..e8b8c3ad 100644 --- a/include/etl/message_packet.h +++ b/include/etl/message_packet.h @@ -60,9 +60,6 @@ SOFTWARE. #include -#undef ETL_FILE -#define ETL_FILE "55" - namespace etl { //*************************************************************************** @@ -3090,6 +3087,4 @@ namespace etl }; } -#undef ETL_FILE - #endif diff --git a/include/etl/message_router.h b/include/etl/message_router.h index 83ed4e39..ab6d380b 100644 --- a/include/etl/message_router.h +++ b/include/etl/message_router.h @@ -66,9 +66,6 @@ SOFTWARE. #include "placement_new.h" #include "successor.h" -#undef ETL_FILE -#define ETL_FILE "35" - namespace etl { //*************************************************************************** @@ -92,7 +89,7 @@ namespace etl public: message_router_illegal_id(string_type file_name_, numeric_type line_number_) - : message_router_exception(ETL_ERROR_TEXT("message router:illegal id", ETL_FILE"A"), file_name_, line_number_) + : message_router_exception(ETL_ERROR_TEXT("message router:illegal id", ETL_MESSAGE_ROUTER_FILE_ID"A"), file_name_, line_number_) { } }; @@ -1795,6 +1792,4 @@ namespace etl }; } -#undef ETL_FILE - #endif diff --git a/include/etl/message_router_registry.h b/include/etl/message_router_registry.h index 643bb2bf..aff48642 100644 --- a/include/etl/message_router_registry.h +++ b/include/etl/message_router_registry.h @@ -40,9 +40,6 @@ SOFTWARE. #include "iterator.h" #include "memory.h" -#undef ETL_FILE -#define ETL_FILE ETL_MESSAGE_ROUTER_REGISTRY - namespace etl { //*************************************************************************** @@ -66,7 +63,7 @@ namespace etl public: message_router_registry_full(string_type file_name_, numeric_type line_number_) - : message_router_registry_exception(ETL_ERROR_TEXT("message router registry:full", ETL_FILE"A"), file_name_, line_number_) + : message_router_registry_exception(ETL_ERROR_TEXT("message router registry:full", ETL_MESSAGE_ROUTER_REGISTRY_FILE_ID"A"), file_name_, line_number_) { } }; @@ -575,6 +572,4 @@ namespace etl }; } -#undef ETL_FILE - #endif diff --git a/include/etl/message_timer.h b/include/etl/message_timer.h index 3b69a713..73ea8e91 100644 --- a/include/etl/message_timer.h +++ b/include/etl/message_timer.h @@ -42,9 +42,6 @@ SOFTWARE. #include "timer.h" #include "atomic.h" -#undef ETL_FILE -#define ETL_FILE "44" - #if defined(ETL_IN_UNIT_TEST) && ETL_NOT_USING_STL #define ETL_DISABLE_TIMER_UPDATES #define ETL_ENABLE_TIMER_UPDATES @@ -658,6 +655,4 @@ namespace etl #undef ETL_ENABLE_TIMER_UPDATES #undef ETL_TIMER_UPDATES_ENABLED -#undef ETL_FILE - #endif diff --git a/include/etl/multi_range.h b/include/etl/multi_range.h index e0b3e41a..4c03561f 100644 --- a/include/etl/multi_range.h +++ b/include/etl/multi_range.h @@ -37,9 +37,6 @@ SOFTWARE. #include "exception.h" #include "error_handler.h" -#undef ETL_FILE -#define ETL_FILE "57" - namespace etl { //*************************************************************************** @@ -63,7 +60,7 @@ namespace etl public: multi_range_circular_reference(string_type file_name_, numeric_type line_number_) - : etl::multi_range_exception(ETL_ERROR_TEXT("multi_range:circular reference", ETL_FILE"A"), file_name_, line_number_) + : etl::multi_range_exception(ETL_ERROR_TEXT("multi_range:circular reference", ETL_MULTI_LOOP_FILE_ID"A"), file_name_, line_number_) { } }; @@ -529,6 +526,4 @@ namespace etl }; } -#undef ETL_FILE - #endif \ No newline at end of file diff --git a/include/etl/multimap.h b/include/etl/multimap.h index 0fc1c4de..98dc09fc 100644 --- a/include/etl/multimap.h +++ b/include/etl/multimap.h @@ -55,9 +55,6 @@ SOFTWARE. #include "private/minmax_push.h" -#undef ETL_FILE -#define ETL_FILE "9" - //***************************************************************************** /// A multimap with the capacity defined at compile time. ///\ingroup containers @@ -88,7 +85,7 @@ namespace etl public: multimap_full(string_type file_name_, numeric_type line_number_) - : etl::multimap_exception("multimap:full", file_name_, line_number_) + : etl::multimap_exception(ETL_ERROR_TEXT("multimap:full", ETL_MULTIMAP_FILE_ID"A"), file_name_, line_number_) { } }; @@ -102,7 +99,7 @@ namespace etl public: multimap_out_of_bounds(string_type file_name_, numeric_type line_number_) - : etl::multimap_exception("multimap:bounds", file_name_, line_number_) + : etl::multimap_exception(ETL_ERROR_TEXT("multimap:bounds", ETL_MULTIMAP_FILE_ID"B"), file_name_, line_number_) { } }; @@ -116,7 +113,7 @@ namespace etl public: multimap_iterator(string_type file_name_, numeric_type line_number_) - : etl::multimap_exception("multimap:iterator", file_name_, line_number_) + : etl::multimap_exception(ETL_ERROR_TEXT("multimap:iterator", ETL_MULTIMAP_FILE_ID"C"), file_name_, line_number_) { } }; @@ -2246,6 +2243,4 @@ namespace etl #include "private/minmax_pop.h" -#undef ETL_FILE - #endif diff --git a/include/etl/multiset.h b/include/etl/multiset.h index b329759b..480c0f5f 100644 --- a/include/etl/multiset.h +++ b/include/etl/multiset.h @@ -54,9 +54,6 @@ SOFTWARE. #include "private/minmax_push.h" -#undef ETL_FILE -#define ETL_FILE "10" - //***************************************************************************** /// A multiset with the capacity defined at compile time. ///\ingroup containers @@ -87,7 +84,7 @@ namespace etl public: multiset_full(string_type file_name_, numeric_type line_number_) - : etl::multiset_exception(ETL_ERROR_TEXT("multiset:full", ETL_FILE"A"), file_name_, line_number_) + : etl::multiset_exception(ETL_ERROR_TEXT("multiset:full", ETL_MULTISET_FILE_ID"A"), file_name_, line_number_) { } }; @@ -101,7 +98,7 @@ namespace etl public: multiset_out_of_bounds(string_type file_name_, numeric_type line_number_) - : etl::multiset_exception(ETL_ERROR_TEXT("multiset:bounds", ETL_FILE"B"), file_name_, line_number_) + : etl::multiset_exception(ETL_ERROR_TEXT("multiset:bounds", ETL_MULTISET_FILE_ID"B"), file_name_, line_number_) { } }; @@ -115,7 +112,7 @@ namespace etl public: multiset_iterator(string_type file_name_, numeric_type line_number_) - : etl::multiset_exception(ETL_ERROR_TEXT("multiset:iterator", ETL_FILE"C"), file_name_, line_number_) + : etl::multiset_exception(ETL_ERROR_TEXT("multiset:iterator", ETL_MULTISET_FILE_ID"C"), file_name_, line_number_) { } }; @@ -2230,6 +2227,4 @@ namespace etl #include "private/minmax_pop.h" -#undef ETL_FILE - #endif diff --git a/include/etl/null_type.h b/include/etl/null_type.h index 95a28cc2..0bfdb608 100644 --- a/include/etl/null_type.h +++ b/include/etl/null_type.h @@ -31,9 +31,6 @@ SOFTWARE. #include -#undef ETL_FILE -#define ETL_FILE "50" - namespace etl { template @@ -42,6 +39,4 @@ namespace etl }; } -#undef ETL_FILE - #endif diff --git a/include/etl/observer.h b/include/etl/observer.h index 3894c219..50a1e045 100644 --- a/include/etl/observer.h +++ b/include/etl/observer.h @@ -58,9 +58,6 @@ SOFTWARE. #include "exception.h" #include "error_handler.h" -#undef ETL_FILE -#define ETL_FILE "18" - namespace etl { //*************************************************************************** @@ -86,7 +83,7 @@ namespace etl public: observer_list_full(string_type file_name_, numeric_type line_number_) - : observer_exception(ETL_ERROR_TEXT("observer:full", ETL_FILE"A"), file_name_, line_number_) + : observer_exception(ETL_ERROR_TEXT("observer:full", ETL_OBSERVER_FILE_ID"A"), file_name_, line_number_) { } }; @@ -469,6 +466,4 @@ namespace etl #endif } -#undef ETL_FILE - #endif diff --git a/include/etl/packet.h b/include/etl/packet.h index 5802ec35..07d8fb6a 100644 --- a/include/etl/packet.h +++ b/include/etl/packet.h @@ -37,9 +37,6 @@ SOFTWARE. #include "utility.h" #include "placement_new.h" -#undef ETL_FILE -#define ETL_FILE "38" - //***************************************************************************** ///\defgroup packet packet /// A class that can contain one a several related types. @@ -165,6 +162,4 @@ namespace etl }; } -#undef ETL_FILE - #endif diff --git a/include/etl/priority_queue.h b/include/etl/priority_queue.h index a3d27fbe..fbca8089 100644 --- a/include/etl/priority_queue.h +++ b/include/etl/priority_queue.h @@ -45,9 +45,6 @@ SOFTWARE. #include "error_handler.h" #include "exception.h" -#undef ETL_FILE -#define ETL_FILE "12" - //***************************************************************************** ///\defgroup queue queue /// A priority queue with the capacity defined at compile time, @@ -80,7 +77,7 @@ namespace etl public: priority_queue_full(string_type file_name_, numeric_type line_number_) - : priority_queue_exception(ETL_ERROR_TEXT("priority_queue:full", ETL_FILE"A"), file_name_, line_number_) + : priority_queue_exception(ETL_ERROR_TEXT("priority_queue:full", ETL_PRIORITY_QUEUE_FILE_ID"A"), file_name_, line_number_) { } }; @@ -94,7 +91,7 @@ namespace etl public: priority_queue_iterator(string_type file_name_, numeric_type line_number_) - : priority_queue_exception(ETL_ERROR_TEXT("priority_queue:iterator", ETL_FILE"B"), file_name_, line_number_) + : priority_queue_exception(ETL_ERROR_TEXT("priority_queue:iterator", ETL_PRIORITY_QUEUE_FILE_ID"B"), file_name_, line_number_) { } }; @@ -503,6 +500,4 @@ namespace etl }; } -#undef ETL_FILE - #endif diff --git a/include/etl/private/vector_base.h b/include/etl/private/vector_base.h index abbfdfc3..6d6664c6 100644 --- a/include/etl/private/vector_base.h +++ b/include/etl/private/vector_base.h @@ -42,9 +42,6 @@ SOFTWARE. #include "../error_handler.h" #include "../debug_count.h" -#undef ETL_FILE -#define ETL_FILE "17" - namespace etl { //*************************************************************************** @@ -70,7 +67,7 @@ namespace etl public: vector_full(string_type file_name_, numeric_type line_number_) - : vector_exception(ETL_ERROR_TEXT("vector:full", ETL_FILE"A"), file_name_, line_number_) + : vector_exception(ETL_ERROR_TEXT("vector:full", ETL_VECTOR_FILE_ID"A"), file_name_, line_number_) { } }; @@ -84,7 +81,7 @@ namespace etl public: vector_empty(string_type file_name_, numeric_type line_number_) - : vector_exception(ETL_ERROR_TEXT("vector:empty", ETL_FILE"B"), file_name_, line_number_) + : vector_exception(ETL_ERROR_TEXT("vector:empty", ETL_VECTOR_FILE_ID"B"), file_name_, line_number_) { } }; @@ -98,7 +95,7 @@ namespace etl public: vector_out_of_bounds(string_type file_name_, numeric_type line_number_) - : vector_exception(ETL_ERROR_TEXT("vector:bounds", ETL_FILE"C"), file_name_, line_number_) + : vector_exception(ETL_ERROR_TEXT("vector:bounds", ETL_VECTOR_FILE_ID"C"), file_name_, line_number_) { } }; @@ -112,7 +109,7 @@ namespace etl public: vector_incompatible_type(string_type file_name_, numeric_type line_number_) - : vector_exception(ETL_ERROR_TEXT("vector:type", ETL_FILE"D"), file_name_, line_number_) + : vector_exception(ETL_ERROR_TEXT("vector:type", ETL_VECTOR_FILE_ID"D"), file_name_, line_number_) { } }; @@ -167,6 +164,4 @@ namespace etl }; } -#undef ETL_FILE - #endif diff --git a/include/etl/queue.h b/include/etl/queue.h index e2760418..ef2b5c67 100644 --- a/include/etl/queue.h +++ b/include/etl/queue.h @@ -48,9 +48,6 @@ SOFTWARE. #include "utility.h" #include "placement_new.h" -#undef ETL_FILE -#define ETL_FILE "13" - //***************************************************************************** ///\defgroup queue queue /// A First-in / first-out queue with the capacity defined at compile time, @@ -83,7 +80,7 @@ namespace etl public: queue_full(string_type file_name_, numeric_type line_number_) - : queue_exception(ETL_ERROR_TEXT("queue:full", ETL_FILE"A"), file_name_, line_number_) + : queue_exception(ETL_ERROR_TEXT("queue:full", ETL_QUEUE_FILE_ID"A"), file_name_, line_number_) { } }; @@ -97,7 +94,7 @@ namespace etl public: queue_empty(string_type file_name_, numeric_type line_number_) - : queue_exception(ETL_ERROR_TEXT("queue:empty", ETL_FILE"B"), file_name_, line_number_) + : queue_exception(ETL_ERROR_TEXT("queue:empty", ETL_QUEUE_FILE_ID"B"), file_name_, line_number_) { } }; @@ -664,6 +661,4 @@ namespace etl }; } -#undef ETL_FILE - #endif diff --git a/include/etl/queue_lockable.h b/include/etl/queue_lockable.h index 7590dbeb..aecff728 100644 --- a/include/etl/queue_lockable.h +++ b/include/etl/queue_lockable.h @@ -43,9 +43,6 @@ SOFTWARE. #include "utility.h" #include "placement_new.h" -#undef ETL_FILE -#define ETL_FILE ETL_QUEUE_SPSC_LOCKABLE - namespace etl { template @@ -782,6 +779,4 @@ namespace etl }; } -#undef ETL_FILE - #endif diff --git a/include/etl/queue_mpmc_mutex.h b/include/etl/queue_mpmc_mutex.h index abf16bc0..4b6f1722 100644 --- a/include/etl/queue_mpmc_mutex.h +++ b/include/etl/queue_mpmc_mutex.h @@ -46,9 +46,6 @@ SOFTWARE. #include "utility.h" #include "placement_new.h" -#undef ETL_FILE -#define ETL_FILE ETL_QUEUE_MPMC_MUTEX_ID - namespace etl { template @@ -637,7 +634,5 @@ namespace etl }; } -#undef ETL_FILE - #endif #endif diff --git a/include/etl/queue_spsc_atomic.h b/include/etl/queue_spsc_atomic.h index 13e496a8..bf350c2a 100644 --- a/include/etl/queue_spsc_atomic.h +++ b/include/etl/queue_spsc_atomic.h @@ -43,9 +43,6 @@ SOFTWARE. #include "utility.h" #include "placement_new.h" -#undef ETL_FILE -#define ETL_FILE ETL_QUEUE_SPSC_ATOMIC_ID - #if ETL_HAS_ATOMIC namespace etl @@ -510,6 +507,4 @@ namespace etl #endif -#undef ETL_FILE - #endif diff --git a/include/etl/queue_spsc_isr.h b/include/etl/queue_spsc_isr.h index 15b3b089..bee8aacf 100644 --- a/include/etl/queue_spsc_isr.h +++ b/include/etl/queue_spsc_isr.h @@ -42,9 +42,6 @@ SOFTWARE. #include "utility.h" #include "placement_new.h" -#undef ETL_FILE -#define ETL_FILE ETL_QUEUE_SPSC_ISR_ID - namespace etl { template @@ -742,6 +739,4 @@ namespace etl }; } -#undef ETL_FILE - #endif diff --git a/include/etl/queue_spsc_locked.h b/include/etl/queue_spsc_locked.h index 5f392946..9e4e6b42 100644 --- a/include/etl/queue_spsc_locked.h +++ b/include/etl/queue_spsc_locked.h @@ -43,9 +43,6 @@ SOFTWARE. #include "utility.h" #include "placement_new.h" -#undef ETL_FILE -#define ETL_FILE ETL_QUEUE_SPSC_LOCKED_ID - namespace etl { template @@ -801,6 +798,4 @@ namespace etl }; } -#undef ETL_FILE - #endif diff --git a/include/etl/reference_counted_message_pool.h b/include/etl/reference_counted_message_pool.h index 1f20d8df..ce612c8a 100644 --- a/include/etl/reference_counted_message_pool.h +++ b/include/etl/reference_counted_message_pool.h @@ -43,9 +43,6 @@ SOFTWARE. #include "memory.h" #include "largest.h" -#undef ETL_FILE -#define ETL_FILE ETL_REFERENCE_COUNTER_MESSAGE_POOL_ID - namespace etl { //*************************************************************************** @@ -69,7 +66,7 @@ namespace etl public: reference_counted_message_pool_allocation_failure(string_type file_name_, numeric_type line_number_) - : reference_counted_message_pool_exception(ETL_ERROR_TEXT("reference_counted_message_pool:allocation failure", ETL_FILE"A"), file_name_, line_number_) + : reference_counted_message_pool_exception(ETL_ERROR_TEXT("reference_counted_message_pool:allocation failure", ETL_REFERENCE_COUNTER_MESSAGE_POOL_FILE_ID"A"), file_name_, line_number_) { } }; @@ -82,7 +79,7 @@ namespace etl public: reference_counted_message_pool_release_failure(string_type file_name_, numeric_type line_number_) - : reference_counted_message_pool_exception(ETL_ERROR_TEXT("reference_counted_message_pool:release failure", ETL_FILE"B"), file_name_, line_number_) + : reference_counted_message_pool_exception(ETL_ERROR_TEXT("reference_counted_message_pool:release failure", ETL_REFERENCE_COUNTER_MESSAGE_POOL_FILE_ID"B"), file_name_, line_number_) { } }; @@ -262,6 +259,4 @@ namespace etl #endif } -#undef ETL_FILE - #endif diff --git a/include/etl/reference_flat_map.h b/include/etl/reference_flat_map.h index 8863073e..2dfd7a76 100644 --- a/include/etl/reference_flat_map.h +++ b/include/etl/reference_flat_map.h @@ -43,9 +43,6 @@ SOFTWARE. #include "static_assert.h" #include "iterator.h" -#undef ETL_FILE -#define ETL_FILE "30" - //***************************************************************************** ///\defgroup reference_flat_map reference_flat_map /// An reference_flat_map with the capacity defined at compile time. @@ -79,7 +76,7 @@ namespace etl public: flat_map_full(string_type file_name_, numeric_type line_number_) - : flat_map_exception(ETL_ERROR_TEXT("flat_map: full", ETL_FILE"A"), file_name_, line_number_) + : flat_map_exception(ETL_ERROR_TEXT("flat_map: full", ETL_REFERENCE_FLAT_MAP_FILE_ID"A"), file_name_, line_number_) { } }; @@ -93,7 +90,7 @@ namespace etl public: flat_map_out_of_bounds(string_type file_name_, numeric_type line_number_) - : flat_map_exception(ETL_ERROR_TEXT("flat_map:bounds", ETL_FILE"B"), file_name_, line_number_) + : flat_map_exception(ETL_ERROR_TEXT("flat_map:bounds", ETL_REFERENCE_FLAT_MAP_FILE_ID"B"), file_name_, line_number_) { } }; @@ -982,6 +979,4 @@ namespace etl } -#undef ETL_FILE - #endif diff --git a/include/etl/reference_flat_multimap.h b/include/etl/reference_flat_multimap.h index 5713fe1a..0457f9f2 100644 --- a/include/etl/reference_flat_multimap.h +++ b/include/etl/reference_flat_multimap.h @@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************************/ -#ifndef ETL_REFERENCE_FLAT_MULTIMAP_BASE_INCLUDED -#define ETL_REFERENCE_FLAT_MULTIMAP_BASE_INCLUDED +#ifndef ETL_REFERENCE_FLAT_MULTIMAP_INCLUDED +#define ETL_REFERENCE_FLAT_MULTIMAP_INCLUDED #include @@ -40,9 +40,6 @@ SOFTWARE. #include "vector.h" #include "iterator.h" -#undef ETL_FILE -#define ETL_FILE "31" - namespace etl { //*************************************************************************** @@ -68,7 +65,7 @@ namespace etl public: flat_multimap_full(string_type file_name_, numeric_type line_number_) - : flat_multimap_exception(ETL_ERROR_TEXT("flat_multimap:full", ETL_FILE"A"), file_name_, line_number_) + : flat_multimap_exception(ETL_ERROR_TEXT("flat_multimap:full", ETL_REFERENCE_FLAT_MULTIMAP_FILE_ID"A"), file_name_, line_number_) { } }; @@ -878,6 +875,4 @@ namespace etl }; } -#undef ETL_FILE - #endif diff --git a/include/etl/reference_flat_multiset.h b/include/etl/reference_flat_multiset.h index edab6cbd..ef5416b2 100644 --- a/include/etl/reference_flat_multiset.h +++ b/include/etl/reference_flat_multiset.h @@ -46,9 +46,6 @@ SOFTWARE. #include "error_handler.h" #include "exception.h" -#undef ETL_FILE -#define ETL_FILE "33" - namespace etl { //*************************************************************************** @@ -74,7 +71,7 @@ namespace etl public: flat_multiset_full(string_type file_name_, numeric_type line_number_) - : flat_multiset_exception(ETL_ERROR_TEXT("flat_multiset:full", ETL_FILE"A"), file_name_, line_number_) + : flat_multiset_exception(ETL_ERROR_TEXT("flat_multiset:full", ETL_REFERENCE_FLAT_MULTISET_FILE_ID"A"), file_name_, line_number_) { } }; @@ -88,7 +85,7 @@ namespace etl public: flat_multiset_iterator(string_type file_name_, numeric_type line_number_) - : flat_multiset_exception(ETL_ERROR_TEXT("flat_multiset:iterator", ETL_FILE"C"), file_name_, line_number_) + : flat_multiset_exception(ETL_ERROR_TEXT("flat_multiset:iterator", ETL_REFERENCE_FLAT_MULTISET_FILE_ID"C"), file_name_, line_number_) { } }; @@ -885,5 +882,4 @@ namespace etl } } -#undef ETL_FILE #endif diff --git a/include/etl/reference_flat_set.h b/include/etl/reference_flat_set.h index c35cf376..6fd3588b 100644 --- a/include/etl/reference_flat_set.h +++ b/include/etl/reference_flat_set.h @@ -47,9 +47,6 @@ SOFTWARE. #include "vector.h" #include "iterator.h" -#undef ETL_FILE -#define ETL_FILE "32" - namespace etl { //*************************************************************************** @@ -75,7 +72,7 @@ namespace etl public: flat_set_full(string_type file_name_, numeric_type line_number_) - : flat_set_exception(ETL_ERROR_TEXT("flat_set:full", ETL_FILE"A"), file_name_, line_number_) + : flat_set_exception(ETL_ERROR_TEXT("flat_set:full", ETL_REFERENCE_FLAT_SET_FILE_ID"A"), file_name_, line_number_) { } }; @@ -89,7 +86,7 @@ namespace etl public: flat_set_iterator(string_type file_name_, numeric_type line_number_) - : flat_set_exception(ETL_ERROR_TEXT("flat_set:iterator", ETL_FILE"C"), file_name_, line_number_) + : flat_set_exception(ETL_ERROR_TEXT("flat_set:iterator", ETL_REFERENCE_FLAT_SET_FILE_ID"C"), file_name_, line_number_) { } }; @@ -869,5 +866,4 @@ namespace etl } } -#undef ETL_FILE #endif diff --git a/include/etl/scheduler.h b/include/etl/scheduler.h index 444d1201..f4d57407 100644 --- a/include/etl/scheduler.h +++ b/include/etl/scheduler.h @@ -40,9 +40,6 @@ SOFTWARE. #include "type_traits.h" #include "function.h" -#undef ETL_FILE -#define ETL_FILE "36" - namespace etl { //*************************************************************************** @@ -66,7 +63,7 @@ namespace etl public: scheduler_no_tasks_exception(string_type file_name_, numeric_type line_number_) - : etl::scheduler_exception(ETL_ERROR_TEXT("scheduler:no tasks", ETL_FILE"A"), file_name_, line_number_) + : etl::scheduler_exception(ETL_ERROR_TEXT("scheduler:no tasks", ETL_SCHEDULER_FILE_ID"A"), file_name_, line_number_) { } }; @@ -79,7 +76,7 @@ namespace etl public: scheduler_null_task_exception(string_type file_name_, numeric_type line_number_) - : etl::scheduler_exception(ETL_ERROR_TEXT("scheduler:null task", ETL_FILE"B"), file_name_, line_number_) + : etl::scheduler_exception(ETL_ERROR_TEXT("scheduler:null task", ETL_SCHEDULER_FILE_ID"B"), file_name_, line_number_) { } }; @@ -92,7 +89,7 @@ namespace etl public: scheduler_too_many_tasks_exception(string_type file_name_, numeric_type line_number_) - : etl::scheduler_exception(ETL_ERROR_TEXT("scheduler:too many tasks", ETL_FILE"C"), file_name_, line_number_) + : etl::scheduler_exception(ETL_ERROR_TEXT("scheduler:too many tasks", ETL_SCHEDULER_FILE_ID"C"), file_name_, line_number_) { } }; @@ -407,6 +404,4 @@ namespace etl }; } -#undef ETL_FILE - #endif diff --git a/include/etl/set.h b/include/etl/set.h index 0b61b95f..8192e05c 100644 --- a/include/etl/set.h +++ b/include/etl/set.h @@ -55,9 +55,6 @@ SOFTWARE. #include "private/minmax_push.h" -#undef ETL_FILE -#define ETL_FILE "14" - //***************************************************************************** ///\defgroup set set /// A set with the capacity defined at compile time. @@ -89,7 +86,7 @@ namespace etl public: set_full(string_type file_name_, numeric_type line_number_) - : etl::set_exception(ETL_ERROR_TEXT("set:full", ETL_FILE"A"), file_name_, line_number_) + : etl::set_exception(ETL_ERROR_TEXT("set:full", ETL_SET_FILE_ID"A"), file_name_, line_number_) { } }; @@ -103,7 +100,7 @@ namespace etl public: set_out_of_bounds(string_type file_name_, numeric_type line_number_) - : etl::set_exception(ETL_ERROR_TEXT("set:bounds", ETL_FILE"B"), file_name_, line_number_) + : etl::set_exception(ETL_ERROR_TEXT("set:bounds", ETL_SET_FILE_ID"B"), file_name_, line_number_) { } }; @@ -117,7 +114,7 @@ namespace etl public: set_iterator(string_type file_name_, numeric_type line_number_) - : etl::set_exception(ETL_ERROR_TEXT("set:iterator problem", ETL_FILE"C"), file_name_, line_number_) + : etl::set_exception(ETL_ERROR_TEXT("set:iterator problem", ETL_SET_FILE_ID"C"), file_name_, line_number_) { } }; @@ -2309,6 +2306,4 @@ namespace etl #include "private/minmax_pop.h" -#undef ETL_FILE - #endif diff --git a/include/etl/span.h b/include/etl/span.h index bfa75ce4..b07052a1 100644 --- a/include/etl/span.h +++ b/include/etl/span.h @@ -44,9 +44,6 @@ SOFTWARE. /// A wrapper for arrays ///\ingroup containers -#undef ETL_FILE -#define ETL_FILE "41" - namespace etl { static ETL_CONSTANT size_t dynamic_extent = etl::integral_limits::max; @@ -359,7 +356,5 @@ namespace etl #endif } -#undef ETL_FILE - #endif diff --git a/include/etl/stack.h b/include/etl/stack.h index cd80d921..2437494b 100644 --- a/include/etl/stack.h +++ b/include/etl/stack.h @@ -46,9 +46,6 @@ SOFTWARE. #include "type_traits.h" #include "placement_new.h" -#undef ETL_FILE -#define ETL_FILE "15" - //***************************************************************************** ///\defgroup stack stack /// A Last-in / first-out stack with the capacity defined at compile time, @@ -81,7 +78,7 @@ namespace etl public: stack_full(string_type file_name_, numeric_type line_number_) - : stack_exception(ETL_ERROR_TEXT("stack:full", ETL_FILE"A"), file_name_, line_number_) + : stack_exception(ETL_ERROR_TEXT("stack:full", ETL_STACK_FILE_ID"A"), file_name_, line_number_) { } }; @@ -95,7 +92,7 @@ namespace etl public: stack_empty(string_type file_name_, numeric_type line_number_) - : stack_exception(ETL_ERROR_TEXT("stack:empty", ETL_FILE"B"), file_name_, line_number_) + : stack_exception(ETL_ERROR_TEXT("stack:empty", ETL_STACK_FILE_ID"B"), file_name_, line_number_) { } }; @@ -605,6 +602,4 @@ namespace etl }; } -#undef ETL_FILE - #endif diff --git a/include/etl/string_view.h b/include/etl/string_view.h index e0ce6988..f49f49c4 100644 --- a/include/etl/string_view.h +++ b/include/etl/string_view.h @@ -48,9 +48,6 @@ SOFTWARE. /// A wrapper for arrays ///\ingroup containers -#undef ETL_FILE -#define ETL_FILE "42" - #include "private/minmax_push.h" namespace etl @@ -77,7 +74,7 @@ namespace etl public: string_view_bounds(string_type file_name_, numeric_type line_number_) - : string_view_exception(ETL_ERROR_TEXT("basic_string_view:bounds", ETL_FILE"A"), file_name_, line_number_) + : string_view_exception(ETL_ERROR_TEXT("basic_string_view:bounds", ETL_STRING_VIEW_FILE_ID"A"), file_name_, line_number_) { } }; @@ -91,7 +88,7 @@ namespace etl public: string_view_uninitialised(string_type file_name_, numeric_type line_number_) - : string_view_exception(ETL_ERROR_TEXT("basic_string_view:uninitialised", ETL_FILE"B"), file_name_, line_number_) + : string_view_exception(ETL_ERROR_TEXT("basic_string_view:uninitialised", ETL_STRING_VIEW_FILE_ID"B"), file_name_, line_number_) { } }; @@ -905,7 +902,5 @@ void swap(etl::basic_string_view >& lhs, etl::basic_strin #include "private/minmax_pop.h" -#undef ETL_FILE - #endif diff --git a/include/etl/task.h b/include/etl/task.h index 273c2929..390a7897 100644 --- a/include/etl/task.h +++ b/include/etl/task.h @@ -35,9 +35,6 @@ SOFTWARE. #include "error_handler.h" #include "exception.h" -#undef ETL_FILE -#define ETL_FILE "37" - namespace etl { //*************************************************************************** @@ -129,6 +126,4 @@ namespace etl }; } -#undef ETL_FILE - #endif diff --git a/include/etl/type_lookup.h b/include/etl/type_lookup.h index c7f67eb1..84b1ac40 100644 --- a/include/etl/type_lookup.h +++ b/include/etl/type_lookup.h @@ -37,9 +37,6 @@ SOFTWARE. #include "integral_limits.h" #include "null_type.h" -#undef ETL_FILE -#define ETL_FILE "45" - #if 0 #error THIS HEADER IS A GENERATOR. DO NOT INCLUDE. #endif @@ -377,6 +374,4 @@ namespace etl #endif } -#undef ETL_FILE - #endif diff --git a/include/etl/type_select.h b/include/etl/type_select.h index 71ded97f..3044f5e6 100644 --- a/include/etl/type_select.h +++ b/include/etl/type_select.h @@ -34,9 +34,6 @@ SOFTWARE. #include "type_traits.h" #include "null_type.h" -#undef ETL_FILE -#define ETL_FILE "49" - #if 0 #error THIS HEADER IS A GENERATOR. DO NOT INCLUDE. #endif @@ -629,6 +626,4 @@ namespace etl #endif } -#undef ETL_FILE - #endif diff --git a/include/etl/unordered_map.h b/include/etl/unordered_map.h index 8b3be14a..cb9db2ec 100644 --- a/include/etl/unordered_map.h +++ b/include/etl/unordered_map.h @@ -57,9 +57,6 @@ SOFTWARE. #include #endif -#undef ETL_FILE -#define ETL_FILE "16" - //***************************************************************************** ///\defgroup unordered_map unordered_map /// A unordered_map with the capacity defined at compile time. @@ -91,7 +88,7 @@ namespace etl public: unordered_map_full(string_type file_name_, numeric_type line_number_) - : etl::unordered_map_exception(ETL_ERROR_TEXT("unordered_map:full", ETL_FILE"A"), file_name_, line_number_) + : etl::unordered_map_exception(ETL_ERROR_TEXT("unordered_map:full", ETL_UNORDERED_MAP_FILE_ID"A"), file_name_, line_number_) { } }; @@ -105,7 +102,7 @@ namespace etl public: unordered_map_out_of_range(string_type file_name_, numeric_type line_number_) - : etl::unordered_map_exception(ETL_ERROR_TEXT("unordered_map:range", ETL_FILE"B"), file_name_, line_number_) + : etl::unordered_map_exception(ETL_ERROR_TEXT("unordered_map:range", ETL_UNORDERED_MAP_FILE_ID"B"), file_name_, line_number_) {} }; @@ -118,7 +115,7 @@ namespace etl public: unordered_map_iterator(string_type file_name_, numeric_type line_number_) - : etl::unordered_map_exception(ETL_ERROR_TEXT("unordered_map:iterator", ETL_FILE"C"), file_name_, line_number_) + : etl::unordered_map_exception(ETL_ERROR_TEXT("unordered_map:iterator", ETL_UNORDERED_MAP_FILE_ID"C"), file_name_, line_number_) { } }; @@ -1662,6 +1659,4 @@ namespace etl #endif } -#undef ETL_FILE - #endif diff --git a/include/etl/unordered_multimap.h b/include/etl/unordered_multimap.h index d2f63a9d..2398a5f7 100644 --- a/include/etl/unordered_multimap.h +++ b/include/etl/unordered_multimap.h @@ -57,9 +57,6 @@ SOFTWARE. #include #endif -#undef ETL_FILE -#define ETL_FILE "25" - //***************************************************************************** ///\defgroup unordered_multimap unordered_multimap /// A unordered_multimap with the capacity defined at compile time. @@ -91,7 +88,7 @@ namespace etl public: unordered_multimap_full(string_type file_name_, numeric_type line_number_) - : etl::unordered_multimap_exception(ETL_ERROR_TEXT("unordered_multimap:full", ETL_FILE"A"), file_name_, line_number_) + : etl::unordered_multimap_exception(ETL_ERROR_TEXT("unordered_multimap:full", ETL_UNORDERED_MULTIMAP_FILE_ID"A"), file_name_, line_number_) { } }; @@ -105,7 +102,7 @@ namespace etl public: unordered_multimap_out_of_range(string_type file_name_, numeric_type line_number_) - : etl::unordered_multimap_exception(ETL_ERROR_TEXT("unordered_multimap:range", ETL_FILE"B"), file_name_, line_number_) + : etl::unordered_multimap_exception(ETL_ERROR_TEXT("unordered_multimap:range", ETL_UNORDERED_MULTIMAP_FILE_ID"B"), file_name_, line_number_) {} }; @@ -118,7 +115,7 @@ namespace etl public: unordered_multimap_iterator(string_type file_name_, numeric_type line_number_) - : etl::unordered_multimap_exception(ETL_ERROR_TEXT("unordered_multimap:iterator", ETL_FILE"C"), file_name_, line_number_) + : etl::unordered_multimap_exception(ETL_ERROR_TEXT("unordered_multimap:iterator", ETL_UNORDERED_MULTIMAP_FILE_ID"C"), file_name_, line_number_) { } }; @@ -1573,6 +1570,4 @@ namespace etl #endif } -#undef ETL_FILE - #endif diff --git a/include/etl/unordered_multiset.h b/include/etl/unordered_multiset.h index b1e0e1c4..9a3344e5 100644 --- a/include/etl/unordered_multiset.h +++ b/include/etl/unordered_multiset.h @@ -56,9 +56,6 @@ SOFTWARE. #include #endif -#undef ETL_FILE -#define ETL_FILE "26" - //***************************************************************************** ///\defgroup unordered_multiset unordered_multiset /// A unordered_multiset with the capacity defined at compile time. @@ -90,7 +87,7 @@ namespace etl public: unordered_multiset_full(string_type file_name_, numeric_type line_number_) - : etl::unordered_multiset_exception(ETL_ERROR_TEXT("unordered_multiset:full", ETL_FILE"A"), file_name_, line_number_) + : etl::unordered_multiset_exception(ETL_ERROR_TEXT("unordered_multiset:full", ETL_UNORDERED_MULTISET_FILE_ID"A"), file_name_, line_number_) { } }; @@ -104,7 +101,7 @@ namespace etl public: unordered_multiset_out_of_range(string_type file_name_, numeric_type line_number_) - : etl::unordered_multiset_exception(ETL_ERROR_TEXT("unordered_multiset:range", ETL_FILE"B"), file_name_, line_number_) + : etl::unordered_multiset_exception(ETL_ERROR_TEXT("unordered_multiset:range", ETL_UNORDERED_MULTISET_FILE_ID"B"), file_name_, line_number_) {} }; @@ -117,7 +114,7 @@ namespace etl public: unordered_multiset_iterator(string_type file_name_, numeric_type line_number_) - : etl::unordered_multiset_exception(ETL_ERROR_TEXT("unordered_multiset:iterator", ETL_FILE"C"), file_name_, line_number_) + : etl::unordered_multiset_exception(ETL_ERROR_TEXT("unordered_multiset:iterator", ETL_UNORDERED_MULTISET_FILE_ID"C"), file_name_, line_number_) { } }; @@ -1557,6 +1554,4 @@ namespace etl #endif } -#undef ETL_FILE - #endif diff --git a/include/etl/unordered_set.h b/include/etl/unordered_set.h index 756da3e4..acebe209 100644 --- a/include/etl/unordered_set.h +++ b/include/etl/unordered_set.h @@ -57,9 +57,6 @@ SOFTWARE. #include #endif -#undef ETL_FILE -#define ETL_FILE "23" - //***************************************************************************** ///\defgroup unordered_set unordered_set /// A unordered_set with the capacity defined at compile time. @@ -91,7 +88,7 @@ namespace etl public: unordered_set_full(string_type file_name_, numeric_type line_number_) - : etl::unordered_set_exception(ETL_ERROR_TEXT("unordered_set:full", ETL_FILE"A"), file_name_, line_number_) + : etl::unordered_set_exception(ETL_ERROR_TEXT("unordered_set:full", ETL_UNORDERED_SET_FILE_ID"A"), file_name_, line_number_) { } }; @@ -105,7 +102,7 @@ namespace etl public: unordered_set_out_of_range(string_type file_name_, numeric_type line_number_) - : etl::unordered_set_exception(ETL_ERROR_TEXT("unordered_set:range", ETL_FILE"B"), file_name_, line_number_) + : etl::unordered_set_exception(ETL_ERROR_TEXT("unordered_set:range", ETL_UNORDERED_SET_FILE_ID"B"), file_name_, line_number_) {} }; @@ -118,7 +115,7 @@ namespace etl public: unordered_set_iterator(string_type file_name_, numeric_type line_number_) - : etl::unordered_set_exception(ETL_ERROR_TEXT("unordered_set:iterator", ETL_FILE"C"), file_name_, line_number_) + : etl::unordered_set_exception(ETL_ERROR_TEXT("unordered_set:iterator", ETL_UNORDERED_SET_FILE_ID"C"), file_name_, line_number_) { } }; @@ -1555,6 +1552,4 @@ namespace etl #endif } -#undef ETL_FILE - #endif diff --git a/include/etl/variant.h b/include/etl/variant.h index 7bfea8eb..c466cf07 100644 --- a/include/etl/variant.h +++ b/include/etl/variant.h @@ -51,9 +51,6 @@ SOFTWARE. #pragma diag_suppress 111 #endif -#undef ETL_FILE -#define ETL_FILE "24" - //***************************************************************************** ///\defgroup variant variant /// A class that can contain one a several specified types in a type safe manner. @@ -95,7 +92,7 @@ namespace etl { public: variant_incorrect_type_exception(string_type file_name_, numeric_type line_number_) - : variant_exception(ETL_ERROR_TEXT("variant: unsupported type", ETL_FILE"A"), file_name_, line_number_) + : variant_exception(ETL_ERROR_TEXT("variant: unsupported type", ETL_VARIANT_FILE_ID"A"), file_name_, line_number_) { } }; @@ -1033,6 +1030,4 @@ namespace etl }; } -#undef ETL_FILE - #endif