josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Dependencies: Update ACE to v6.1.4 (Windows only)

Browse Source 
Tested in multiple configurations
.diff with TC changes added
This commit is contained in:
Nay
2012-09-17 23:21:01 +01:00
parent 6ebc6b9a76
commit 2e21fa6b92
549 changed files with 28949 additions and 14408 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dep/acelite/ace/Time_Value.inl
+6 -26
View File
@@ -1,6 +1,6 @@
// -*- C++ -*-
//
// $Id: Time_Value.inl 90689 2010-06-18 11:14:47Z shuston $
// $Id: Time_Value.inl 95761 2012-05-15 18:23:04Z johnnyw $
#include "ace/Truncate.h"
@@ -58,23 +58,11 @@ ACE_INLINE void
ACE_Time_Value::set (time_t sec, suseconds_t usec)
{
// ACE_OS_TRACE ("ACE_Time_Value::set");
# if defined (_WIN32_WCE) && (_WIN32_WCE == 0x600) && !defined (_USE_32BIT_TIME_T) && defined (_MSC_VER)
// The WinCE 6.0 SDK ships with a timeval tv_sec member that uses long as type
// not time_t. This resolves in compilation warnings because time_t
// can be 64bit. Disable at this momemt the warning for just this method
// else we get a compile warnings each time this inline file is included
// this file.
# pragma warning (push)
# pragma warning (disable: 4244)
# endif
this->tv_.tv_sec = sec;
# if defined (_WIN32_WCE) && (_WIN32_WCE == 0x600) && !defined (_USE_32BIT_TIME_T) && defined (_MSC_VER)
# pragma warning (pop)
# endif
this->tv_.tv_usec = usec;
#if __GNUC__
if (__builtin_constant_p(sec) &&
__builtin_constant_p(usec) &&
#if __GNUC__ && !(__GNUC__ == 3 && __GNUC_MINOR__ == 4)
if ((__builtin_constant_p(sec) &
__builtin_constant_p(usec)) &&
(sec >= 0 && usec >= 0 && usec < ACE_ONE_SECOND_IN_USECS))
return;
#endif
@@ -85,7 +73,7 @@ ACE_INLINE void
ACE_Time_Value::set (double d)
{
// ACE_OS_TRACE ("ACE_Time_Value::set");
long l = (long) d;
time_t l = (time_t) d;
this->tv_.tv_sec = l;
this->tv_.tv_usec = (suseconds_t) ((d - (double) l) * ACE_ONE_SECOND_IN_USECS + .5);
this->normalize ();
@@ -131,7 +119,7 @@ ACE_INLINE void
ACE_Time_Value::sec (time_t sec)
{
// ACE_OS_TRACE ("ACE_Time_Value::sec");
this->tv_.tv_sec = ACE_Utils::truncate_cast<long> (sec);
this->tv_.tv_sec = sec;
}
/// Converts from Time_Value format into milli-seconds format.
@@ -222,15 +210,7 @@ ACE_INLINE void
ACE_Time_Value::to_usec (ACE_UINT64 & usec) const
{
// ACE_OS_TRACE ("ACE_Time_Value::to_usec");
#if defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
usec = ACE_U_LongLong (static_cast<long long> (this->tv_.tv_sec));
#elif defined (ACE_LACKS_LONGLONG_T)
// No native 64-bit type, meaning time_t is most likely 32 bits.
usec = ACE_U_LongLong (this->tv_.tv_sec);
#else
usec = static_cast<ACE_UINT64> (this->tv_.tv_sec);
#endif /* ACE_LACKS_LONGLONG_T */
usec *= 1000000;
usec += this->tv_.tv_usec;
}