Requiring v7.1 of the commsdsl.

Author: arobenko

.github/workflows/actions_build.yml

@@ -3,8 +3,8 @@ name: Github Actions Build
 on: [push]
 
 env:
-  COMMS_TAG: v5.3
-  COMMSDSL_TAG: v7.0.2
+  COMMS_TAG: develop
+  COMMSDSL_TAG: develop
   WIN_BOOST_VERSION: "1.87.0"
   WIN_BOOST_DIR: "C:/local/boost_1_87_0"
 

CMakeLists.txt

@@ -11,7 +11,7 @@ option (OPT_USE_SANITIZERS "Compile with sanitizers." OFF)
 
 #####################################################
 
-set (MIN_COMMSDSL_VERSION "7.0.2")
+set (MIN_COMMSDSL_VERSION "7.1")
 
 if ("${CMAKE_CXX_STANDARD}" STREQUAL "")
     set(CMAKE_CXX_STANDARD 11)

howtos/howto1/README.md

@@ -55,7 +55,7 @@ for details:
 ```cpp
 template<typename TField, typename TNextLayer, typename... TOptions>
 class SizeWithFlags : public
-    comms::protocol::MsgSizeLayer<...>
+    comms::frame::MsgSizeLayer<...>
 {
 
 public:

howtos/howto1/dsl_src/include/howto1/frame/layer/SizeWithFlags.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "comms/protocol/MsgSizeLayer.h"
+#include "comms/frame/MsgSizeLayer.h"
 #include "comms/options.h"
 
 namespace howto1
@@ -15,7 +15,7 @@ namespace layer
 /// @brief Customizing the size layer
 template<typename TField, typename TNextLayer, typename... TOptions>
 class SizeWithFlags : public
-    comms::protocol::MsgSizeLayer<
+    comms::frame::MsgSizeLayer<
         TField,
         TNextLayer,
         TOptions...,
@@ -24,7 +24,7 @@ class SizeWithFlags : public
 {
     // Repeat base type
     using Base = 
-        comms::protocol::MsgSizeLayer<
+        comms::frame::MsgSizeLayer<
             TField,
             TNextLayer,
             TOptions...,

howtos/howto1/include/howto1/Interface.h

@@ -1,4 +1,4 @@
-// Generated by commsdsl2comms v7.0.2
+// Generated by commsdsl2comms v7.1.0
 
 /// @file
 /// @brief Contains definition of <b>"Interface"</b> interface class.

howtos/howto1/include/howto1/InterfaceCommon.h

@@ -1,4 +1,4 @@
-// Generated by commsdsl2comms v7.0.2
+// Generated by commsdsl2comms v7.1.0
 
 /// @file
 /// @brief Contains common template parameters independent functionality of

howtos/howto1/include/howto1/MsgId.h

@@ -1,4 +1,4 @@
-// Generated by commsdsl2comms v7.0.2
+// Generated by commsdsl2comms v7.1.0
 
 /// @file
 /// @brief Contains definition of message ids enumeration.
@@ -10,6 +10,7 @@
 
 namespace howto1
 {
+
 /// @brief Message ids enumeration.
 enum MsgId : std::uint8_t
 {

howtos/howto1/include/howto1/Version.h

@@ -1,4 +1,4 @@
-// Generated by commsdsl2comms v7.0.2
+// Generated by commsdsl2comms v7.1.0
 
 /// @file
 /// @brief Contains protocol version definition.
@@ -22,5 +22,5 @@ inline constexpr unsigned specVersion()
 } // namespace howto1
 
 // Generated compile time check for minimal supported version of the COMMS library
-static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(),
+static_assert(COMMS_MAKE_VERSION(5, 4, 0) <= comms::version(),
     "The version of COMMS library is too old");

howtos/howto1/include/howto1/dispatch/DispatchClientInputMessage.h

@@ -1,11 +1,11 @@
-// Generated by commsdsl2comms v7.0.2
+// Generated by commsdsl2comms v7.1.0
 
 /// @file
 /// @brief Contains dispatch to handling function(s) for client input input messages.
 
 #pragma once
 
-#include "howto1/MsgId.h"
+#include <cstdint>
 #include "howto1/input/ClientInputMessages.h"
 #include "howto1/options/DefaultOptions.h"
 
@@ -39,20 +39,20 @@ namespace dispatch
 ///     Every @b handle() function may return a value, but every
 ///     function must return the @b same type.
 /// @note Defined in howto1/dispatch/DispatchClientInputMessage.h
-template<typename TProtOptions, typename TMsg, typename THandler>
+template<typename TProtOptions, typename TId, typename TMsg, typename THandler>
 auto dispatchClientInputMessage(
-    howto1::MsgId id,
+    TId id,
     TMsg& msg,
     THandler& handler) -> decltype(handler.handle(msg))
 {
     using InterfaceType = typename std::decay<decltype(msg)>::type;
-    switch(id) {
-    case howto1::MsgId_M1:
+    switch(static_cast<std::intmax_t>(id)) {
+    case 1 /* 0x1 */:
     {
         using MsgType = howto1::message::Msg1<InterfaceType, TProtOptions>;
         return handler.handle(static_cast<MsgType&>(msg));
     }
-    case howto1::MsgId_M2:
+    case 2 /* 0x2 */:
     {
         using MsgType = howto1::message::Msg2<InterfaceType, TProtOptions>;
         return handler.handle(static_cast<MsgType&>(msg));
@@ -75,9 +75,9 @@ auto dispatchClientInputMessage(
 /// @param[in] handler Reference to handling object.
 /// @see dispatchClientInputMessage()
 /// @note Defined in howto1/dispatch/DispatchClientInputMessage.h
-template<typename TProtOptions, typename TMsg, typename THandler>
+template<typename TProtOptions, typename TId, typename TMsg, typename THandler>
 auto dispatchClientInputMessage(
-    howto1::MsgId id,
+    TId id,
     std::size_t idx,
     TMsg& msg,
     THandler& handler) -> decltype(handler.handle(msg))
@@ -96,9 +96,9 @@ auto dispatchClientInputMessage(
 /// @param[in] handler Reference to handling object.
 /// @see dispatchClientInputMessage()
 /// @note Defined in howto1/dispatch/DispatchClientInputMessage.h
-template<typename TMsg, typename THandler>
+template<typename TId, typename TMsg, typename THandler>
 auto dispatchClientInputMessageDefaultOptions(
-    howto1::MsgId id,
+    TId id,
     TMsg& msg,
     THandler& handler) -> decltype(handler.handle(msg))
 {
@@ -114,9 +114,9 @@ auto dispatchClientInputMessageDefaultOptions(
 /// @param[in] handler Reference to handling object.
 /// @see dispatchClientInputMessageDefaultOptions()
 /// @note Defined in howto1/dispatch/DispatchClientInputMessage.h
-template<typename TMsg, typename THandler>
+template<typename TId, typename TMsg, typename THandler>
 auto dispatchClientInputMessageDefaultOptions(
-    howto1::MsgId id,
+    TId id,
     std::size_t idx,
     TMsg& msg,
     THandler& handler) -> decltype(handler.handle(msg))

howtos/howto1/include/howto1/dispatch/DispatchMessage.h

@@ -1,11 +1,11 @@
-// Generated by commsdsl2comms v7.0.2
+// Generated by commsdsl2comms v7.1.0
 
 /// @file
 /// @brief Contains dispatch to handling function(s) for all input messages.
 
 #pragma once
 
-#include "howto1/MsgId.h"
+#include <cstdint>
 #include "howto1/input/AllMessages.h"
 #include "howto1/options/DefaultOptions.h"
 
@@ -39,20 +39,20 @@ namespace dispatch
 ///     Every @b handle() function may return a value, but every
 ///     function must return the @b same type.
 /// @note Defined in howto1/dispatch/DispatchMessage.h
-template<typename TProtOptions, typename TMsg, typename THandler>
+template<typename TProtOptions, typename TId, typename TMsg, typename THandler>
 auto dispatchMessage(
-    howto1::MsgId id,
+    TId id,
     TMsg& msg,
     THandler& handler) -> decltype(handler.handle(msg))
 {
     using InterfaceType = typename std::decay<decltype(msg)>::type;
-    switch(id) {
-    case howto1::MsgId_M1:
+    switch(static_cast<std::intmax_t>(id)) {
+    case 1 /* 0x1 */:
     {
         using MsgType = howto1::message::Msg1<InterfaceType, TProtOptions>;
         return handler.handle(static_cast<MsgType&>(msg));
     }
-    case howto1::MsgId_M2:
+    case 2 /* 0x2 */:
     {
         using MsgType = howto1::message::Msg2<InterfaceType, TProtOptions>;
         return handler.handle(static_cast<MsgType&>(msg));
@@ -75,9 +75,9 @@ auto dispatchMessage(
 /// @param[in] handler Reference to handling object.
 /// @see dispatchMessage()
 /// @note Defined in howto1/dispatch/DispatchMessage.h
-template<typename TProtOptions, typename TMsg, typename THandler>
+template<typename TProtOptions, typename TId, typename TMsg, typename THandler>
 auto dispatchMessage(
-    howto1::MsgId id,
+    TId id,
     std::size_t idx,
     TMsg& msg,
     THandler& handler) -> decltype(handler.handle(msg))
@@ -96,9 +96,9 @@ auto dispatchMessage(
 /// @param[in] handler Reference to handling object.
 /// @see dispatchMessage()
 /// @note Defined in howto1/dispatch/DispatchMessage.h
-template<typename TMsg, typename THandler>
+template<typename TId, typename TMsg, typename THandler>
 auto dispatchMessageDefaultOptions(
-    howto1::MsgId id,
+    TId id,
     TMsg& msg,
     THandler& handler) -> decltype(handler.handle(msg))
 {
@@ -114,9 +114,9 @@ auto dispatchMessageDefaultOptions(
 /// @param[in] handler Reference to handling object.
 /// @see dispatchMessageDefaultOptions()
 /// @note Defined in howto1/dispatch/DispatchMessage.h
-template<typename TMsg, typename THandler>
+template<typename TId, typename TMsg, typename THandler>
 auto dispatchMessageDefaultOptions(
-    howto1::MsgId id,
+    TId id,
     std::size_t idx,
     TMsg& msg,
     THandler& handler) -> decltype(handler.handle(msg))