diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-10-14 22:52:29 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-10-14 22:52:29 +0000 |
| commit | a232f69f7c89266438244e5da35284209acc1fdb (patch) | |
| tree | c86aaa9284780cdf37feb97599133c1908ba8eeb | |
| parent | f06b2f4a656ede49f6ed7255612f37c13dbc4f92 (diff) | |
| download | ATCD-a232f69f7c89266438244e5da35284209acc1fdb.tar.gz | |
ChangeLog:Tue Oct 14 17:51:14 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tao/Exception.cpp | 11 | ||||
| -rw-r--r-- | TAO/tao/Exception.h | 10 | ||||
| -rw-r--r-- | TAO/tao/corbafwd.h | 10 |
4 files changed, 38 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 5397146c417..2178a170002 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Tue Oct 14 17:51:14 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * tao/Exception.h: + * tao/Exception.cpp: + * tao/corbafwd.h: Applied patches to fix compilation errors with + LynxOS. Thanks to Olli Savia for the patches. + Tue Oct 14 09:32:10 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * orbsvcs/PSS/Makefile.parser: Removed lingTAO_Svc_Utils from the diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index 04c01b1a84b..0997581225f 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -1035,6 +1035,17 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp, return; } +#if defined (__Lynx__) + +// LynxOS uses macro THREAD_CANCELLED internally, so it must +// be undefined to avoid compilation errors +#if defined (THREAD_CANCELLED) +#undef THREAD_CANCELLED +#endif /* THREAD_CANCELLED */ + +#endif /*__Lynx__ */ + + // List of standard/system exceptions ... used to create static // storage for their typecodes, then later to initialize that storage // using the routine above. (It's just too painful to init these diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 6f4b07606fc..74c22e30fa0 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -43,6 +43,16 @@ class ACE_Allocator; class TAO_OutputCDR; class TAO_InputCDR; +#if defined (__Lynx__) + +// LynxOS uses macro THREAD_CANCELLED internally, so it must +// be undefined to avoid compilation errors +#if defined (THREAD_CANCELLED) +#undef THREAD_CANCELLED +#endif /* THREAD_CANCELLED */ + +#endif /*__Lynx__ */ + namespace CORBA { /** diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h index 07e013fb4ac..aa20022d763 100644 --- a/TAO/tao/corbafwd.h +++ b/TAO/tao/corbafwd.h @@ -84,6 +84,16 @@ template <class T> class TAO_Unbounded_Sequence; template <typename T> class TAO_Pseudo_Var_T; template <typename T, typename T_var> class TAO_Pseudo_Out_T; +#if defined (__Lynx__) + +// LynxOS uses macro THREAD_CANCELLED internally, so it must +// be undefined to avoid compilation errors +#if defined (THREAD_CANCELLED) +#undef THREAD_CANCELLED +#endif /* THREAD_CANCELLED */ + +#endif /*__Lynx__ */ + /** * @class CORBA * |