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

[fixup] isForkEnabled #53

Merged
merged 1 commit into from
Aug 1, 2018
Merged

Conversation

ch4ot1c
Copy link
Contributor

@ch4ot1c ch4ot1c commented Aug 1, 2018

dsktp@dsktp-VirtualBox:~/BTCP-Rebase$ make
Making all in src
make[1]: Entering directory '/home/dsktp/BTCP-Rebase/src'
make[2]: Entering directory '/home/dsktp/BTCP-Rebase/src'
make[3]: Entering directory '/home/dsktp/BTCP-Rebase'
make[3]: Leaving directory '/home/dsktp/BTCP-Rebase'
make[3]: Entering directory '/home/dsktp/BTCP-Rebase/src/secp256k1'
make[3]: Leaving directory '/home/dsktp/BTCP-Rebase/src/secp256k1'
  CXX      libbitcoin_server_a-validation.o
validation.cpp: In function ‘CAmount GetBlockSubsidy(int, const Consensus::Params&)’:
validation.cpp:1193:29: error: too few arguments to function ‘bool isForkEnabled(int, int)’
     if(isForkEnabled(nHeight)) {
                             ^
In file included from validation.cpp:18:0:
./fork.h:24:13: note: declared here
 inline bool isForkEnabled(int nHeight, int forkStartHeight)
             ^~~~~~~~~~~~~
validation.cpp:1198:29: error: too few arguments to function ‘bool isForkEnabled(int, int)’
     if(isForkEnabled(nHeight))
                             ^
In file included from validation.cpp:18:0:
./fork.h:24:13: note: declared here
 inline bool isForkEnabled(int nHeight, int forkStartHeight)
             ^~~~~~~~~~~~~
Makefile:6492: recipe for target 'libbitcoin_server_a-validation.o' failed

Please test + be cautious when merging pull requests:

The Linux build needs to never break, enforced by GH / Travis CI (Shoutout #19)

@ch4ot1c ch4ot1c merged commit 983f4ec into BTCPrivate:master Aug 1, 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.

1 participant