aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLev Sizov <levsizov2015@outlook.com>2019-09-05 17:37:19 +0200
committerLev Sizov <levsizov2015@outlook.com>2019-09-05 17:37:19 +0200
commit928f4be9531a40fcca92d9f878e08f8111254990 (patch)
tree055d74efd572142e8518cefa6b1599b4ca11dabd /src
parentRemoved unused boost/value_init header (diff)
downloadmonero-928f4be9531a40fcca92d9f878e08f8111254990.tar.xz
Make null hash constants constexpr
Simplify m_template initialization in miner
Diffstat (limited to 'src')
-rw-r--r--src/crypto/hash.h4
-rw-r--r--src/cryptonote_basic/miner.cpp2
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),