refactor: modernize mutex locking from C++11 to C++17 (std::scoped_lock)#4
Merged
jsulmont merged 2 commits intojsulmont:mainfrom Dec 7, 2025
Merged
refactor: modernize mutex locking from C++11 to C++17 (std::scoped_lock)#4jsulmont merged 2 commits intojsulmont:mainfrom
jsulmont merged 2 commits intojsulmont:mainfrom
Conversation
jsulmont
approved these changes
Dec 7, 2025
Owner
jsulmont
left a comment
There was a problem hiding this comment.
Hey! Thanks for the contribution — the scoped_lock modernization looks good and I'll merge it.
Quick note for future contributions: the standard OSS workflow is:
- Fork the repo
- Create a feature branch on your fork (e.g., feature/scoped-lock)
- Open a PR from your-fork/feature-branch → upstream/main
- After merge, sync your fork's main with upstream
Committing directly to your fork's main makes it harder to keep your fork in sync and creates merge noise. Feature branches keep things clean.
No big deal this time — just something to keep in mind!
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Modernize all mutex locking from C++11's
std::lock_guardto C++17'sstd::scoped_lock.Changes
Commit 1: Dual-mutex scenarios
Before (C++11 - manual deadlock avoidance):
After (C++17 - automatic deadlock avoidance):
std::scoped_lock lock(mutex_, other.mutex_);Commit 2: Single-mutex scenarios + headers + examples
Before (C++11):
std::lock_guard<std::mutex> lock(mutex_);After (C++17):
std::scoped_lock lock(mutex_);references
cppreference: std::scoped_lock
Stack Overflow: std::lock_guard or std::scoped_lock?
SonarSource RSPEC-5997