Merge pull request #889 from jagerman/xenial-test-suite-fixes

Fixes xenial/gcc5 test suite build
oxen-io · Oct 10, 2019 · c283136 · c283136
2 parents 0f50dbb + a7b6ab4
commit c283136
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/tests/core_tests/chaingen.h b/tests/core_tests/chaingen.h
@@ -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;

diff --git a/tests/core_tests/ring_signature_1.cpp b/tests/core_tests/ring_signature_1.cpp
@@ -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();