-
-
Notifications
You must be signed in to change notification settings - Fork 3.1k
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
Fix boost <1.60 compilation and fix boost 1.73+ warnings #6612
Conversation
There was a problem hiding this 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> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
boost bind still ?
There was a problem hiding this comment.
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
.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same ?
missed some spots
followed commit monero-project#6612 on xmr
This fixes the build with Boost 1.58 and fixes all warnings with Boost 1.73+ (by including
boost/bind/bind.hpp
). Onlysrc/simple/simplewallet.cpp
still uses the global_1
variables.The differences between
std::bind
andboost::bind
.