Skip to content
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.

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

refactor: remove straggling boost::mutex usage #21010

Merged
merged 1 commit into from
Jan 26, 2021

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Jan 26, 2021

After the merge of #18710, the linter is warning:

A new Boost dependency in the form of "boost/thread/mutex.hpp" appears to have been introduced:
src/sync.cpp:#include <boost/thread/mutex.hpp>
src/test/sync_tests.cpp:#include <boost/thread/mutex.hpp>

^---- failure generated from test/lint/lint-includes.sh

#18710 removed boost/thread/mutex.hpp from lint-includes, however in the interim #19337 was merged, which introduced more boost::mutex usage.

Given we no longer use boost::mutex, just remove the double lock test and remaining includes.

After the merge of bitcoin#18710, the linter is warning:
```bash
A new Boost dependency in the form of "boost/thread/mutex.hpp" appears to have been introduced:
src/sync.cpp:#include <boost/thread/mutex.hpp>
src/test/sync_tests.cpp:#include <boost/thread/mutex.hpp>

^---- failure generated from test/lint/lint-includes.sh
```

the interim bitcoin#19337 was merged, which introduced more `boost::mutex` usage.

Given we no longer use `boost::mutex`, just remove the double lock test
and remaining includes.
@laanwj
Copy link
Member

laanwj commented Jan 26, 2021

Code review ACK f827e15
(let's merge this once CI passes to fix CI)

Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK f827e15

Also see #19337 (comment)

@maflcko maflcko merged commit 280d0bd into bitcoin:master Jan 26, 2021
@fanquake fanquake deleted the why_new_boost_depend branch January 27, 2021 03:53
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Aug 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants