Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitbea51e8

Browse files
committed
7.4.0-rc.3
1 parent4470078 commitbea51e8

File tree

5 files changed

+6
-70
lines changed

5 files changed

+6
-70
lines changed

‎examples‎

Submoduleexamples updated34 files

‎include/qp.hpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -438,9 +438,6 @@ class QMsm : public QP::QAsm {
438438
}
439439
#endif// def Q_SPY
440440
boolisIn(QStateHandlerconst state)noexceptoverride;
441-
442-
//! @deprecated instead use: QMsm::isIn()
443-
boolisInState(QMStateconst *const stateObj)constnoexcept;
444441
QMStateconst *childStateObj(QMStateconst *const parent)constnoexcept;
445442

446443
private:
@@ -931,9 +928,6 @@ class QMActive : public QP::QActive {
931928
returnreinterpret_cast<QMsm *>(this)->QMsm::getStateHandler();
932929
}
933930
#endif// def Q_SPY
934-
boolisInState(QMStateconst *const st)constnoexcept {
935-
returnreinterpret_cast<QMsmconst *>(this)->QMsm::isInState(st);
936-
}
937931
QMStateconst *childStateObj(QMStateconst *const parent)constnoexcept {
938932
returnreinterpret_cast<QMsmconst *>(this)
939933
->QMsm::childStateObj(parent);

‎qpcpp.qm‎

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1156,7 +1156,7 @@ do {
11561156
else if (r == Q_RET_SUPER_SUB) {
11571157
t = m_temp.obj; // current host state of the submachie
11581158
}
1159-
else { // event unhandled due to a guard?
1159+
else { // event unhandled due to a guard
11601160
QF_CRIT_ENTRY();
11611161
// event must be unhandled due to a guard evaluating to 'false'
11621162
Q_ASSERT_INCRIT(310, r == Q_RET_UNHANDLED);
@@ -1347,33 +1347,6 @@ QF_CRIT_ENTRY();
13471347
Q_ENSURE_INCRIT(490, lbound&gt; 0);
13481348
QF_CRIT_EXIT();
13491349

1350-
return inState;</code>
1351-
</operation>
1352-
<!--${QEP::QMsm::isInState}-->
1353-
<operationname="isInState"type="bool"visibility="0x00"properties="0x00">
1354-
<specifiers>const noexcept</specifiers>
1355-
<documentation>//! @deprecated instead use: QMsm::isIn()</documentation>
1356-
<!--${QEP::QMsm::isInState::stateObj}-->
1357-
<parametername="stateObj"type="QMState const * const"/>
1358-
<code>bool inState = false; // assume that this SM is not in 'state'
1359-
1360-
QMState const *s = m_state.obj;
1361-
std::int_fast8_t lbound = QMSM_MAX_NEST_DEPTH_; // fixed upper loop bound
1362-
for (; (s != nullptr)&amp;&amp; (lbound&gt; 0); --lbound) {
1363-
if (s == stateObj) { // match found?
1364-
inState = true;
1365-
break;
1366-
}
1367-
else {
1368-
s = s-&gt;superstate; // advance to the superstate
1369-
}
1370-
}
1371-
1372-
QF_CRIT_STAT
1373-
QF_CRIT_ENTRY();
1374-
Q_ENSURE_INCRIT(590, lbound&gt; 0);
1375-
QF_CRIT_EXIT();
1376-
13771350
return inState;</code>
13781351
</operation>
13791352
<!--${QEP::QMsm::childStateObj}-->
@@ -2941,13 +2914,6 @@ m_temp.fun = initial;</code>
29412914
<specifiers>noexcept override</specifiers>
29422915
<code>return reinterpret_cast&lt;QMsm *&gt;(this)-&gt;QMsm::getStateHandler();</code>
29432916
</operation>
2944-
<!--${QF::QMActive::isInState}-->
2945-
<operationname="isInState"type="bool"visibility="0x00"properties="0x02">
2946-
<specifiers>const noexcept</specifiers>
2947-
<!--${QF::QMActive::isInState::st}-->
2948-
<parametername="st"type="QMState const * const"/>
2949-
<code>return reinterpret_cast&lt;QMsm const *&gt;(this)-&gt;QMsm::isInState(st);</code>
2950-
</operation>
29512917
<!--${QF::QMActive::childStateObj}-->
29522918
<operationname="childStateObj"type="QMState const *"visibility="0x00"properties="0x02">
29532919
<specifiers>const noexcept</specifiers>

‎qpcpp.sha1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
b741762e30f27d4c7ab5c8ead0c70d675113c1f7*qpcpp.qm
1+
177ecb5725a327d05728c48484a164e43a407045*qpcpp.qm
22
2e6071600db5ae5eace4cc524f9ed4f5310056ce*include/qequeue.hpp
33
2ae88474c60e5ae739bafc1131f54ce9f1bba25b*include/qk.hpp
44
8c49c0fb49ede99f2277e70e9340709a65d15f85*include/qmpool.hpp
5-
89cb103f9c4ef181b02e5937682538b6efd2803a*include/qp.hpp
5+
16e02c12f65e037960d3994379aeddc618fba499*include/qp.hpp
66
c25d74292c78eb2af68fe8c39e854141d739fba1*include/qp_pkg.hpp
77
eef6f6b93ce2066f02be0217d4953045ce102878*include/qpcpp.hpp
88
9bf9ae3586f8828c372ab79771839bd3c76e5b5e*include/qs.hpp
@@ -14,7 +14,7 @@ b6b1f1c52727bec4c6a50b030ad9277f93ac0eee *include/qs_dummy.hpp
1414
0648d5e24f1954beef908b7fc57e344b01643d14*include/qxk.hpp
1515
71899ce74eeb04f333ed00d53f87719f722a39ab*src/qf/CMakeLists.txt
1616
55c2256457431d6b7c2024ec934a52a33cc4e5ce*src/qf/qep_hsm.cpp
17-
ae443cd0da18d7cd14598a6e6646d86000a2591a*src/qf/qep_msm.cpp
17+
4c49ee7b7b1f1cffc07e8e3c6677d279f3861c83*src/qf/qep_msm.cpp
1818
20e2a785f80fc9839b7f2774e64ec5414929e918*src/qf/qf_act.cpp
1919
23569b7f1e7ec95d32b13288be4793d303ad2a73*src/qf/qf_actq.cpp
2020
3a916b17accb3aea38ec52832e69646173ccd742*src/qf/qf_defer.cpp

‎src/qf/qep_msm.cpp‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ void QMsm::dispatch(
209209
elseif (r == Q_RET_SUPER_SUB) {
210210
t = m_temp.obj;// current host state of the submachie
211211
}
212-
else {// event unhandled due to a guard?
212+
else {// event unhandled due to a guard
213213
QF_CRIT_ENTRY();
214214
// event must be unhandled due to a guard evaluating to 'false'
215215
Q_ASSERT_INCRIT(310, r == Q_RET_UNHANDLED);
@@ -396,30 +396,6 @@ bool QMsm::isIn(QStateHandler const state) noexcept {
396396
return inState;
397397
}
398398

399-
//${QEP::QMsm::isInState} ....................................................
400-
boolQMsm::isInState(QMStateconst *const stateObj)constnoexcept {
401-
bool inState =false;// assume that this SM is not in 'state'
402-
403-
QMStateconst *s = m_state.obj;
404-
std::int_fast8_t lbound = QMSM_MAX_NEST_DEPTH_;// fixed upper loop bound
405-
for (; (s !=nullptr) && (lbound >0); --lbound) {
406-
if (s == stateObj) {// match found?
407-
inState =true;
408-
break;
409-
}
410-
else {
411-
s = s->superstate;// advance to the superstate
412-
}
413-
}
414-
415-
QF_CRIT_STAT
416-
QF_CRIT_ENTRY();
417-
Q_ENSURE_INCRIT(590, lbound >0);
418-
QF_CRIT_EXIT();
419-
420-
return inState;
421-
}
422-
423399
//${QEP::QMsm::childStateObj} ................................................
424400
QMStateconst *QMsm::childStateObj(QMStateconst *const parent)constnoexcept {
425401
QMStateconst *child = m_state.obj;

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp