summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2001-08-01 19:22:07 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2001-08-01 19:22:07 +0000
commit49e608432755dbee3b5e63593d3d88c4e2f90834 (patch)
treedd71171c6af76455acef6f4f258a02fc4970c38e
parentb4a3fb788b80003f58649f011952a877044eafe7 (diff)
downloadATCD-49e608432755dbee3b5e63593d3d88c4e2f90834.tar.gz
ChangeLogTag:Wed Aug 1 07:14:42 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
-rw-r--r--ChangeLog9
-rw-r--r--ChangeLogs/ChangeLog-02a9
-rw-r--r--ChangeLogs/ChangeLog-03a9
-rw-r--r--ace/Log_Record.cpp2
-rw-r--r--ace/OS.i4
5 files changed, 30 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 313d137e4b1..31f364ca6ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Aug 1 07:14:42 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
+
+ * include/makeinclude/platform_vxworks5.x_g++.GNU: Checked in a new
+ version of this file, which includes support for the Hitachi
+ chip. Thanks to Frank Wolf for this.
+
+ * ace/Log_Record.cpp (format_msg): Added a cast to fix a warning.
+ Thanks to Bala for reporting this.
+
Tue Jul 31 22:53:26 2001 Ossama Othman <ossama@uci.edu>
* tests/libService_Config_DLL.icc:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 313d137e4b1..31f364ca6ec 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,12 @@
+Wed Aug 1 07:14:42 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
+
+ * include/makeinclude/platform_vxworks5.x_g++.GNU: Checked in a new
+ version of this file, which includes support for the Hitachi
+ chip. Thanks to Frank Wolf for this.
+
+ * ace/Log_Record.cpp (format_msg): Added a cast to fix a warning.
+ Thanks to Bala for reporting this.
+
Tue Jul 31 22:53:26 2001 Ossama Othman <ossama@uci.edu>
* tests/libService_Config_DLL.icc:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 313d137e4b1..31f364ca6ec 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,12 @@
+Wed Aug 1 07:14:42 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
+
+ * include/makeinclude/platform_vxworks5.x_g++.GNU: Checked in a new
+ version of this file, which includes support for the Hitachi
+ chip. Thanks to Frank Wolf for this.
+
+ * ace/Log_Record.cpp (format_msg): Added a cast to fix a warning.
+ Thanks to Bala for reporting this.
+
Tue Jul 31 22:53:26 2001 Ossama Othman <ossama@uci.edu>
* tests/libService_Config_DLL.icc:
diff --git a/ace/Log_Record.cpp b/ace/Log_Record.cpp
index c9fb4471dea..ea142d6dfd6 100644
--- a/ace/Log_Record.cpp
+++ b/ace/Log_Record.cpp
@@ -186,7 +186,7 @@ ACE_Log_Record::format_msg (const ACE_TCHAR *host_name,
ACE_OS::sprintf (timestamp,
ACE_LIB_TEXT ("%s.%03ld %s"),
ctp + 4,
- this->usecs_ / 1000,
+ ((long) this->usecs_) / 1000,
ctp + 20);
}
diff --git a/ace/OS.i b/ace/OS.i
index 2c31cbe1d35..2fd465f81d3 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -8443,11 +8443,11 @@ ACE_OS::thr_setprio (ACE_hthread_t thr_id, int prio)
return (result == -1 ? -1 : 0);
# elif defined (ACE_HAS_PTHREADS_DRAFT6)
pthread_attr_t attr;
- if (pthread_getschedattr(thr_id, &attr) == -1)
+ if (pthread_getschedattr (thr_id, &attr) == -1)
return -1;
if (pthread_attr_setprio (attr, prio) == -1)
return -1;
- return pthread_setschedattr(thr_id, attr);
+ return pthread_setschedattr (thr_id, attr);
# else
struct sched_param param;
int policy = 0;