diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1998-04-04 03:24:20 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1998-04-04 03:24:20 +0000 |
| commit | 4a75cdc1694b75036fe4d0fcd1b7dd265bc878b4 (patch) | |
| tree | 6337054e9975be8557c8318099713469e2a9697c | |
| parent | 4ded2aecfff28f37507137ec2d96d16aa2346624 (diff) | |
| download | ATCD-4a75cdc1694b75036fe4d0fcd1b7dd265bc878b4.tar.gz | |
*** empty log message ***
| -rw-r--r-- | ChangeLog-98a | 12 | ||||
| -rw-r--r-- | ace/OS.cpp | 13 | ||||
| -rw-r--r-- | ace/OS.h | 5 | ||||
| -rw-r--r-- | ace/OS.i | 17 |
4 files changed, 31 insertions, 16 deletions
diff --git a/ChangeLog-98a b/ChangeLog-98a index 4add68e8599..e033a58b4cd 100644 --- a/ChangeLog-98a +++ b/ChangeLog-98a @@ -1,3 +1,11 @@ +Fri Apr 3 21:18:51 1998 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/OS (cleanup): Created a dummy ACE_Cleanup constructor since + the lack of this may be causing a bug with CC and the linker for + TAO's IDL compiler. Also moved the constructor and destructor of + ACE_Cleanup into the OS.i file and made them inline. We'll fix + this bug yet!!!! + Fri Apr 03 18:45:35 1998 Steve Huston <shuston@riverace.com> * apps/JAWS/clients/Blobby/Makefile @@ -22,8 +30,6 @@ Fri Apr 03 18:45:35 1998 Steve Huston <shuston@riverace.com> * performance-tests/Makefile: Removed UDP from list of dirs to build. -Fri Apr 03 17:10:32 1998 Steve Huston <shuston@riverace.com> - * include/makeinclude/rules.bin.GNU: Set OBJEXT and VOBJS from the SRC files in the Makefile (LSRC sets VLOBJS in rules.lib.GNU; SRC sets VOBJS in rules.bin.GNU). @@ -33,8 +39,6 @@ Fri Apr 03 17:10:32 1998 Steve Huston <shuston@riverace.com> than one program to build in a makefile, set PSRC to the source files for make depend. -Fri Apr 03 11:57:14 1998 Steve Huston <shuston@riverace.com> - * include/makeinclude/rules.lib.GNU: Use VLOBJS for archive lib object files; using VOBJS gets it confused with VOBJS in rules.bin.GNU and makes it very difficult to build lib and exe from same Makefile. diff --git a/ace/OS.cpp b/ace/OS.cpp index b8367c731d3..d53590799a4 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -1777,21 +1777,12 @@ ACE_Thread_Adapter::invoke (void) int ACE_Thread_Adapter::rethrow_w32_structural_exception () { - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) Win32 structured exception exiting thread\n"))); + ACE_DEBUG ((LM_DEBUG, + ASYS_TEXT ("(%t) Win32 structured exception exiting thread\n"))); return (DWORD) EXCEPTION_CONTINUE_SEARCH; } #endif /* ACE_WIN32 */ -ACE_Cleanup::~ACE_Cleanup () -{ -} - -void -ACE_Cleanup::cleanup (void *) -{ - delete this; -} - extern "C" void ace_cleanup_destroyer (ACE_Cleanup *object, void *param) { @@ -3808,7 +3808,10 @@ class ACE_Export ACE_Cleanup // = TITLE // Base class for objects that are cleaned by ACE_Object_Manager. public: - virtual ~ACE_Cleanup (); + ACE_Cleanup (void); + // No-op constructor. + + virtual ~ACE_Cleanup (void); // Destructor. virtual void cleanup (void *param = 0); @@ -9167,3 +9167,20 @@ putchar (int c) return c; } #endif /* ACE_HAS_WINCE */ + +ACE_INLINE +ACE_Cleanup::ACE_Cleanup (void) +{ +} + +ACE_INLINE +ACE_Cleanup::~ACE_Cleanup (void) +{ +} + +ACE_INLINE void +ACE_Cleanup::cleanup (void *) +{ + delete this; +} + |