[FEAT MERGE]vos merge into master

Co-authored-by: ZenoWang <wzybuaasoft@163.com>
Co-authored-by: zhjc1124 <zhjc1124@gmail.com>
Co-authored-by: JiahuaChen <garfieldjia@qq.com>
This commit is contained in:
nroskill
2023-02-24 14:26:20 +00:00
committed by ob-robot
parent 11dc664903
commit a4c97d03f7
284 changed files with 9655 additions and 4755 deletions

View File

@ -72,7 +72,7 @@ public:
int err;
QData* data = NULL;
if (idx == 0) {
err = queue_.pop_high_high((ObLink*&)data, 10000);
err = queue_.pop_high((ObLink*&)data, 10000);
} else {
err = queue_.pop((ObLink*&)data, 10000);
}