Core: Fix build for msvc14
This commit is contained in:
1 parent
4e951f9d9b
commit
bd522a3853
2 files changed
+7
No files matched your search
@@ -349,6 +349,8 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret)
|
|||||||
else()
|
else()
|
||||||
set (_boost_COMPILER "-il")
|
set (_boost_COMPILER "-il")
|
||||||
endif()
|
endif()
|
||||||
|
elseif (MSVC14)
|
||||||
|
set(_boost_COMPILER "-vc140")
|
||||||
elseif (MSVC12)
|
elseif (MSVC12)
|
||||||
set(_boost_COMPILER "-vc120")
|
set(_boost_COMPILER "-vc120")
|
||||||
elseif (MSVC11)
|
elseif (MSVC11)
|
||||||
|
|||||||
@@ -393,7 +393,12 @@ class ByteBuffer
|
|||||||
lt.tm_mon = (packedDate >> 20) & 0xF;
|
lt.tm_mon = (packedDate >> 20) & 0xF;
|
||||||
lt.tm_year = ((packedDate >> 24) & 0x1F) + 100;
|
lt.tm_year = ((packedDate >> 24) & 0x1F) + 100;
|
||||||
|
|
||||||
|
// To-Do: find a better way here
|
||||||
|
#if !defined(timezone)
|
||||||
|
return uint32(mktime(<) + _timezone);
|
||||||
|
#else
|
||||||
return uint32(mktime(<) + timezone);
|
return uint32(mktime(<) + timezone);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
ByteBuffer& ReadPackedTime(uint32& time)
|
ByteBuffer& ReadPackedTime(uint32& time)
|
||||||
|
|||||||
Reference in new issue
Block a user