diff options
| author | Olli Savia <ops@iki.fi> | 2006-03-14 15:57:46 +0000 |
|---|---|---|
| committer | Olli Savia <ops@iki.fi> | 2006-03-14 15:57:46 +0000 |
| commit | e20d9097b0397b35c7b84b05fc5a0c260b9d7e0b (patch) | |
| tree | a9a0a0c490c1064b02388d26f5bf52d28672ffae | |
| parent | b35ca15471cb4a42b45b3d3ba39ed1b5c5675a31 (diff) | |
| download | ATCD-e20d9097b0397b35c7b84b05fc5a0c260b9d7e0b.tar.gz | |
ChangeLogTag: Tue Mar 14 15:55:08 UTC 2006 Olli Savia <ops@iki.fi>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ace/Task_T.h | 10 | ||||
| -rw-r--r-- | include/makeinclude/platform_lynxos.GNU | 1 |
3 files changed, 19 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index d2c10cc3a4d..5fcc583ace4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Mar 14 15:55:08 UTC 2006 Olli Savia <ops@iki.fi> + + * ace/Task_T.h: + Added a workaround for buggy LynxOS 3.x compiler. + + * include/makeinclude/platform_lynxos.GNU: + Made debug=0 as default for LynxOS 3.x + Tue Mar 14 15:50:09 UTC 2006 Olli Savia <ops@iki.fi> * ace/OS_NS_Thread.cpp: diff --git a/ace/Task_T.h b/ace/Task_T.h index 3ccccff87a4..68e54562612 100644 --- a/ace/Task_T.h +++ b/ace/Task_T.h @@ -28,6 +28,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Forward decls... template <ACE_SYNCH_DECL> class ACE_Module; +#if defined (ACE_LYNXOS_MAJOR) && (ACE_LYNXOS_MAJOR < 4) + using namespace ACE_Task_Flags; +#endif + /** * @class ACE_Task * @@ -132,7 +136,13 @@ public: // Should be protected: * Note that if this conflicts with the C++ iostream <flush> * function, just rewrite the iostream function as ::<flush>. */ + +#if defined (ACE_LYNXOS_MAJOR) && (ACE_LYNXOS_MAJOR < 4) + // Make LynxOS 3.x buggy compiler happy + int flush (u_long flag = ACE_FLUSHALL); +#else int flush (u_long flag = ACE_Task_Flags::ACE_FLUSHALL); +#endif // = Special routines corresponding to certain message types. diff --git a/include/makeinclude/platform_lynxos.GNU b/include/makeinclude/platform_lynxos.GNU index fb11c2e4d23..2470325415a 100644 --- a/include/makeinclude/platform_lynxos.GNU +++ b/include/makeinclude/platform_lynxos.GNU @@ -72,6 +72,7 @@ ifeq ($(LYNXOS_MAJOR),3) shared_libs_only = static_libs_only = 1 exceptions = 0 + debug ?= 0 endif ifeq ($(shared_libs_only),1) |