@@ -1013,24 +1013,15 @@ PUSH_WARNING(DISABLE_WARNING_DEPRECATED_USE)
10131013 Time::Time (const microsecondsfromepoch time)
10141014 : _time()
10151015 {
1016- using common_t = std::common_type<microsecondsfromepoch, std::time_t , uint32_t /* static constexpr types in Time.h */ , long >::type;
1017-
1018- ASSERT (static_cast <common_t >(time) >= static_cast <common_t >(OffsetTicksForEpoch));
1019-
10201016 // This is the seconds since 1970...
1021- const common_t epochTimestamp = (static_cast <common_t >(time) - static_cast <common_t >(OffsetTicksForEpoch)) / static_cast <common_t >(MicroSecondsPerSecond);
1022-
1023- ASSERT (epochTimestamp <= static_cast <common_t >(std::numeric_limits<std::time_t >::max ()));
1017+ const microsecondsfromepoch epochTimestamp = (time - static_cast <microsecondsfromepoch>(OffsetTicksForEpoch)) / static_cast <microsecondsfromepoch>(MicroSecondsPerSecond);
10241018
10251019 _time.tv_sec = static_cast <std::time_t >(epochTimestamp);
10261020
1027- common_t remainderMicroseconds = (static_cast <common_t >(time) - static_cast <common_t >(OffsetTicksForEpoch)) % static_cast <common_t >(MicroSecondsPerSecond);
1028- ASSERT ( remainderMicroseconds <= 999999 // Defined by the standard
1029- && NanoSecondsPerMicroSecond == 1000
1030- && 999999000 <=std::numeric_limits<long >::max ()
1031- );
1021+ const microsecondsfromepoch remainderMicroseconds = (time - static_cast <microsecondsfromepoch>(OffsetTicksForEpoch)) % static_cast <microsecondsfromepoch>(MicroSecondsPerSecond);
1022+ ASSERT (remainderMicroseconds <= 999999 /* Defined by the standard */ );
10321023
1033- _time.tv_nsec = static_cast <long >(static_cast < common_t >( remainderMicroseconds) * static_cast <common_t >(NanoSecondsPerMicroSecond));
1024+ _time.tv_nsec = ( static_cast <long >(remainderMicroseconds) * static_cast <long >(NanoSecondsPerMicroSecond));
10341025 }
10351026
10361027 Time::microsecondsfromepoch Time::Ticks () const
@@ -1160,22 +1151,13 @@ PUSH_WARNING(DISABLE_WARNING_DEPRECATED_USE)
11601151
11611152 Time& Time::Add (const uint32_t timeInMilliseconds)
11621153 {
1163- static_assert ( MicroSecondsPerMilliSecond == 1000
1164- && std::is_same<uint64_t , microsecondsfromepoch>::value, " "
1165- );
1166-
1167- ASSERT ((std::numeric_limits<uint64_t >::max () - Ticks ()) >= (static_cast <uint64_t >(timeInMilliseconds) * static_cast <uint64_t >(MicroSecondsPerMilliSecond)));
1168-
11691154 // Calculate the new time !!
11701155 const uint64_t newTime = Ticks () + (static_cast <uint64_t >(timeInMilliseconds) * static_cast <uint64_t >(MicroSecondsPerMilliSecond));
1171-
11721156 return (operator =(Time (newTime)));
11731157 }
11741158
11751159 Time& Time::Sub (const uint32_t timeInMilliseconds)
11761160 {
1177- ASSERT (Ticks () >= (static_cast <uint64_t >(timeInMilliseconds) * static_cast <uint64_t >(MicroSecondsPerMilliSecond)));
1178-
11791161 // Calculate the new time !!
11801162 const uint64_t newTime = Ticks () - (static_cast <uint64_t >(timeInMilliseconds) * static_cast <uint64_t >(MicroSecondsPerMilliSecond));
11811163 return (operator =(Time (newTime)));
0 commit comments