Replace IceUtil::Mutex with std::mutex #1755
Merged
Conversation
This file contains 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
bernardnormier
approved these changes
Feb 5, 2024
| #include <Ice/UserExceptionFactory.h> | ||
| #include <Ice/ValueFactory.h> | ||
|
|
||
| #include <mutex> |
There was a problem hiding this comment.
We should have blank line between include and namespace.
externl
approved these changes
Feb 5, 2024
cpp/src/Ice/ConnectionI.cpp
Outdated
| { | ||
| wait(); | ||
| } | ||
| _conditionVariable.wait(lock, [this]{ return _state >= StateNotValidated; }); |
There was a problem hiding this comment.
Is the equality check correct?
Suggested change
| _conditionVariable.wait(lock, [this]{ return _state >= StateNotValidated; }); | |
| _conditionVariable.wait(lock, [this]{ return _state > StateNotValidated; }); |
cpp/src/IceBT/Engine.cpp
Outdated
| @@ -1256,7 +1256,7 @@ class BluetoothService : public DBus::Filter, public std::enable_shared_from_thi | |||
| ConnectCallbackPtr _cb; | |||
| }; | |||
|
|
|||
| IceUtil::Monitor<IceUtil::Mutex> _lock; | |||
| std::mutex _lock; | |||
There was a problem hiding this comment.
Can we rename this to _mutex?
Actually staring at the code, you're locking _mutex which used to be _lock. A bug? Am I missing something?
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.
This is a first pass on replacing IceUtil::Mutex by std::mutex