diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-23 21:10:42 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-23 21:10:42 +0000 |
| commit | fc094801057c70ddd671873d58fe8440e5251a14 (patch) | |
| tree | 38e0875f68e0b88f641d57c9d5926333dc44027b | |
| parent | fb7b4947295d9ef957687513fa4c72c67d01f2cb (diff) | |
| download | ATCD-fc094801057c70ddd671873d58fe8440e5251a14.tar.gz | |
ChangeLogTag: Thu Mar 23 15:09:22 2000 Jody Hagins <jody@atdesk.com>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 7 | ||||
| -rw-r--r-- | ace/Object_Manager.cpp | 5 |
4 files changed, 24 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 3d6e7f6ab8f..0f718add2f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Mar 23 15:09:22 2000 Jody Hagins <jody@atdesk.com> + + * ace/Object_Manager.cpp (ACE_Static_Object_Lock::instance): + with ACE_SHOULD_MALLOC_STATIC_OBJECT_LOCK #defined, + use ACE_RETURN_NEW instead of ACE_RETURN so that a value + is returned by the function. + Thu Mar 23 10:39:23 2000 Carlos O'Ryan <coryan@uci.edu> * bin/g++dep: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 3d6e7f6ab8f..0f718add2f7 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Thu Mar 23 15:09:22 2000 Jody Hagins <jody@atdesk.com> + + * ace/Object_Manager.cpp (ACE_Static_Object_Lock::instance): + with ACE_SHOULD_MALLOC_STATIC_OBJECT_LOCK #defined, + use ACE_RETURN_NEW instead of ACE_RETURN so that a value + is returned by the function. + Thu Mar 23 10:39:23 2000 Carlos O'Ryan <coryan@uci.edu> * bin/g++dep: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 3d6e7f6ab8f..0f718add2f7 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,10 @@ +Thu Mar 23 15:09:22 2000 Jody Hagins <jody@atdesk.com> + + * ace/Object_Manager.cpp (ACE_Static_Object_Lock::instance): + with ACE_SHOULD_MALLOC_STATIC_OBJECT_LOCK #defined, + use ACE_RETURN_NEW instead of ACE_RETURN so that a value + is returned by the function. + Thu Mar 23 10:39:23 2000 Carlos O'Ryan <coryan@uci.edu> * bin/g++dep: diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp index a3037cd93ce..59e16021b88 100644 --- a/ace/Object_Manager.cpp +++ b/ace/Object_Manager.cpp @@ -804,8 +804,9 @@ ACE_Static_Object_Lock::instance (void) { return 0; } - ACE_NEW (ACE_Static_Object_Lock_lock, - (buffer) ACE_Static_Object_Lock_Type ()); + ACE_NEW_RETURN (ACE_Static_Object_Lock_lock, + (buffer) ACE_Static_Object_Lock_Type (), + 0); # else /* ! ACE_SHOULD_MALLOC_STATIC_OBJECT_LOCK */ ACE_NEW_RETURN (ACE_Static_Object_Lock_lock, ACE_Cleanup_Adapter<ACE_Recursive_Thread_Mutex>, |