void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 12:33:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'edge' of http://git.int.zerotier.com/zerotier/ZeroTierOne into edge

Browse source
This commit is contained in:
Adam Ierymenko 2020-07-02 13:57:32 -07:00
commit befc50ac3a
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/Utils.hpp
View file

@ -103,7 +103,7 @@ extern const uint64_t s_mapNonce;
static ZT_INLINE void memoryLock(const void *const p, const unsigned int l) noexcept static ZT_INLINE void memoryLock(const void *const p, const unsigned int l) noexcept
{ {
#ifdef __WINDOWS__ #ifdef __WINDOWS__
VirtualLock(const_cast<LPVOID>(reinterpret_cast<LPVOID>(p)), l); VirtualLock(reinterpret_cast<LPVOID>(const_cast<void*>(p)), l);
#else #else
mlock(p, l); mlock(p, l);
#endif #endif
@ -118,7 +118,7 @@ static ZT_INLINE void memoryLock(const void *const p, const unsigned int l) noex
static ZT_INLINE void memoryUnlock(const void *const p, const unsigned int l) noexcept static ZT_INLINE void memoryUnlock(const void *const p, const unsigned int l) noexcept
{ {
#ifdef __WINDOWS__ #ifdef __WINDOWS__
VirtualUnlock(const_cast<LPVOID>(reinterpret_cast<LPVOID>(p)), l); VirtualUnlock(reinterpret_cast<LPVOID>(const_cast<void*>(p)), l);
#else #else
munlock(p, l); munlock(p, l);
#endif #endif