6.8.1

Author: QL

libraries/qpcpp_sam/src/qep.hpp

@@ -4,7 +4,7 @@
 /// @cond
 ///***************************************************************************
 /// Last updated for version 6.8.1
-/// Last updated on  2020-04-02
+/// Last updated on  2020-04-05
 ///
 ///                    Q u a n t u m  L e a P s
 ///                    ------------------------
@@ -155,18 +155,18 @@ namespace QP {
     //************************************************************************
     class QEvt {
     public:
-        //! public constructor (dynamic event)
+        //! public constructor (overload for dynamic events)
         QEvt(QSignal const s) noexcept
           : sig(s)
           // poolId_/refCtr_ intentionally uninitialized
         {}
-        enum StaticEvt : std::uint8_t { STATIC_EVT };
 
-        //! public constructor (static event)
-        QEvt(QSignal const s, StaticEvt /*dummy*/) noexcept
+        //! public constructor (overload for static events)
+        enum StaticEvt : std::uint8_t { STATIC_EVT };
+        constexpr QEvt(QSignal const s, StaticEvt /*dummy*/) noexcept
           : sig(s),
             poolId_(0U),
-            refCtr_(0U))
+            refCtr_(0U)
         {}
 
 #ifdef Q_EVT_VIRTUAL
@@ -188,10 +188,10 @@ namespace QP {
         friend class QEQueue;
         friend class QTicker;
         friend class QXThread;
-        friend std::uint8_t QF_EVT_POOL_ID_ (QEvt const * const e);
-        friend std::uint8_t QF_EVT_REF_CTR_ (QEvt const * const e);
-        friend void QF_EVT_REF_CTR_INC_(QEvt const * const e);
-        friend void QF_EVT_REF_CTR_DEC_(QEvt const * const e);
+        friend std::uint8_t QF_EVT_POOL_ID_ (QEvt const * const e) noexcept;
+        friend std::uint8_t QF_EVT_REF_CTR_ (QEvt const * const e) noexcept;
+        friend void QF_EVT_REF_CTR_INC_(QEvt const * const e) noexcept;
+        friend void QF_EVT_REF_CTR_DEC_(QEvt const * const e) noexcept;
     };
 
 #else // QEvt is a POD (Plain Old Datatype)
@@ -302,7 +302,7 @@ class QHsm {
 
 protected:
     //! Protected constructor of QHsm.
-    QHsm(QStateHandler const initial) noexcept;
+    explicit QHsm(QStateHandler const initial) noexcept;
 
 public:
 // facilities for the QHsm implementation strategy...
@@ -513,7 +513,7 @@ class QMsm : public QHsm {
 
 protected:
     //! Protected constructor
-    QMsm(QStateHandler const initial) noexcept;
+    explicit QMsm(QStateHandler const initial) noexcept;
 
 private:
     //! disallow the inhertited isIn() function in QP::QMsm and subclasses

libraries/qpcpp_sam/src/qep_hsm.cpp

@@ -93,12 +93,12 @@ enum : QSignal {
 /// to state handler functions of QP::QHsm and QP::QFsm subclasses to execute
 /// entry actions, exit actions, and initial transitions.
 ///
-static QEvt const QEP_reservedEvt_[4] = {
+static QEvt const QEP_reservedEvt_[4] {
 #ifdef Q_EVT_CTOR // Is the QEvt constructor provided?
-    0U,
-    1U,
-    2U,
-    3U
+    QEvt(0U, QEvt::STATIC_EVT),
+    QEvt(1U, QEvt::STATIC_EVT),
+    QEvt(2U, QEvt::STATIC_EVT),
+    QEvt(3U, QEvt::STATIC_EVT)
 #else // QEvt is a POD (Plain Old Datatype)
     { 0U, 0U, 0U },
     { 1U, 0U, 0U },

libraries/qpcpp_sam/src/qf_time.cpp

@@ -3,8 +3,8 @@
 /// @ingroup qf
 /// @cond
 ///***************************************************************************
-/// Last updated for version 6.8.0
-/// Last updated on  2020-03-29
+/// Last updated for version 6.8.1
+/// Last updated on  2020-04-05
 ///
 ///                    Q u a n t u m  L e a P s
 ///                    ------------------------
@@ -231,7 +231,7 @@ QTimeEvt::QTimeEvt(QActive * const act,
     enum_t const sgnl, std::uint_fast8_t const tickRate) noexcept
     :
 #ifdef Q_EVT_CTOR
-    QEvt(static_cast<QSignal>(sgnl)),
+    QEvt(static_cast<QSignal>(sgnl), QEvt::STATIC_EVT),
 #else
     QEvt(),
 #endif
@@ -267,7 +267,7 @@ QTimeEvt::QTimeEvt(QActive * const act,
 QTimeEvt::QTimeEvt() noexcept
     :
 #ifdef Q_EVT_CTOR
-    QEvt(0U),
+    QEvt(0U, QEvt::STATIC_EVT),
 #else
     QEvt(),
 #endif // Q_EVT_CTOR
@@ -278,7 +278,6 @@ QTimeEvt::QTimeEvt() noexcept
 {
 #ifndef Q_EVT_CTOR
     sig = 0U;
-#endif  // Q_EVT_CTOR
 
     // Setting the POOL_ID event attribute to zero is correct only for
     // events not allocated from event pools, which must be the case
@@ -290,6 +289,9 @@ QTimeEvt::QTimeEvt() noexcept
     // reused to hold the tickRate as well as other information
     //
     refCtr_ = 0U; // default rate 0
+
+#endif  // Q_EVT_CTOR
+
 }
 
 //****************************************************************************