ChangeLogTag: Mon Jan 03 07:34:38 2000 David L. Levine <levine@cs.wustl.edu>

4 files changed, 28 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index cbb062ca080..586c6ee4af3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,13 @@
+Mon Jan 03 07:34:38 2000  David L. Levine  <levine@cs.wustl.edu>
+
+        * ace/OS.i (gmtime_r): return res instead of *res, because
+          the function returns a struct tm *, not a struct tm.
+
 Sun Jan  2 11:02:54 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* ace/OS.i (gmtime_r): We should return *res rather than
-	  *result to make the behavior correct for Win32.  Thanks to
- 	  J. Afshar <jafshar@vignette.com> for reporting this.
+        * ace/OS.i (gmtime_r): We should return *res rather than
+          *result to make the behavior correct for Win32.  Thanks to
+          J. Afshar <jafshar@vignette.com> for reporting this.
 
 Sun Jan 02 00:50:00 2000  Chris Gill  <cdgill@cs.wustl.edu>
 
@@ -11,11 +16,10 @@ Sun Jan 02 00:50:00 2000  Chris Gill  <cdgill@cs.wustl.edu>
           ace/Synch.cpp
           ace/config-psos-diab-ppc.h: Added support for native mutexs,
           condition variables, and thread-specific storage in pSOS.  Native
-          pSOS mutexes, where available, support several cool features, 
+          pSOS mutexes, where available, support several cool features,
           including lock recursion and priority inheritance protocol and
           priority ceiling protocol support.
 
 Sat Jan 01 09:16:39 2000  David L. Levine  <levine@cs.wustl.edu>
 
         * ChangeLog,Makefile: moved to ChangeLog-99b.
-
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index cbb062ca080..586c6ee4af3 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,8 +1,13 @@
+Mon Jan 03 07:34:38 2000  David L. Levine  <levine@cs.wustl.edu>
+
+        * ace/OS.i (gmtime_r): return res instead of *res, because
+          the function returns a struct tm *, not a struct tm.
+
 Sun Jan  2 11:02:54 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* ace/OS.i (gmtime_r): We should return *res rather than
-	  *result to make the behavior correct for Win32.  Thanks to
- 	  J. Afshar <jafshar@vignette.com> for reporting this.
+        * ace/OS.i (gmtime_r): We should return *res rather than
+          *result to make the behavior correct for Win32.  Thanks to
+          J. Afshar <jafshar@vignette.com> for reporting this.
 
 Sun Jan 02 00:50:00 2000  Chris Gill  <cdgill@cs.wustl.edu>
 
@@ -11,11 +16,10 @@ Sun Jan 02 00:50:00 2000  Chris Gill  <cdgill@cs.wustl.edu>
           ace/Synch.cpp
           ace/config-psos-diab-ppc.h: Added support for native mutexs,
           condition variables, and thread-specific storage in pSOS.  Native
-          pSOS mutexes, where available, support several cool features, 
+          pSOS mutexes, where available, support several cool features,
           including lock recursion and priority inheritance protocol and
           priority ceiling protocol support.
 
 Sat Jan 01 09:16:39 2000  David L. Levine  <levine@cs.wustl.edu>
 
         * ChangeLog,Makefile: moved to ChangeLog-99b.
-
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index cbb062ca080..586c6ee4af3 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,8 +1,13 @@
+Mon Jan 03 07:34:38 2000  David L. Levine  <levine@cs.wustl.edu>
+
+        * ace/OS.i (gmtime_r): return res instead of *res, because
+          the function returns a struct tm *, not a struct tm.
+
 Sun Jan  2 11:02:54 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* ace/OS.i (gmtime_r): We should return *res rather than
-	  *result to make the behavior correct for Win32.  Thanks to
- 	  J. Afshar <jafshar@vignette.com> for reporting this.
+        * ace/OS.i (gmtime_r): We should return *res rather than
+          *result to make the behavior correct for Win32.  Thanks to
+          J. Afshar <jafshar@vignette.com> for reporting this.
 
 Sun Jan 02 00:50:00 2000  Chris Gill  <cdgill@cs.wustl.edu>
 
@@ -11,11 +16,10 @@ Sun Jan 02 00:50:00 2000  Chris Gill  <cdgill@cs.wustl.edu>
           ace/Synch.cpp
           ace/config-psos-diab-ppc.h: Added support for native mutexs,
           condition variables, and thread-specific storage in pSOS.  Native
-          pSOS mutexes, where available, support several cool features, 
+          pSOS mutexes, where available, support several cool features,
           including lock recursion and priority inheritance protocol and
           priority ceiling protocol support.
 
 Sat Jan 01 09:16:39 2000  David L. Levine  <levine@cs.wustl.edu>
 
         * ChangeLog,Makefile: moved to ChangeLog-99b.
-
diff --git a/ace/OS.i b/ace/OS.i
index cd712c6a652..9d544201a20 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -9512,7 +9512,7 @@ ACE_OS::gmtime_r (const time_t *t, struct tm *res)
   ACE_OSCALL (::gmtime (t), struct tm *, 0, result) ;
   if (result != 0)
     *res = *result;
-  return *res;
+  return res;
 #else
   // @@ Same as ACE_OS::gmtime (), you need to implement it
   //    yourself.