Skip to content

[pull] main from ChunelFeng:main #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
May 25, 2025
Merged

[pull] main from ChunelFeng:main #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4c1d4e
[bugfix] win10 msvc142 vs2019 std::min error with windows.h (#519)
guanquanchen May 25, 2025
171b6ca
[doc] add guanquanchen to contributors.md
ChunelFeng May 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@ Contributors:
- [0x007004](https://github.com/0x007004)
- [AsunaU2](https://github.com/AsunaU2)
- [SolerHo](https://github.com/SolerHo)
- [guanquanchen](https://github.com/guanquanchen)

感谢以上朋友，为CGraph项目做出的贡献，排名以贡献时间前后为顺序。
2 changes: 1 addition & 1 deletion src/UtilsCtrl/ThreadPool/UThreadPoolConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ struct UThreadPoolConfig : public CStruct {
* @return
*/
int calcStealRange() const {
int range = std::min(this->max_task_steal_range_, this->default_thread_size_ - 1);
int range = (std::min)(this->max_task_steal_range_, this->default_thread_size_ - 1);
return range;
}

Expand Down
Loading