diff options
author | Riccardo Spagni <ric@spagni.net> | 2016-04-14 16:19:14 +0900 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2016-04-14 16:19:14 +0900 |
commit | 977ec85c5de53ac5ff59afc2bb94172318d47790 (patch) | |
tree | dc8664410785f25b2e14408186e23b9bf7c80b13 | |
parent | Merge pull request #799 (diff) | |
parent | tests: fix build with older GCC (diff) | |
download | monero-977ec85c5de53ac5ff59afc2bb94172318d47790.tar.xz |
Merge pull request #789
17cac41 tests: fix build with older GCC (Javier Smooth)
-rw-r--r-- | tests/core_tests/chaingen.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/core_tests/chaingen.h b/tests/core_tests/chaingen.h index 44170d116..652413b8a 100644 --- a/tests/core_tests/chaingen.h +++ b/tests/core_tests/chaingen.h @@ -470,13 +470,15 @@ inline bool replay_events_through_core(cryptonote::core& cr, const std::vector<t CATCH_ENTRY_L0("replay_events_through_core", false); } //-------------------------------------------------------------------------- -template<class t_test_class> +template<typename t_test_class> struct get_test_options { - const std::pair<uint8_t, uint64_t> hard_forks[1] = {std::make_pair((uint8_t)1, (uint64_t)0)}; + const std::pair<uint8_t, uint64_t> hard_forks[1]; const cryptonote::test_options test_options = { hard_forks }; + get_test_options():hard_forks{std::make_pair((uint8_t)1, (uint64_t)0)}{} }; + //-------------------------------------------------------------------------- template<class t_test_class> inline bool do_replay_events(std::vector<test_event_entry>& events) |