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

Fixes xenial/gcc5 test suite build #889

Merged
merged 1 commit into from
Oct 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions tests/core_tests/chaingen.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@

#define DIFFICULTY_BLOCKS_ESTIMATE_TIMESPAN DIFFICULTY_TARGET_V2

#if defined(__GNUG__) && !defined(__clang__) && __GNUC__ < 6
namespace service_nodes {
const std::vector<payout_entry> dummy; // help GCC 5 realize it needs to generate a default constructor
}
#endif

struct loki_block_with_checkpoint
{
cryptonote::block block;
Expand Down
2 changes: 1 addition & 1 deletion tests/core_tests/ring_signature_1.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ namespace

bool gen_ring_signature_1::generate(std::vector<test_event_entry>& events) const
{
const get_test_options<gen_ring_signature_1> test_options = {};
const get_test_options<gen_ring_signature_1> test_options;
loki_chain_generator gen(events, test_options.hard_forks);

const auto miner = gen.first_miner();
Expand Down