Cleaning up static initializers in TimeValue.

Code reviewed by Chandlerc

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@216703 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Bieneman 2014-08-29 01:05:12 +00:00
parent 79e9b30b11
commit 77bf4f97bf
4 changed files with 22 additions and 18 deletions

View File

@ -38,28 +38,38 @@ namespace sys {
/// value permissible by the class. MinTime is some point /// value permissible by the class. MinTime is some point
/// in the distant past, about 300 billion years BCE. /// in the distant past, about 300 billion years BCE.
/// @brief The smallest possible time value. /// @brief The smallest possible time value.
static const TimeValue MinTime; static TimeValue MinTime() {
return TimeValue ( INT64_MIN,0 );
}
/// A constant TimeValue representing the largest time /// A constant TimeValue representing the largest time
/// value permissible by the class. MaxTime is some point /// value permissible by the class. MaxTime is some point
/// in the distant future, about 300 billion years AD. /// in the distant future, about 300 billion years AD.
/// @brief The largest possible time value. /// @brief The largest possible time value.
static const TimeValue MaxTime; static TimeValue MaxTime() {
return TimeValue ( INT64_MAX,0 );
}
/// A constant TimeValue representing the base time, /// A constant TimeValue representing the base time,
/// or zero time of 00:00:00 (midnight) January 1st, 2000. /// or zero time of 00:00:00 (midnight) January 1st, 2000.
/// @brief 00:00:00 Jan 1, 2000 UTC. /// @brief 00:00:00 Jan 1, 2000 UTC.
static const TimeValue ZeroTime; static TimeValue ZeroTime() {
return TimeValue ( 0,0 );
}
/// A constant TimeValue for the Posix base time which is /// A constant TimeValue for the Posix base time which is
/// 00:00:00 (midnight) January 1st, 1970. /// 00:00:00 (midnight) January 1st, 1970.
/// @brief 00:00:00 Jan 1, 1970 UTC. /// @brief 00:00:00 Jan 1, 1970 UTC.
static const TimeValue PosixZeroTime; static TimeValue PosixZeroTime() {
return TimeValue ( PosixZeroTimeSeconds,0 );
}
/// A constant TimeValue for the Win32 base time which is /// A constant TimeValue for the Win32 base time which is
/// 00:00:00 (midnight) January 1st, 1601. /// 00:00:00 (midnight) January 1st, 1601.
/// @brief 00:00:00 Jan 1, 1601 UTC. /// @brief 00:00:00 Jan 1, 1601 UTC.
static const TimeValue Win32ZeroTime; static TimeValue Win32ZeroTime() {
return TimeValue ( Win32ZeroTimeSeconds,0 );
}
/// @} /// @}
/// @name Types /// @name Types

View File

@ -22,12 +22,6 @@ const TimeValue::SecondsType
const TimeValue::SecondsType const TimeValue::SecondsType
TimeValue::Win32ZeroTimeSeconds = -12591158400ULL; TimeValue::Win32ZeroTimeSeconds = -12591158400ULL;
const TimeValue TimeValue::MinTime = TimeValue ( INT64_MIN,0 );
const TimeValue TimeValue::MaxTime = TimeValue ( INT64_MAX,0 );
const TimeValue TimeValue::ZeroTime = TimeValue ( 0,0 );
const TimeValue TimeValue::PosixZeroTime = TimeValue ( PosixZeroTimeSeconds,0 );
const TimeValue TimeValue::Win32ZeroTime = TimeValue ( Win32ZeroTimeSeconds,0 );
void void
TimeValue::normalize( void ) { TimeValue::normalize( void ) {
if ( nanos_ >= NANOSECONDS_PER_SECOND ) { if ( nanos_ >= NANOSECONDS_PER_SECOND ) {

View File

@ -41,7 +41,7 @@ TimeValue TimeValue::now() {
// errors concern the timezone parameter which we're passing in as 0. // errors concern the timezone parameter which we're passing in as 0.
// In the unlikely case it does happen, just return MinTime, no error // In the unlikely case it does happen, just return MinTime, no error
// message needed. // message needed.
return MinTime; return MinTime();
} }
return TimeValue( return TimeValue(

View File

@ -31,12 +31,12 @@ TEST(ProcessTest, SelfProcess) {
EXPECT_LT(1u, process::get_self()->page_size()); EXPECT_LT(1u, process::get_self()->page_size());
EXPECT_LT(TimeValue::MinTime, process::get_self()->get_user_time()); EXPECT_LT(TimeValue::MinTime(), process::get_self()->get_user_time());
EXPECT_GT(TimeValue::MaxTime, process::get_self()->get_user_time()); EXPECT_GT(TimeValue::MaxTime(), process::get_self()->get_user_time());
EXPECT_LT(TimeValue::MinTime, process::get_self()->get_system_time()); EXPECT_LT(TimeValue::MinTime(), process::get_self()->get_system_time());
EXPECT_GT(TimeValue::MaxTime, process::get_self()->get_system_time()); EXPECT_GT(TimeValue::MaxTime(), process::get_self()->get_system_time());
EXPECT_LT(TimeValue::MinTime, process::get_self()->get_wall_time()); EXPECT_LT(TimeValue::MinTime(), process::get_self()->get_wall_time());
EXPECT_GT(TimeValue::MaxTime, process::get_self()->get_wall_time()); EXPECT_GT(TimeValue::MaxTime(), process::get_self()->get_wall_time());
} }
TEST(ProcessTest, GetRandomNumberTest) { TEST(ProcessTest, GetRandomNumberTest) {