diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-07-15 12:59:58 +0100 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-07-15 19:09:36 +0100 |
| commit | 63e342be8452510abb67bfe24df90a0972a4edfd (patch) | |
| tree | 68f3c93f8bd6ee3ceb93a86dc65cdd1f25b01bc1 | |
| parent | Merge pull request #4094 (diff) | |
| download | monero-63e342be8452510abb67bfe24df90a0972a4edfd.tar.xz | |
crypto: move null_pkey/null_skey to the cpp file
| -rw-r--r-- | src/crypto/crypto.cpp | 3 | ||||
| -rw-r--r-- | src/crypto/crypto.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/crypto/crypto.cpp b/src/crypto/crypto.cpp index f4ef751d3..36b510a5b 100644 --- a/src/crypto/crypto.cpp +++ b/src/crypto/crypto.cpp @@ -70,6 +70,9 @@ namespace crypto { #include "random.h" } + const crypto::public_key null_pkey = boost::value_initialized<crypto::public_key>(); + const crypto::secret_key null_skey = boost::value_initialized<crypto::secret_key>(); + static inline unsigned char *operator &(ec_point &point) { return &reinterpret_cast<unsigned char &>(point); } diff --git a/src/crypto/crypto.h b/src/crypto/crypto.h index 9ea0f2ec0..492bf966e 100644 --- a/src/crypto/crypto.h +++ b/src/crypto/crypto.h @@ -277,8 +277,8 @@ namespace crypto { epee::to_hex::formatted(o, epee::as_byte_span(v)); return o; } - const static crypto::public_key null_pkey = boost::value_initialized<crypto::public_key>(); - const static crypto::secret_key null_skey = boost::value_initialized<crypto::secret_key>(); + const extern crypto::public_key null_pkey; + const extern crypto::secret_key null_skey; } CRYPTO_MAKE_HASHABLE(public_key) |