diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/Cryptography/CryptoHash.h | 1 | ||||
| -rw-r--r-- | src/common/DataStores/DB2FileLoader.cpp | 3 | ||||
| -rw-r--r-- | src/common/Threading/MPSCQueue.h | 2 | ||||
| -rw-r--r-- | src/common/Utilities/Util.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/common/Cryptography/CryptoHash.h b/src/common/Cryptography/CryptoHash.h index e31578a8f46..cb7e5716e66 100644 --- a/src/common/Cryptography/CryptoHash.h +++ b/src/common/Cryptography/CryptoHash.h @@ -24,6 +24,7 @@ #include <array> #include <string> #include <string_view> +#include <utility> #include <openssl/evp.h> class BigNumber; diff --git a/src/common/DataStores/DB2FileLoader.cpp b/src/common/DataStores/DB2FileLoader.cpp index f9bf392bdfd..f15864e4c7b 100644 --- a/src/common/DataStores/DB2FileLoader.cpp +++ b/src/common/DataStores/DB2FileLoader.cpp @@ -1075,7 +1075,6 @@ char* DB2FileLoaderSparseImpl::AutoProduceData(uint32& indexTableSize, char**& i memset(dataTable, 0, (records + _copyTable.size()) * recordsize); uint32 offset = 0; - uint32 recordNum = 0; uint32 y = 0; for (uint32 section = 0; section < _header->SectionCount; ++section) @@ -1176,8 +1175,6 @@ char* DB2FileLoaderSparseImpl::AutoProduceData(uint32& indexTableSize, char**& i ++fieldIndex; } } - - ++recordNum; } } diff --git a/src/common/Threading/MPSCQueue.h b/src/common/Threading/MPSCQueue.h index ee58eb96b29..c4f95b80c5c 100644 --- a/src/common/Threading/MPSCQueue.h +++ b/src/common/Threading/MPSCQueue.h @@ -96,7 +96,7 @@ class MPSCQueueIntrusive using Atomic = std::atomic<T*>; public: - MPSCQueueIntrusive() : _dummyPtr(reinterpret_cast<T*>(_dummy.data())), _head(_dummyPtr), _tail(_dummyPtr) + MPSCQueueIntrusive() : _dummy(), _dummyPtr(reinterpret_cast<T*>(_dummy.data())), _head(_dummyPtr), _tail(_dummyPtr) { // _dummy is constructed from raw byte array and is intentionally left uninitialized (it might not be default constructible) // so we init only its IntrusiveLink here diff --git a/src/common/Utilities/Util.h b/src/common/Utilities/Util.h index 57523ca558f..3fc09f65792 100644 --- a/src/common/Utilities/Util.h +++ b/src/common/Utilities/Util.h @@ -52,7 +52,9 @@ namespace Trinity TC_COMMON_API Optional<int64> MoneyStringToMoney(std::string const& moneyString); +#if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__)) TC_COMMON_API struct tm* localtime_r(time_t const* time, struct tm *result); +#endif TC_COMMON_API time_t LocalTimeToUTCTime(time_t time); TC_COMMON_API time_t GetLocalHourTimestamp(time_t time, uint8 hour, bool onlyAfterTime = true); TC_COMMON_API tm TimeBreakdown(time_t t); |
