Skip to content

Commit 9f0c5cd

Browse files
committed
feat: g++11
1 parent 5def90f commit 9f0c5cd

File tree

5 files changed

+34
-34
lines changed

5 files changed

+34
-34
lines changed

.github/workflows/cmake.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,16 +185,16 @@ jobs:
185185
fail-fast: false
186186
matrix:
187187
include:
188-
- apt: g++-8
189-
cc: gcc-8
190-
cxx: g++-8
188+
- apt: g++-11
189+
cc: gcc-11
190+
cxx: g++-11
191191
triplet: x64-linux
192192
mono: 'mono'
193193
dll_sfx: linux.amd64
194194
- path: /usr/i686-linux-gnu
195-
apt: g++-8-i686-linux-gnu
196-
cc: i686-linux-gnu-gcc-8
197-
cxx: i686-linux-gnu-g++-8
195+
apt: g++-11-i686-linux-gnu
196+
cc: i686-linux-gnu-gcc-11
197+
cxx: i686-linux-gnu-g++-11
198198
triplet: x86-linux
199199
mono: 'mono'
200200
dll_sfx: linux.i386

Dice/DiceJob.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ int sendSelf(const string& msg) {
3333
return 0;
3434
}
3535

36-
void cq_exit(AttrObject& job) {
36+
void cq_exit(AttrObject job) {
3737
#ifdef _WIN32
3838
MsgNote(job, "已令" + getMsg("self") + "在5秒后自杀", 1);
3939
std::this_thread::sleep_for(5s);
@@ -52,7 +52,7 @@ inline PROCESSENTRY32 getProcess(int pid) {
5252
}
5353
#endif
5454

55-
void frame_restart(AttrObject& job) {
55+
void frame_restart(AttrObject job) {
5656
#ifdef _WIN32
5757
if (!job->get_ll("uid")) {
5858
if (console["AutoFrameRemake"] <= 0) {
@@ -71,14 +71,14 @@ void frame_restart(AttrObject& job) {
7171
#endif
7272
}
7373

74-
void frame_reload(AttrObject& job) {
74+
void frame_reload(AttrObject job) {
7575
if (DD::reload())
7676
MsgNote(job, "重载" + getMsg("self") + "完成√", 1);
7777
else
7878
MsgNote(job, "重载" + getMsg("self") + "失败×", 0b10);
7979
}
8080

81-
void check_system(AttrObject& job) {
81+
void check_system(AttrObject job) {
8282
#ifdef _WIN32
8383
static int perRAM(0), perLastRAM(0);
8484
static double perLastCPU(0), perLastDisk(0),
@@ -140,7 +140,7 @@ void check_system(AttrObject& job) {
140140
#endif
141141
}
142142

143-
void auto_save(AttrObject& job) {
143+
void auto_save(AttrObject job) {
144144
if (sch.is_job_cold("autosave"))return;
145145
DD::debugLog(printSTNow() + " 自动保存");
146146
dataBackUp();
@@ -152,7 +152,7 @@ void auto_save(AttrObject& job) {
152152
}
153153

154154
//被引用的图片列表
155-
void clear_image(AttrObject& job) {
155+
void clear_image(AttrObject job) {
156156
return;
157157
if (!job->has("uid")) {
158158
if (sch.is_job_cold("clrimage"))return;
@@ -168,7 +168,7 @@ void clear_image(AttrObject& job) {
168168
}
169169
}
170170

171-
void clear_group(AttrObject& job) {
171+
void clear_group(AttrObject job) {
172172
console.log("开始清查群聊", 0, printSTNow());
173173
int intCnt = 0;
174174
ResList res;
@@ -298,7 +298,7 @@ void clear_group(AttrObject& job) {
298298
MsgNote(job, "清查群聊时回收不活跃记录" + to_string(GrpDelete.size()) + "", 0b1);
299299
}
300300
}
301-
void list_group(AttrObject& job) {
301+
void list_group(AttrObject job) {
302302
console.log("遍历群列表", 0, printSTNow());
303303
string mode{ job->get_str("list_mode") };
304304
if (mode.empty()) {
@@ -363,12 +363,12 @@ void list_group(AttrObject& job) {
363363
}
364364

365365
//心跳检测
366-
void cloud_beat(AttrObject& job) {
366+
void cloud_beat(AttrObject job) {
367367
Cloud::heartbeat();
368368
sch.add_job_for(5 * 60, job);
369369
}
370370

371-
void check_update(AttrObject& job) {
371+
void check_update(AttrObject job) {
372372
string ret;
373373
if (!Network::GET("http://shiki.stringempty.xyz/DiceVer/update", ret)) {
374374
console.log("获取版本信息时出错: \n" + ret, 0);
@@ -387,7 +387,7 @@ void check_update(AttrObject& job) {
387387
}
388388
sch.add_job_for(72 * 60 * 60, "check_update");
389389
}
390-
void dice_update(AttrObject& job) {
390+
void dice_update(AttrObject job) {
391391
string ret;
392392
if (!Network::GET("http://shiki.stringempty.xyz/DiceVer/update", ret)) {
393393
reply(job, "{self}获取版本信息时出错: \n" + ret);
@@ -425,7 +425,7 @@ void dice_update(AttrObject& job) {
425425
}
426426

427427
//获取云不良记录
428-
void dice_cloudblack(AttrObject& job) {
428+
void dice_cloudblack(AttrObject job) {
429429
bool isSuccess(false);
430430
MsgNote(job, "开始获取云不良记录", 0);
431431
string strURL("https://shiki.stringempty.xyz/blacklist/checked.json?" + to_string(time(nullptr)));
@@ -458,7 +458,7 @@ void dice_cloudblack(AttrObject& job) {
458458
sch.add_job_for(24 * 60 * 60, "cloudblack");
459459
}
460460

461-
void log_put(AttrObject& job) {
461+
void log_put(AttrObject job) {
462462
int cntExec{ job->get_int("retry") };
463463
if (!cntExec) {
464464
DD::debugLog("发送log文件:" + job->get_str("log_path"));

Dice/DiceJob.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,27 @@ inline time_t tNow = time(NULL);
55

66
int sendSelf(const string& msg);
77

8-
void cq_exit(AttrObject& job);
9-
void frame_restart(AttrObject& job);
10-
void frame_reload(AttrObject& job);
8+
void cq_exit(AttrObject job);
9+
void frame_restart(AttrObject job);
10+
void frame_reload(AttrObject job);
1111

12-
void auto_save(AttrObject& job);
12+
void auto_save(AttrObject job);
1313

14-
void check_system(AttrObject& job);
14+
void check_system(AttrObject job);
1515

1616

17-
void clear_image(AttrObject& job);
17+
void clear_image(AttrObject job);
1818

19-
void clear_group(AttrObject& job);
19+
void clear_group(AttrObject job);
2020

21-
void list_group(AttrObject& job);
21+
void list_group(AttrObject job);
2222

23-
void cloud_beat(AttrObject& job);
24-
void check_update(AttrObject& job);
25-
void dice_update(AttrObject& job);
26-
void dice_cloudblack(AttrObject& job);
23+
void cloud_beat(AttrObject job);
24+
void check_update(AttrObject job);
25+
void dice_update(AttrObject job);
26+
void dice_cloudblack(AttrObject job);
2727

28-
void log_put(AttrObject& job);
28+
void log_put(AttrObject job);
2929
void global_exit();
3030

3131
string list_deck();

Dice/DiceSchedule.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ using waited_job = pair<time_t, AttrObject>;
4141
std::priority_queue<waited_job, std::deque<waited_job>,std::greater<waited_job>> queueJobWaited;
4242
std::mutex mtJobWaited;
4343

44-
void exec(AttrObject& job) {
44+
void exec(const AttrObject& job) {
4545
if (job->has("cmd")) {
4646
if (auto it = mCommand.find(job->get_str("cmd")); it != mCommand.end()) {
4747
it->second(job);

Dice/DiceSchedule.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class DiceScheduler {
6868
};
6969
inline DiceScheduler sch;
7070

71-
typedef void (*cmd)(AttrObject&);
71+
typedef void (*cmd)(AttrObject);
7272

7373
//今日记录
7474
class DiceToday {

0 commit comments

Comments
 (0)