diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-06-20 10:36:12 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-06-20 10:36:12 +0000 |
| commit | b80610300c008db51c4796e462e02f256f551f06 (patch) | |
| tree | 0fd0e6349db1f89f44999dfb35c14d9a3a97d1ac | |
| parent | 56ed370909aa204cf0ae3f378a6f3fe43ce1093f (diff) | |
| download | ATCD-b80610300c008db51c4796e462e02f256f551f06.tar.gz | |
*** empty log message ***
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 9 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 9 | ||||
| -rw-r--r-- | ace/OS.i | 6 |
4 files changed, 23 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index 932d8c3c281..083e0dc14bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Jun 19 21:24:41 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ace/OS.i (mutex_lock): Fiddled around with the #else so that + we'll avoid "statement not reached" warnings on KCC. Thanks to + J Shane Culpepper <pepper@channelogics.com> for reporting this. + Wed Jun 20 07:35:04 2001 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Makefile.bor @@ -22,8 +28,7 @@ Tue Jun 19 16:08:34 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> Fixed the skip_wchar() according to the changes in WChar implementation of GIOP 1.2. Thanks to Peter Phillips <pphillip@opentext.com> for reporting the problem - the fix. - + the fix. This fixes BIGID 945. Tue Jun 19 08:13:52 2001 Chanaka Liyanaarachchi <chanaka@ociweb.com> diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 932d8c3c281..083e0dc14bf 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Tue Jun 19 21:24:41 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ace/OS.i (mutex_lock): Fiddled around with the #else so that + we'll avoid "statement not reached" warnings on KCC. Thanks to + J Shane Culpepper <pepper@channelogics.com> for reporting this. + Wed Jun 20 07:35:04 2001 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Makefile.bor @@ -22,8 +28,7 @@ Tue Jun 19 16:08:34 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> Fixed the skip_wchar() according to the changes in WChar implementation of GIOP 1.2. Thanks to Peter Phillips <pphillip@opentext.com> for reporting the problem - the fix. - + the fix. This fixes BIGID 945. Tue Jun 19 08:13:52 2001 Chanaka Liyanaarachchi <chanaka@ociweb.com> diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 932d8c3c281..083e0dc14bf 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Tue Jun 19 21:24:41 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * ace/OS.i (mutex_lock): Fiddled around with the #else so that + we'll avoid "statement not reached" warnings on KCC. Thanks to + J Shane Culpepper <pepper@channelogics.com> for reporting this. + Wed Jun 20 07:35:04 2001 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Makefile.bor @@ -22,8 +28,7 @@ Tue Jun 19 16:08:34 2001 Sharath R. Cholleti <sharath@cs.wustl.edu> Fixed the skip_wchar() according to the changes in WChar implementation of GIOP 1.2. Thanks to Peter Phillips <pphillip@opentext.com> for reporting the problem - the fix. - + the fix. This fixes BIGID 945. Tue Jun 19 08:13:52 2001 Chanaka Liyanaarachchi <chanaka@ociweb.com> @@ -2037,9 +2037,7 @@ ACE_OS::mutex_lock (ACE_mutex_t *m, ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_mutex_timedlock (m, &ts), result), int, -1); - # elif defined (ACE_HAS_WTHREADS) - // Note that we must convert between absolute time (which is passed // as a parameter) and relative time (which is what the system call // expects). @@ -2112,11 +2110,11 @@ ACE_OS::mutex_lock (ACE_mutex_t *m, return 0; # endif /* ACE_HAS_PTHREADS */ -#endif /* ACE_HAS_THREADS && ACE_HAS_MUTEX_TIMEOUTS */ - +#else ACE_UNUSED_ARG (m); ACE_UNUSED_ARG (timeout); ACE_NOTSUP_RETURN (-1); +#endif /* ACE_HAS_THREADS && ACE_HAS_MUTEX_TIMEOUTS */ } ACE_INLINE int |