aboutsummaryrefslogtreecommitdiffstats
path: root/lib/System
diff options
context:
space:
mode:
authorEdwin Török <edwintorok@gmail.com>2010-01-22 15:51:31 +0000
committerEdwin Török <edwintorok@gmail.com>2010-01-22 15:51:31 +0000
commit38aa1c974497a63b6d9d37126cc97e6f890fbc36 (patch)
treee654263ef49cefd754d5e75e6836c881c3d4a96a /lib/System
parent1f08b046f9de970153fed1cba7c2c509eab2442e (diff)
downloadexternal_llvm-38aa1c974497a63b6d9d37126cc97e6f890fbc36.zip
external_llvm-38aa1c974497a63b6d9d37126cc97e6f890fbc36.tar.gz
external_llvm-38aa1c974497a63b6d9d37126cc97e6f890fbc36.tar.bz2
Fix TimeValue::now() on Unix.
TimeValue()::now().toEpochTime() is supposed to be the same as time(), but it wasn't, because toEpoch subtracted PosixZeroTime, but now() didn't add PosixZeroTime! Add a unittest to check this works. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@94178 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/System')
-rw-r--r--lib/System/Unix/TimeValue.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/System/Unix/TimeValue.inc b/lib/System/Unix/TimeValue.inc
index 1ae8c71..d8cc8f5 100644
--- a/lib/System/Unix/TimeValue.inc
+++ b/lib/System/Unix/TimeValue.inc
@@ -48,7 +48,7 @@ TimeValue TimeValue::now() {
}
return TimeValue(
- static_cast<TimeValue::SecondsType>( the_time.tv_sec ),
+ static_cast<TimeValue::SecondsType>( the_time.tv_sec + PosixZeroTime.seconds_ ),
static_cast<TimeValue::NanoSecondsType>( the_time.tv_usec *
NANOSECONDS_PER_MICROSECOND ) );
}