Release v5.4.5

arobenko · arobenko · commit b65d1e7187e7 · 2025-09-04T08:11:34.000+10:00
diff --git a/include/comms/MessageBase.h b/include/comms/MessageBase.h
@@ -184,7 +184,13 @@ class MessageBase : public details::MessageImplBuilderT<TMessage, TOptions...>
     static constexpr bool hasCustomName()
     {
         return ImplOptions::HasName;
-    }     
+    }  
+    
+    /// @brief Compile type inquiry whether the class provides @ref doGetId() member function.
+    static constexpr bool hasDoGetId()
+    {
+        return ImplOptions::HasStaticMsgId || ImplOptions::HasDoGetId;
+    }        
 
 #ifdef FOR_DOXYGEN_DOC_ONLY
 
diff --git a/include/comms/MsgDispatcher.h b/include/comms/MsgDispatcher.h
@@ -18,6 +18,7 @@
 #include "comms/util/type_traits.h"
 
 #include <type_traits>
+#include <utility>
 
 namespace comms
 {
diff --git a/include/comms/details/DispatchMsgLinearSwitchHelper.h b/include/comms/details/DispatchMsgLinearSwitchHelper.h
@@ -16,6 +16,7 @@
 #include "comms/util/type_traits.h"
 
 #include <type_traits>
+#include <utility>
 
 COMMS_MSVC_WARNING_PUSH
 COMMS_MSVC_WARNING_DISABLE(4702) // Gives warning about unreachable code
diff --git a/include/comms/details/DispatchMsgPolymorphicHelper.h b/include/comms/details/DispatchMsgPolymorphicHelper.h
@@ -21,6 +21,7 @@
 #include <array>
 #include <limits>
 #include <type_traits>
+#include <utility>
 
 namespace comms
 {
diff --git a/include/comms/details/DispatchMsgStaticBinSearchHelper.h b/include/comms/details/DispatchMsgStaticBinSearchHelper.h
@@ -15,6 +15,7 @@
 #include "comms/util/type_traits.h"
 
 #include <type_traits>
+#include <utility>
 
 namespace comms
 {
diff --git a/include/comms/details/MsgFactoryBase.h b/include/comms/details/MsgFactoryBase.h
@@ -21,6 +21,7 @@
 
 #include <memory>
 #include <type_traits>
+#include <utility>
 
 namespace comms
 {
diff --git a/include/comms/details/ProcessHelper.h b/include/comms/details/ProcessHelper.h
@@ -27,6 +27,7 @@
 #include <cstddef>
 #include <iterator>
 #include <type_traits>
+#include <utility>
 
 namespace  comms
 {
diff --git a/include/comms/details/ReadIteratorHelper.h b/include/comms/details/ReadIteratorHelper.h
@@ -12,6 +12,8 @@
 #include "comms/Message.h"
 #include "comms/util/type_traits.h"
 
+#include <utility>
+
 namespace comms
 {
 
diff --git a/include/comms/details/WriteIteratorHelper.h b/include/comms/details/WriteIteratorHelper.h
@@ -10,6 +10,8 @@
 #include "comms/details/tag.h"
 #include "comms/util/type_traits.h"
 
+#include <utility>
+
 namespace comms
 {
 
diff --git a/include/comms/details/variant_access.h b/include/comms/details/variant_access.h
@@ -14,6 +14,7 @@
 
 #include <tuple>
 #include <type_traits>
+#include <utility>
 
 #ifdef COMMS_MUST_DEFINE_BASE
 #define COMMS_AS_VARIANT_FUNC Base& asVariant()
diff --git a/include/comms/dispatch.h b/include/comms/dispatch.h
@@ -14,6 +14,7 @@
 #include "comms/util/type_traits.h"
 
 #include <type_traits>
+#include <utility>
 
 COMMS_MSVC_WARNING_PUSH
 COMMS_MSVC_WARNING_DISABLE(4100) // Disable warning about unreferenced parameters
diff --git a/include/comms/field/ArrayList.h b/include/comms/field/ArrayList.h
@@ -10,23 +10,23 @@
 
 #pragma once
 
+#include "basic/ArrayList.h"
 #include "comms/CompileControl.h"
-
-#include <vector>
-
-#if COMMS_HAS_CPP20_SPAN
-#include <span>
-#endif // #if COMMS_HAS_CPP20_SPAN
-
 #include "comms/ErrorStatus.h"
 #include "comms/options.h"
 #include "comms/util/StaticVector.h"
 #include "comms/util/ArrayView.h"
 #include "comms/util/type_traits.h"
-#include "basic/ArrayList.h"
 #include "details/AdaptBasicField.h"
 #include "details/OptionsParser.h"
 
+#include <vector>
+#include <utility>
+
+#if COMMS_HAS_CPP20_SPAN
+#include <span>
+#endif // #if COMMS_HAS_CPP20_SPAN
+
 namespace comms
 {
 
diff --git a/include/comms/field/Bitfield.h b/include/comms/field/Bitfield.h
@@ -15,6 +15,8 @@
 #include "comms/field/details/AdaptBasicField.h"
 #include "comms/options.h"
 
+#include <utility>
+
 namespace comms
 {
 
diff --git a/include/comms/field/BitmaskValue.h b/include/comms/field/BitmaskValue.h
@@ -20,6 +20,7 @@
 #include "comms/util/SizeToType.h"
 
 #include <limits>
+#include <utility>
 
 namespace comms
 {
diff --git a/include/comms/field/Bundle.h b/include/comms/field/Bundle.h
@@ -16,6 +16,8 @@
 #include "comms/options.h"
 #include "comms/util/Tuple.h"
 
+#include <utility>
+
 namespace comms
 {
 
diff --git a/include/comms/field/EnumValue.h b/include/comms/field/EnumValue.h
@@ -16,6 +16,7 @@
 #include "comms/options.h"
 
 #include <type_traits>
+#include <utility>
 
 namespace comms
 {
diff --git a/include/comms/field/FloatValue.h b/include/comms/field/FloatValue.h
@@ -16,6 +16,8 @@
 #include "comms/field/tag.h"
 #include "comms/options.h"
 
+#include <utility>
+
 namespace comms
 {
 
diff --git a/include/comms/field/IntValue.h b/include/comms/field/IntValue.h
@@ -21,6 +21,7 @@
 #include <limits>
 #include <ratio>
 #include <type_traits>
+#include <utility>
 
 COMMS_MSVC_WARNING_PUSH
 COMMS_MSVC_WARNING_DISABLE(4127) // Disable warning about constant conditional expressions
diff --git a/include/comms/field/Optional.h b/include/comms/field/Optional.h
@@ -17,6 +17,8 @@
 #include "comms/field/details/OptionsParser.h"
 #include "comms/field/OptionalMode.h"
 
+#include <utility>
+
 namespace comms
 {
 
diff --git a/include/comms/field/String.h b/include/comms/field/String.h
@@ -27,6 +27,7 @@
 #endif // #if COMMS_HAS_CPP17_STRING_VIEW
 
 #include <vector>
+#include <utility>
 
 namespace comms
 {
diff --git a/include/comms/field/Variant.h b/include/comms/field/Variant.h
@@ -18,6 +18,8 @@
 #include "comms/options.h"
 #include "comms/util/Tuple.h"
 
+#include <utility>
+
 namespace comms
 {
 
diff --git a/include/comms/field/basic/ArrayList.h b/include/comms/field/basic/ArrayList.h
@@ -27,6 +27,7 @@
 #include <limits>
 #include <numeric>
 #include <type_traits>
+#include <utility>
 
 namespace comms
 {
diff --git a/include/comms/field/basic/Bitfield.h b/include/comms/field/basic/Bitfield.h
@@ -21,7 +21,7 @@
 
 #include <limits>
 #include <type_traits>
-
+#include <utility>
 
 namespace comms
 {
diff --git a/include/comms/field/basic/Bundle.h b/include/comms/field/basic/Bundle.h
@@ -17,6 +17,7 @@
 
 #include <algorithm>
 #include <type_traits>
+#include <utility>
 
 namespace comms
 {
diff --git a/include/comms/field/basic/EnumValue.h b/include/comms/field/basic/EnumValue.h
@@ -12,6 +12,7 @@
 #include "comms/field/tag.h"
 
 #include <type_traits>
+#include <utility>
 
 namespace comms
 {
diff --git a/include/comms/field/basic/FloatValue.h b/include/comms/field/basic/FloatValue.h
@@ -13,6 +13,7 @@
 
 #include <ratio>
 #include <type_traits>
+#include <utility>
 
 namespace comms
 {
diff --git a/include/comms/field/basic/IntValue.h b/include/comms/field/basic/IntValue.h
@@ -12,6 +12,7 @@
 
 #include <ratio>
 #include <type_traits>
+#include <utility>
 
 namespace comms
 {
diff --git a/include/comms/field/basic/Optional.h b/include/comms/field/basic/Optional.h
@@ -13,6 +13,8 @@
 #include "comms/field/OptionalMode.h"
 #include "comms/field/tag.h"
 
+#include <utility>
+
 namespace comms
 {
 
diff --git a/include/comms/field/basic/String.h b/include/comms/field/basic/String.h
@@ -25,6 +25,7 @@
 #include <limits>
 #include <numeric>
 #include <type_traits>
+#include <utility>
 
 COMMS_MSVC_WARNING_PUSH
 COMMS_MSVC_WARNING_DISABLE(4100)
diff --git a/include/comms/field/basic/Variant.h b/include/comms/field/basic/Variant.h
@@ -21,6 +21,7 @@
 
 #include <algorithm>
 #include <type_traits>
+#include <utility>
 
 COMMS_MSVC_WARNING_PUSH
 COMMS_MSVC_WARNING_DISABLE(4324) // Disable warning about alignment padding
diff --git a/include/comms/frame/ChecksumLayer.h b/include/comms/frame/ChecksumLayer.h
@@ -20,6 +20,7 @@
 
 #include <iterator>
 #include <type_traits>
+#include <utility>
 
 COMMS_MSVC_WARNING_PUSH
 COMMS_MSVC_WARNING_DISABLE(4189) // Disable erroneous initialized but not referenced variable warning
diff --git a/include/comms/frame/ChecksumPrefixLayer.h b/include/comms/frame/ChecksumPrefixLayer.h
@@ -18,6 +18,7 @@
 
 #include <iterator>
 #include <type_traits>
+#include <utility>
 
 COMMS_MSVC_WARNING_PUSH
 COMMS_MSVC_WARNING_DISABLE(4189) // Disable erroneous initialized but not referenced variable warning
diff --git a/include/comms/frame/MsgIdLayer.h b/include/comms/frame/MsgIdLayer.h
@@ -601,9 +601,10 @@ class MsgIdLayer : public comms::frame::details::MsgIdLayerBase<TField, TMessage
         using MsgType = typename std::decay<decltype(msg)>::type;
         static_assert(comms::isMessageBase<MsgType>(),
             "The message class is expected to inherit from comms::MessageBase");
-        static_assert(MsgType::hasStaticMsgId(),
+        static_assert(MsgType::hasDoGetId(),
             "The message class must expose direct ID retrieval functionality, "
-            "use comms::option::app::StaticNumIdImpl option to define it.");        
+            "use comms::option::app::StaticNumIdImpl option to define it or "
+            "comms::option::app::HasDoGetId option to mark the class as providing one");        
         return msg.doGetId();
     }
 
diff --git a/include/comms/frame/MsgSizeLayer.h b/include/comms/frame/MsgSizeLayer.h
@@ -21,6 +21,7 @@
 
 #include <iterator>
 #include <type_traits>
+#include <utility>
 
 COMMS_MSVC_WARNING_PUSH
 COMMS_MSVC_WARNING_DISABLE(4189) // Disable erroneous initialized but not referenced variable warning
diff --git a/include/comms/frame/details/FrameLayerDetails.h b/include/comms/frame/details/FrameLayerDetails.h
@@ -52,7 +52,7 @@ struct FrameLayerHasDoGetIdHelper;
 template <typename T>
 struct FrameLayerHasDoGetIdHelper<T, true>
 {
-    static const bool Value = T::hasStaticMsgId();
+    static const bool Value = T::hasDoGetId();
 };
 
 template <typename T>
diff --git a/include/comms/iterator.h b/include/comms/iterator.h
@@ -13,6 +13,8 @@
 #include "comms/details/ReadIteratorHelper.h"
 #include "comms/details/WriteIteratorHelper.h"
 
+#include <utility>
+
 namespace comms
 {
 
diff --git a/include/comms/process.h b/include/comms/process.h
@@ -13,6 +13,7 @@
 #include "comms/details/ProcessHelper.h"
 
 #include <cstddef>
+#include <utility>
 
 namespace  comms
 {
diff --git a/include/comms/units.h b/include/comms/units.h
@@ -17,6 +17,7 @@
 
 #include <ratio>
 #include <type_traits>
+#include <utility>
 
 COMMS_MSVC_WARNING_PUSH
 COMMS_MSVC_WARNING_DISABLE(4100) // Disable unreferenced parameter warning
diff --git a/include/comms/util/ScopeGuard.h b/include/comms/util/ScopeGuard.h
@@ -13,6 +13,7 @@
 #include <functional>
 #include <memory>
 #include <type_traits>
+#include <utility>
 
 namespace comms
 {
diff --git a/include/comms/util/StaticVector.h b/include/comms/util/StaticVector.h
@@ -19,6 +19,7 @@
 #include <cstddef>
 #include <initializer_list>
 #include <iterator>
+#include <utility>
 
 COMMS_GNU_WARNING_PUSH
 
diff --git a/include/comms/util/alloc.h b/include/comms/util/alloc.h
@@ -24,6 +24,7 @@
 #include <array>
 #include <memory>
 #include <type_traits>
+#include <utility>
 
 COMMS_MSVC_WARNING_PUSH
 COMMS_MSVC_WARNING_DISABLE(4324) // Disable warning about alignment padding
diff --git a/include/comms/version.h b/include/comms/version.h
@@ -17,7 +17,7 @@
 #define COMMS_MINOR_VERSION 4U
 
 /// @brief Patch level of the library
-#define COMMS_PATCH_VERSION 4U
+#define COMMS_PATCH_VERSION 5U
 
 /// @brief Macro to create numeric version as single unsigned number
 #define COMMS_MAKE_VERSION(major_, minor_, patch_) \
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -58,6 +58,7 @@ if (TARGET cxxtest::cxxtest)
     test_func ("CustomSyncPrefixLayer")
     test_func ("Dispatch")
     test_func ("MsgFactory")
+    test_func ("GenericMessage")
 else ()
     message (Warning "Testing is enabled, but cxxtest hasn't been found!")
 endif ()
diff --git a/test/CustomMsgIdLayer.th b/test/CustomMsgIdLayer.th
diff --git a/test/GenericMessage.th b/test/GenericMessage.th

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`#include "comms/util/type_traits.h"`
`19`	`19`
`20`	`20`	`#include <type_traits>`
	`21`	`+#include <utility>`
`21`	`22`
`22`	`23`	`namespace comms`
`23`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`#include <array>`
`22`	`22`	`#include <limits>`
`23`	`23`	`#include <type_traits>`
	`24`	`+#include <utility>`
`24`	`25`
`25`	`26`	`namespace comms`
`26`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`#include "comms/util/type_traits.h"`
`16`	`16`
`17`	`17`	`#include <type_traits>`
	`18`	`+#include <utility>`
`18`	`19`
`19`	`20`	`namespace comms`
`20`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`#include <cstddef>`
`28`	`28`	`#include <iterator>`
`29`	`29`	`#include <type_traits>`
	`30`	`+#include <utility>`
`30`	`31`
`31`	`32`	`namespace comms`
`32`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@`
`12`	`12`	`#include "comms/Message.h"`
`13`	`13`	`#include "comms/util/type_traits.h"`
`14`	`14`
	`15`	`+#include <utility>`
	`16`	`+`
`15`	`17`	`namespace comms`
`16`	`18`	`{`
`17`	`19`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@`
`10`	`10`	`#include "comms/details/tag.h"`
`11`	`11`	`#include "comms/util/type_traits.h"`
`12`	`12`
	`13`	`+#include <utility>`
	`14`	`+`
`13`	`15`	`namespace comms`
`14`	`16`	`{`
`15`	`17`