summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-04-14 01:13:03 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-04-14 01:13:03 +0000
commitb2bd2137002718220073607c064ef82df6ac67a4 (patch)
treebbdb659585d8afce49902eb20134a6c901e95426
parent48d1879dfdbc8564ddaa605f912fea9c3b3a1358 (diff)
downloadATCD-b2bd2137002718220073607c064ef82df6ac67a4.tar.gz
ChangeLogTag:Fri Apr 13 11:58:58 2001 Carlos O'Ryan <coryan@uci.edu>
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLogs/ChangeLog-02a6
-rw-r--r--ChangeLogs/ChangeLog-03a6
-rw-r--r--ace/OS.i2
4 files changed, 19 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a98e5873cac..63e7194ce8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr 13 11:58:58 2001 Carlos O'Ryan <coryan@uci.edu>
+
+ * ace/OS.i (gethrtime):
+ Add support for the the clock tick register as a high resolution
+ timer under KCC/Linux.
+
Fri Apr 13 12:21:01 2001 Nanbor Wang <nanbor@cs.wustl.edu>
* ace/Malloc_T.h: Added an explanation on the requirement about
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index a98e5873cac..63e7194ce8b 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Fri Apr 13 11:58:58 2001 Carlos O'Ryan <coryan@uci.edu>
+
+ * ace/OS.i (gethrtime):
+ Add support for the the clock tick register as a high resolution
+ timer under KCC/Linux.
+
Fri Apr 13 12:21:01 2001 Nanbor Wang <nanbor@cs.wustl.edu>
* ace/Malloc_T.h: Added an explanation on the requirement about
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index a98e5873cac..63e7194ce8b 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Fri Apr 13 11:58:58 2001 Carlos O'Ryan <coryan@uci.edu>
+
+ * ace/OS.i (gethrtime):
+ Add support for the the clock tick register as a high resolution
+ timer under KCC/Linux.
+
Fri Apr 13 12:21:01 2001 Nanbor Wang <nanbor@cs.wustl.edu>
* ace/Malloc_T.h: Added an explanation on the requirement about
diff --git a/ace/OS.i b/ace/OS.i
index f4b8b885151..128cf72b141 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -10558,7 +10558,7 @@ ACE_OS::gethrtime (const ACE_HRTimer_Op op)
ACE_UNUSED_ARG (op);
// Use .obj/gethrtime.o, which was compiled with g++.
return ACE_gethrtime ();
-#elif defined (__GNUG__) && defined (ACE_HAS_PENTIUM)
+#elif (defined(__KCC) || defined (__GNUG__)) && defined (ACE_HAS_PENTIUM)
ACE_UNUSED_ARG (op);
# if defined (ACE_LACKS_LONGLONG_T)