diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-26 00:13:37 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-26 00:13:37 +0000 |
| commit | 800858166e7f0d5a40ffe2e4cde5173042c73d49 (patch) | |
| tree | ade2808163b82ff32bb78b981bd03c2df37a9862 | |
| parent | dd191a1bd23eb3876b72894037590d53bb4385da (diff) | |
| download | ATCD-800858166e7f0d5a40ffe2e4cde5173042c73d49.tar.gz | |
ChangeLogTag:Fri Aug 25 17:11:25 2000 Carlos O'Ryan <coryan@uci.edu>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 7 | ||||
| -rw-r--r-- | ace/Thread_Control.cpp | 9 | ||||
| -rw-r--r-- | ace/Thread_Control.h | 4 |
5 files changed, 33 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 86a78c74647..29af2b1a7f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Aug 25 17:11:25 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Thread_Control.h: + * ace/Thread_Control.cpp: + Fixed problems with the backwards compatible configuration + (i.e. ACE_HAS_ONLY_LATEST_AND_GREATEST not defined). + Fri Aug 25 16:15:50 2000 Carlos O'Ryan <coryan@uci.edu> * ace/OS.h: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 86a78c74647..29af2b1a7f1 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Fri Aug 25 17:11:25 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Thread_Control.h: + * ace/Thread_Control.cpp: + Fixed problems with the backwards compatible configuration + (i.e. ACE_HAS_ONLY_LATEST_AND_GREATEST not defined). + Fri Aug 25 16:15:50 2000 Carlos O'Ryan <coryan@uci.edu> * ace/OS.h: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 86a78c74647..29af2b1a7f1 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,10 @@ +Fri Aug 25 17:11:25 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/Thread_Control.h: + * ace/Thread_Control.cpp: + Fixed problems with the backwards compatible configuration + (i.e. ACE_HAS_ONLY_LATEST_AND_GREATEST not defined). + Fri Aug 25 16:15:50 2000 Carlos O'Ryan <coryan@uci.edu> * ace/OS.h: diff --git a/ace/Thread_Control.cpp b/ace/Thread_Control.cpp index 13a4c063795..739c3758550 100644 --- a/ace/Thread_Control.cpp +++ b/ace/Thread_Control.cpp @@ -1,5 +1,14 @@ // $Id$ +// <HACK ON> +#include "ace/config-all.h" +#if !defined (ACE_ONLY_LATEST_AND_GREATEST) +// This silly include breaks a cycle when compiling in backwards +// compatibility mode +# include "ace/Thread_Exit.h" +#endif /* ACE_ONLY_LATEST_AND_GREATEST */ +// </HACK OFF> + #include "ace/Thread_Control.h" #include "ace/Thread_Manager.h" diff --git a/ace/Thread_Control.h b/ace/Thread_Control.h index 4fcce7cd770..32a368db0aa 100644 --- a/ace/Thread_Control.h +++ b/ace/Thread_Control.h @@ -23,7 +23,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" +#if defined (ACE_ONLY_LATEST_AND_GREATEST) +# include "ace/OS.h" +#endif /* ACE_ONLY_LATEST_AND_GREATEST */ class ACE_Thread_Manager; |