summaryrefslogtreecommitdiff
path: root/src/base/time.cc
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2007-01-26 18:50:28 -0500
committerAli Saidi <saidi@eecs.umich.edu>2007-01-26 18:50:28 -0500
commit6d9d0c68b574ceba53fc36d34b83f7109e00b1d0 (patch)
tree8004fcb5879cd81d738bd750441fbc900208e049 /src/base/time.cc
parentc215d54aac6925cf13079d8d8fe3691451a77ce1 (diff)
parentfd8a4ff5a8a9ea65e227f0b4000dfcda06d4764f (diff)
downloadgem5-6d9d0c68b574ceba53fc36d34b83f7109e00b1d0.tar.xz
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.suncc --HG-- extra : convert_revision : 1706f6218abec7eb575dcff3ad4aef83894f64ab
Diffstat (limited to 'src/base/time.cc')
-rw-r--r--src/base/time.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/base/time.cc b/src/base/time.cc
index cbc7256ee..76ba355b7 100644
--- a/src/base/time.cc
+++ b/src/base/time.cc
@@ -105,7 +105,11 @@ Time::date(string format) const
char buf[256];
if (format.empty()) {
+#ifdef __SUNPRO_CC
+ ctime_r(&sec, buf, 256);
+#else
ctime_r(&sec, buf);
+#endif
buf[24] = '\0';
return buf;
}