diff --git a/external/src/hardforks/hardforks.h b/external/src/hardforks/hardforks.h index 53f14b8..4cd6816 100644 --- a/external/src/hardforks/hardforks.h +++ b/external/src/hardforks/hardforks.h @@ -31,6 +31,11 @@ #include #include +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable: 4820) // padding warnings +#endif + struct hardfork_t { uint8_t version; @@ -40,6 +45,10 @@ struct hardfork_t hardfork_t(uint8_t version, uint64_t height, uint8_t threshold, time_t time): version(version), height(height), threshold(threshold), time(time) {} }; +#ifdef _MSC_VER +#pragma warning(pop) +#endif + extern const hardfork_t mainnet_hard_forks[]; extern const uint64_t mainnet_hard_fork_version_1_till; extern const size_t num_mainnet_hard_forks; diff --git a/src/pool_block.cpp b/src/pool_block.cpp index b6e8df7..c3c08ac 100644 --- a/src/pool_block.cpp +++ b/src/pool_block.cpp @@ -187,7 +187,7 @@ std::vector PoolBlock::serialize_mainchain_data(size_t* header_size, si if (!m_viewTags.empty() && m_viewTags[0].size() >= 3) { char buf[16]; snprintf(buf, sizeof(buf), "%02x%02x%02x", m_viewTags[0][0], m_viewTags[0][1], m_viewTags[0][2]); - LOGINFO(6, "DEBUG serialize viewTag[0]=" << (const char*)buf); + LOGINFO(6, "DEBUG serialize viewTag[0]=" << buf); } if (!m_encryptedAnchors.empty() && m_encryptedAnchors[0].size() >= 16) { std::string hex;