aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-03-21 23:09:34 +0200
committerRiccardo Spagni <ric@spagni.net>2016-03-21 23:09:35 +0200
commit5f945269684ee4d77b18b0d6bc5d2b982dda1862 (patch)
tree32887968e62b4a0670af4b49d474fbd79a60ae27
parent8146497f4c0689712f2de1d49c45afea528ef735 (diff)
parent4b425a397c63d6585504fd1b95907011386d16d6 (diff)
downloadmonzero-core-5f945269684ee4d77b18b0d6bc5d2b982dda1862.tar.gz
monzero-core-5f945269684ee4d77b18b0d6bc5d2b982dda1862.tar.xz
monzero-core-5f945269684ee4d77b18b0d6bc5d2b982dda1862.zip
Merge pull request #745
4b425a3 core_tests: fix compile failure with GCC 4.8.4 (moneromooo-monero)
-rw-r--r--tests/core_tests/chaingen.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/core_tests/chaingen.h b/tests/core_tests/chaingen.h
index d0d912cbb..44170d116 100644
--- a/tests/core_tests/chaingen.h
+++ b/tests/core_tests/chaingen.h
@@ -472,7 +472,7 @@ inline bool replay_events_through_core(cryptonote::core& cr, const std::vector<t
//--------------------------------------------------------------------------
template<class t_test_class>
struct get_test_options {
- const std::pair<uint8_t, uint64_t> hard_forks[1] = {std::make_pair(1, 0)};
+ const std::pair<uint8_t, uint64_t> hard_forks[1] = {std::make_pair((uint8_t)1, (uint64_t)0)};
const cryptonote::test_options test_options = {
hard_forks
};