diff options
author | Ilya Kitaev <mbg033@gmail.com> | 2016-03-31 12:01:19 +0300 |
---|---|---|
committer | Ilya Kitaev <mbg033@gmail.com> | 2016-03-31 12:01:19 +0300 |
commit | df6026182ab1df95a07d01ad54481e7ebf2c69e7 (patch) | |
tree | 5b9813551c37b8ad30687e5c2aaae238d2119d5e /tests/core_tests | |
parent | - testnet option added to api; (diff) | |
parent | Merge pull request #770 (diff) | |
download | monero-df6026182ab1df95a07d01ad54481e7ebf2c69e7.tar.xz |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tests/core_tests')
-rw-r--r-- | tests/core_tests/chaingen.h | 2 |
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 }; |