Revert 91528 and use a std::vector instead, fixing an abuse of std::string.

[oota-llvm.git] / lib / System / Unix / TimeValue.inc

diff --git a/lib/System/Unix/TimeValue.inc b/lib/System/Unix/TimeValue.inc
index 8f0ad38d8ef39dad13469a67579317b57dbbaa8a..d8cc8f55eecc4e24913e3598b717c947f4a41b53 100644 (file)
--- a/lib/System/Unix/TimeValue.inc
+++ b/lib/System/Unix/TimeValue.inc
@@ -2,8 +2,8 @@
 // 
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by Reid Spencer and is distributed under the 
-// University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 // 
 //===----------------------------------------------------------------------===//
 //
@@ -21,11 +21,16 @@
 namespace llvm {
   using namespace sys;
 
-std::string TimeValue::toString() const {
+std::string TimeValue::str() const {
   char buffer[32];
 
   time_t ourTime = time_t(this->toEpochTime());
+#ifdef __hpux
+// note that the following line needs -D_REENTRANT on HP-UX to be picked up 
+  asctime_r(localtime(&ourTime), buffer);
+#else
   ::asctime_r(::localtime(&ourTime), buffer);
+#endif
 
   std::string result(buffer);
   return result.substr(0,24);
@@ -34,14 +39,18 @@ std::string TimeValue::toString() const {
 TimeValue TimeValue::now() {
   struct timeval the_time;
   timerclear(&the_time);
-  if (0 != ::gettimeofday(&the_time,0)) 
-    ThrowErrno("Couldn't obtain time of day");
+  if (0 != ::gettimeofday(&the_time,0)) {
+    // This is *really* unlikely to occur because the only gettimeofday
+    // errors concern the timezone parameter which we're passing in as 0.
+    // In the unlikely case it does happen, just return MinTime, no error
+    // message needed. 
+    return MinTime;
+  }
 
   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 ) );
 }
 
 }
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab