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

Remove 33 unused Boost includes #10546

Merged
merged 1 commit into from Jun 11, 2017

Conversation

Projects
None yet
7 participants
@practicalswift
Copy link
Member

practicalswift commented Jun 7, 2017

Remove 33 unused Boost includes.

@practicalswift practicalswift changed the title Remove unused Boost includes Remove 38 unused Boost includes Jun 7, 2017

@fanquake fanquake added the Refactoring label Jun 7, 2017

src/util.cpp Outdated
@@ -77,11 +77,7 @@
#endif

#include <boost/algorithm/string/case_conv.hpp> // for to_lower()
#include <boost/algorithm/string/join.hpp>
#include <boost/algorithm/string/predicate.hpp> // for startswith() and endswith()

This comment has been minimized.

@fanquake

fanquake Jun 7, 2017

Member

starts_with() is still used.

This comment has been minimized.

@practicalswift

practicalswift Jun 7, 2017

Author Member

Good catch! Fixed!

@practicalswift practicalswift force-pushed the practicalswift:remove-unused-boost-includes branch Jun 7, 2017

@practicalswift practicalswift changed the title Remove 38 unused Boost includes Remove 37 unused Boost includes Jun 7, 2017

@paveljanik

This comment has been minimized.

Copy link
Contributor

paveljanik commented Jun 7, 2017

compiles ACK d652c75

195 more #include <boost/.*> to go!

@jonasschnelli

This comment has been minimized.

Copy link
Member

jonasschnelli commented Jun 8, 2017

Gitian builds this fine: https://bitcoin.jonasschnelli.ch/build/166
ACK d652c7515bbae6d51470cf5ee538b0d5cad9547f

@practicalswift practicalswift force-pushed the practicalswift:remove-unused-boost-includes branch Jun 8, 2017

@practicalswift

This comment has been minimized.

Copy link
Member Author

practicalswift commented Jun 8, 2017

Merge conflicts resolved!

@practicalswift practicalswift force-pushed the practicalswift:remove-unused-boost-includes branch 4 times, most recently Jun 8, 2017

@practicalswift practicalswift changed the title Remove 37 unused Boost includes Remove 36 unused Boost includes Jun 8, 2017

@fanquake

This comment has been minimized.

Copy link
Member

fanquake commented Jun 9, 2017

Builds are failing with

  CXX      wallet/libbitcoin_wallet_a-feebumper.o
In file included from wallet/crypter.cpp:5:0:
wallet/crypter.h:195:5: error: ‘signals2’ in namespace ‘boost’ does not name a type
     boost::signals2::signal<void (CCryptoKeyStore* wallet)> NotifyStatusChanged;
     ^
wallet/crypter.cpp: In member function ‘bool CCryptoKeyStore::Lock()’:
wallet/crypter.cpp:167:29: error: ‘NotifyStatusChanged’ was not declared in this scope
     NotifyStatusChanged(this);
                             ^
wallet/crypter.cpp: In member function ‘bool CCryptoKeyStore::Unlock(const CKeyingMaterial&)’:
wallet/crypter.cpp:205:29: error: ‘NotifyStatusChanged’ was not declared in this scope
     NotifyStatusChanged(this);

@practicalswift practicalswift force-pushed the practicalswift:remove-unused-boost-includes branch 2 times, most recently Jun 9, 2017

@practicalswift practicalswift force-pushed the practicalswift:remove-unused-boost-includes branch to 49de096 Jun 9, 2017

@practicalswift practicalswift changed the title Remove 36 unused Boost includes Remove 33 unused Boost includes Jun 9, 2017

@practicalswift

This comment has been minimized.

Copy link
Member Author

practicalswift commented Jun 9, 2017

@fanquake Thanks for the notification. Builds now passing!

@fanquake

This comment has been minimized.

Copy link
Member

fanquake commented Jun 9, 2017

utACK 49de096

@sipa

This comment has been minimized.

Copy link
Member

sipa commented Jun 9, 2017

utACK 49de096

@laanwj laanwj merged commit 49de096 into bitcoin:master Jun 11, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Jun 11, 2017

Merge #10546: Remove 33 unused Boost includes
49de096 Remove unused Boost includes (practicalswift)

Tree-SHA512: ff2dad94f9eeb1dc50fcffd0e94e1686be04e4e5bc45f58ae955d630c15cd25bb8f5583d0aa1f2f263b5a723be79747ef3c6e6b417c7be7787c0abc8d1874019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.