diff options
| author | Olli Savia <ops@iki.fi> | 2006-01-16 16:52:09 +0000 |
|---|---|---|
| committer | Olli Savia <ops@iki.fi> | 2006-01-16 16:52:09 +0000 |
| commit | 5689f53cdca12113d7b9edcd54d0c76e1a9641bf (patch) | |
| tree | 4ebe20de74a12876e5f49c7c099f1a7d8e6185fb /TAO/tao | |
| parent | 19a93251bd2a54297e8b1a8ec10edcdb7bf9f069 (diff) | |
| download | ATCD-5689f53cdca12113d7b9edcd54d0c76e1a9641bf.tar.gz | |
ChangeLogTag: Mon Jan 16 16:49:27 UTC 2006 Olli Savia <ops@iki.fi>
Diffstat (limited to 'TAO/tao')
| -rw-r--r-- | TAO/tao/AnyTypeCode/SystemExceptionA.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/Exception.h | 4 | ||||
| -rw-r--r-- | TAO/tao/RTScheduling/Current.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/SystemException.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/SystemException.h | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/TAO/tao/AnyTypeCode/SystemExceptionA.cpp b/TAO/tao/AnyTypeCode/SystemExceptionA.cpp index 3aa922f68df..2e9deae0936 100644 --- a/TAO/tao/AnyTypeCode/SystemExceptionA.cpp +++ b/TAO/tao/AnyTypeCode/SystemExceptionA.cpp @@ -19,9 +19,9 @@ ACE_RCSID (tao, TAO_BEGIN_VERSIONED_NAMESPACE_DECL -#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO) +#if defined (THREAD_CANCELLED) #undef THREAD_CANCELLED -#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */ +#endif /* THREAD_CANCELLED */ // List of standard/system exceptions ... used to create static // storage for their typecodes. diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 3d6a605bdab..fbf2a092fd8 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -48,9 +48,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_OutputCDR; class TAO_InputCDR; -#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO) +#if defined (THREAD_CANCELLED) #undef THREAD_CANCELLED -#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */ +#endif /* THREAD_CANCELLED */ // This is already done in orbconf.h. But this file is totally // decoupled from its contents that we have to do this here. Including diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp index 65f4caad048..f96502a51bc 100644 --- a/TAO/tao/RTScheduling/Current.cpp +++ b/TAO/tao/RTScheduling/Current.cpp @@ -742,9 +742,9 @@ TAO_RTScheduler_Current_i::name (void) return CORBA::string_dup (this->name_.in ()); } -#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO) +#if defined (THREAD_CANCELLED) #undef THREAD_CANCELLED -#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */ +#endif /* THREAD_CANCELLED */ void TAO_RTScheduler_Current_i::cancel_thread (ACE_ENV_SINGLE_ARG_DECL) diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp index b562738d50c..a7c00f6afe9 100644 --- a/TAO/tao/SystemException.cpp +++ b/TAO/tao/SystemException.cpp @@ -818,9 +818,9 @@ CORBA::SystemException::_tao_get_omg_exception_description ( TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO) +#if defined (THREAD_CANCELLED) #undef THREAD_CANCELLED -#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */ +#endif /* THREAD_CANCELLED */ // List of standard/system exceptions ... used to create static // storage for their typecodes, then later to initialize that storage diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h index 6a60767e525..2a343346d3a 100644 --- a/TAO/tao/SystemException.h +++ b/TAO/tao/SystemException.h @@ -34,9 +34,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_OutputCDR; class TAO_InputCDR; -#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO) +#if defined (THREAD_CANCELLED) #undef THREAD_CANCELLED -#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */ +#endif /* THREAD_CANCELLED */ // This is already done in orbconf.h. But this file is totally // decoupled from its contents that we have to do this here. Including |