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

Clean up includes from miner.cpp/wallet.cpp #18

Merged
merged 2 commits into from
Nov 3, 2018
Merged

Conversation

fafrd
Copy link
Contributor

@fafrd fafrd commented Nov 3, 2018

I found that I broke the build on ubuntu with my last commit. I changed nHashesPerSec to be declared extern in miner.h to fix this.

I also removed the #include <wallet/wallet.cpp> from miner.cpp, and moved a couple declarations into wallet.h, this fixes the #11 where tests weren't building.

@fafrd fafrd mentioned this pull request Nov 3, 2018
@ch4ot1c
Copy link
Collaborator

ch4ot1c commented Nov 3, 2018

Merging - building without --disable-bench still breaks on (at least one) MacOS. Partially resolves #11.

@ch4ot1c ch4ot1c merged commit 354a888 into BSHA3:master Nov 3, 2018
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.

2 participants