diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-12-16 03:04:14 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-12-16 03:04:14 +0000 |
| commit | b5c2af2a27cfc724767d8689805d76999ebae8ce (patch) | |
| tree | cf55e2bf915973f1d4c4b45f9fbb47b045e71eac | |
| parent | 3927786303eb47528aa688798a015aea5958789b (diff) | |
| download | ATCD-b5c2af2a27cfc724767d8689805d76999ebae8ce.tar.gz | |
*** empty log message ***
| -rw-r--r-- | ChangeLog-98a | 4 | ||||
| -rw-r--r-- | ace/OS.cpp | 16 |
2 files changed, 6 insertions, 14 deletions
diff --git a/ChangeLog-98a b/ChangeLog-98a index a2cd4f22fdb..39020ffe2e4 100644 --- a/ChangeLog-98a +++ b/ChangeLog-98a @@ -1,5 +1,9 @@ Mon Dec 15 20:17:10 1997 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + * ace/OS.cpp: Fixed pread() and pwrite() so that they work + correctly even if we don't support threads. Thanks to Irfan for + finding this. + * ace/OS.i: Tried to fix the fstat() wrapper on Win32 so that it does the right think for HANDLES. Thanks to Lori Anderson <lori@probita.com> for pointing this out. diff --git a/ace/OS.cpp b/ace/OS.cpp index 884ea0045fd..b2fbcbbd21b 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -3066,7 +3066,7 @@ ACE_OS::pread (ACE_HANDLE handle, #else return ::pread (handle, buf, nbytes, offset); #endif /* ACE_WIN32 */ -#elif defined (ACE_HAS_THREADS) +#else ACE_MT (ACE_Thread_Mutex *ace_os_monitor_lock = ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object (ACE_Object_Manager::ACE_OS_MONITOR_LOCK); @@ -3076,12 +3076,6 @@ ACE_OS::pread (ACE_HANDLE handle, return -1; else return ACE_OS::read (handle, buf, nbytes); -#else - ACE_UNUSED_ARG (handle); - ACE_UNUSED_ARG (buf); - ACE_UNUSED_ARG (nbytes); - ACE_UNUSED_ARG (offset); - ACE_NOTSUP_RETURN (-1); #endif /* ACE_HAD_P_READ_WRITE */ } @@ -3114,7 +3108,7 @@ ACE_OS::pwrite (ACE_HANDLE handle, #else return ::pwrite (handle, buf, nbytes, offset); #endif /* ACE_WIN32 */ -#elif defined (ACE_HAS_THREADS) +#else ACE_MT (ACE_Thread_Mutex *ace_os_monitor_lock = ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object (ACE_Object_Manager::ACE_OS_MONITOR_LOCK); @@ -3124,12 +3118,6 @@ ACE_OS::pwrite (ACE_HANDLE handle, return -1; else return ACE_OS::write (handle, buf, nbytes); -#else - ACE_UNUSED_ARG (handle); - ACE_UNUSED_ARG (buf); - ACE_UNUSED_ARG (nbytes); - ACE_UNUSED_ARG (offset); - ACE_NOTSUP_RETURN (-1); #endif /* ACE_HAD_P_READ_WRITE */ } |