Skip to content

[pull] main from ChunelFeng:main #241

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 1 commit into from
Aug 7, 2025
Merged

[pull] main from ChunelFeng:main #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/GraphCtrl/GraphParam/GParam.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CGRAPH_NAMESPACE_BEGIN

class GParam : public GParamObject {
public:
#if __cplusplus >= 201703L
#if __cplusplus >= 201703L && _CGRAPH_GPARAM_RWLOCK_ENABLE_
std::shared_mutex _param_shared_lock_; // 用于参数互斥的锁信息
#else
std::recursive_mutex _param_shared_lock_;
Expand Down
2 changes: 1 addition & 1 deletion src/GraphCtrl/GraphPipeline/GPipeline.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ CStatus GPipeline::registerGElement(GElementPPtr elementRef,
*/
(*elementRef) = new(std::nothrow) T();
} else {
CGRAPH_RETURN_ERROR_STATUS("resister error type")
CGRAPH_RETURN_ERROR_STATUS("register error type")
}

status = innerRegister(*elementRef, depends, name, loop);
Expand Down
Loading