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

Fix boost <1.60 compilation and fix boost 1.73+ warnings #6612

Merged
merged 1 commit into from
Jun 1, 2020

Conversation

vtnerd
Copy link
Contributor

@vtnerd vtnerd commented Jun 1, 2020

This fixes the build with Boost 1.58 and fixes all warnings with Boost 1.73+ (by including boost/bind/bind.hpp). Only src/simple/simplewallet.cpp still uses the global _1 variables.

The differences between std::bind and boost::bind.

Copy link
Collaborator

@moneromooo-monero moneromooo-monero left a comment

Choose a reason for hiding this comment

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

Some places are still using boost bind ?

@@ -31,7 +31,7 @@


#include <boost/thread.hpp>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
Copy link
Collaborator

Choose a reason for hiding this comment

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

boost bind still ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There are 88 occurrences of boost::bind, outside of the usage in src/simplewallet/simplewallet.cpp. There are 120 occurrences in just that file. I decided to only update the places that used _1, etc, to keep this smaller and readable. Updating the remaining seemed like it could be done in a subsequent patch, but I can do a sed call right now and re-test the compilations ... ? With or without updating simplewallet.cpp.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Update - only 39 of 88 are from in src/ but outside of src/simplewallet/simplewallet.cpp. Meaning, some of the stuff in contrib is dead unused/code I think, so I may not need to update all 88 occurrences. Its difficult to know how many without trial and error though.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Makes sense. I'm in favour of leaving it as is if it doesn't need fixing :)

@@ -31,7 +31,7 @@
// IP blocking adapted from Boolberry

#include <algorithm>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
Copy link
Collaborator

Choose a reason for hiding this comment

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

same ?

@luigi1111 luigi1111 merged commit 992b7ce into monero-project:master Jun 1, 2020
420coupe added a commit to 420coupe/aeon that referenced this pull request Jun 2, 2020
aeonix added a commit to aeonix/aeon that referenced this pull request Jun 2, 2020
@vtnerd vtnerd deleted the fix/boost_1_58_compilation branch January 4, 2021 04:49
@vtnerd vtnerd restored the fix/boost_1_58_compilation branch January 6, 2021 17:11
@vtnerd vtnerd deleted the fix/boost_1_58_compilation branch January 7, 2021 21:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants