From 928f4be9531a40fcca92d9f878e08f8111254990 Mon Sep 17 00:00:00 2001 From: Lev Sizov Date: Thu, 5 Sep 2019 17:37:19 +0200 Subject: [PATCH] Make null hash constants constexpr Simplify m_template initialization in miner --- src/crypto/hash.h | 4 ++-- src/cryptonote_basic/miner.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/crypto/hash.h b/src/crypto/hash.h index e012d1bd3..27184fa53 100644 --- a/src/crypto/hash.h +++ b/src/crypto/hash.h @@ -89,8 +89,8 @@ namespace crypto { epee::to_hex::formatted(o, epee::as_byte_span(v)); return o; } - const static crypto::hash null_hash = {}; - const static crypto::hash8 null_hash8 = {}; + constexpr static crypto::hash null_hash = {}; + constexpr static crypto::hash8 null_hash8 = {}; } CRYPTO_MAKE_HASHABLE(hash) diff --git a/src/cryptonote_basic/miner.cpp b/src/cryptonote_basic/miner.cpp index 602ced787..856cccdeb 100644 --- a/src/cryptonote_basic/miner.cpp +++ b/src/cryptonote_basic/miner.cpp @@ -99,7 +99,7 @@ namespace cryptonote miner::miner(i_miner_handler* phandler):m_stop(1), - m_template(block{}), + m_template{}, m_template_no(0), m_diffic(0), m_thread_index(0),