diff --git a/.gitignore b/.gitignore index e52f3484..877c2b1d 100644 --- a/.gitignore +++ b/.gitignore @@ -284,3 +284,4 @@ examples/FunctionInterruptSimulation-Delegates/vs2019/.vs *.db-shm test/vs2019/.vs/etl/v16/Browse.VC.db-wal +examples/SharedMessage/.vs diff --git a/include/etl/message_bus.h b/include/etl/message_bus.h index b00567e9..6897645f 100644 --- a/include/etl/message_bus.h +++ b/include/etl/message_bus.h @@ -149,11 +149,18 @@ namespace etl //******************************************* virtual void receive(etl::imessage_router& source, - const etl::imessage& message) ETL_OVERRIDE + const etl::imessage& message) ETL_OVERRIDE { receive(source, etl::imessage_router::ALL_MESSAGE_ROUTERS, message); } + //******************************************* + virtual void receive(etl::imessage_router& source, + etl::shared_message shared_msg) ETL_OVERRIDE + { + receive(source, etl::imessage_router::ALL_MESSAGE_ROUTERS, shared_msg); + } + //******************************************** virtual void receive(etl::imessage_router& source, etl::message_router_id_t destination_router_id, diff --git a/include/etl/reference_counted_message_pool.h b/include/etl/reference_counted_message_pool.h index 3614c7f6..48f7a023 100644 --- a/include/etl/reference_counted_message_pool.h +++ b/include/etl/reference_counted_message_pool.h @@ -33,6 +33,7 @@ SOFTWARE. #include "platform.h" #include "message.h" +#include "imemory_block_allocator.h" #include "ireference_counted_message_pool.h" #include "reference_counted_message.h" #include "static_assert.h" @@ -45,9 +46,6 @@ SOFTWARE. #undef ETL_FILE #define ETL_FILE ETL_REFERENCE_COUNTER_MESSAGE_POOL_ID -#undef ETL_MAX -#define ETL_MAX(a, b) ((a) < (b) ? (b) : (a)) - namespace etl { //*************************************************************************** @@ -234,6 +232,5 @@ namespace etl } #undef ETL_FILE -#undef ETL_MAX #endif