Skip to content

Commit a5400aa

Browse files
committed
fix:1.10.28, 解决用cmake构建的报错的问题
1 parent 9a82fdd commit a5400aa

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

modules/event/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ set(TBOX_EVENT_SOURCES
4949
misc.cpp
5050
stat.cpp
5151
engines/epoll/loop.cpp
52-
engines/epoll/fd_event.cpp)
52+
engines/epoll/fd_event.cpp
53+
engines/select/loop.cpp
54+
engines/select/fd_event.cpp)
5355

5456
set(TBOX_EVENT_TEST_SOURCES
5557
common_loop_test.cpp

modules/flow/actions/parallel_action.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ void ParallelAction::onChildFinished(int index, bool is_succ) {
149149
}
150150
}
151151

152-
void ParallelAction::onChildBlocked(int index, const Reason &why, const Trace &trace) {
152+
void ParallelAction::onChildBlocked(int, const Reason &why, const Trace &trace) {
153153
if (state() == State::kRunning) {
154154
pauseAllActions();
155155
block(why, trace);
@@ -160,7 +160,7 @@ std::string ParallelAction::ToString(Mode mode) {
160160
const char *tbl[] = { "AllFinish", "AnyFail", "AnySucc" };
161161

162162
auto index = static_cast<size_t>(mode);
163-
if (0 <= index && index < NUMBER_OF_ARRAY(tbl))
163+
if (index < NUMBER_OF_ARRAY(tbl))
164164
return tbl[index];
165165

166166
return std::to_string(index);

modules/flow/actions/sequence_action.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ std::string SequenceAction::ToString(Mode mode) {
134134
const char *tbl[] = { "AllFinish", "AnyFail", "AnySucc" };
135135

136136
auto index = static_cast<size_t>(mode);
137-
if (0 <= index && index < NUMBER_OF_ARRAY(tbl))
137+
if (index < NUMBER_OF_ARRAY(tbl))
138138
return tbl[index];
139139

140140
return std::to_string(index);

version.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@
2121
# TBOX版本号
2222
TBOX_VERSION_MAJOR := 1
2323
TBOX_VERSION_MINOR := 10
24-
TBOX_VERSION_REVISION := 27
24+
TBOX_VERSION_REVISION := 28

0 commit comments

Comments
 (0)