From 40daf72dcfe7e65b79b079967813c8d6ec700c64 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 12 Nov 2017 10:28:37 +0000 Subject: [PATCH 1/3] Merge branch 'development' --- library.properties | 2 +- src/message_router_generator.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/library.properties b/library.properties index 32e1e807..c890c5f1 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Embedded Template Library -version=10.3.1 +version=10.3.2 author= John Wellbelove maintainer=John Wellbelove sentence=A C++ template library tailored for embedded systems. diff --git a/src/message_router_generator.h b/src/message_router_generator.h index 857b182a..054cd5fb 100644 --- a/src/message_router_generator.h +++ b/src/message_router_generator.h @@ -129,13 +129,13 @@ namespace etl //******************************************** bool is_null_router() const { - return (message_router_id != NULL_MESSAGE_ROUTER); + return (message_router_id == NULL_MESSAGE_ROUTER); } //******************************************** bool is_bus() const { - return (message_router_id != MESSAGE_BUS); + return (message_router_id == MESSAGE_BUS); } enum @@ -176,17 +176,17 @@ namespace etl } //******************************************** - void receive(const etl::imessage& message) + void receive(const etl::imessage&) { } //******************************************** - void receive(etl::imessage_router& source, const etl::imessage& message) + void receive(etl::imessage_router&, const etl::imessage&) { } //******************************************** - bool accepts(etl::message_id_t id) const + bool accepts(etl::message_id_t) const { return false; } From ed595ccfe2312fcaecea0b1747d6ef1911ea66e9 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 14 Nov 2017 13:09:52 +0000 Subject: [PATCH 2/3] Obsolete file --- library.properties | 2 +- src/etl_arduino.h | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 src/etl_arduino.h diff --git a/library.properties b/library.properties index c890c5f1..5fe63b00 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Embedded Template Library -version=10.3.2 +version=10.3.3 author= John Wellbelove maintainer=John Wellbelove sentence=A C++ template library tailored for embedded systems. diff --git a/src/etl_arduino.h b/src/etl_arduino.h deleted file mode 100644 index 7efdae0c..00000000 --- a/src/etl_arduino.h +++ /dev/null @@ -1,8 +0,0 @@ - - -#ifndef __ETL_PLATFORM_ARDUINO__ - -#define COMPILER_GCC -#define PLATFORM_ARM - -#endif From c0c003303f7a585316ef0f4b9db3cb81fe3fe123 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sat, 18 Nov 2017 11:11:57 +0000 Subject: [PATCH 3/3] Added #include --- src/type_traits.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/type_traits.h b/src/type_traits.h index a5909815..083df234 100644 --- a/src/type_traits.h +++ b/src/type_traits.h @@ -54,6 +54,7 @@ SOFTWARE. #define __ETL_TYPE_TRAITS__ #include +#include #include "platform.h" #include "nullptr.h"