diff options
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/tao/Exception.cpp | 3 | ||||
| -rw-r--r-- | TAO/tao/Exception.h | 1 | ||||
| -rw-r--r-- | TAO/tao/corbafwd.h | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index 721cdcc55a5..6e3d37fafaa 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -1042,7 +1042,8 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp, TAO_SYSTEM_EXCEPTION (BAD_QOS) \ TAO_SYSTEM_EXCEPTION (INVALID_ACTIVITY) \ TAO_SYSTEM_EXCEPTION (ACTIVITY_COMPLETED) \ - TAO_SYSTEM_EXCEPTION (ACTIVITY_REQUIRED) + TAO_SYSTEM_EXCEPTION (ACTIVITY_REQUIRED) \ + TAO_SYSTEM_EXCEPTION (THREAD_CANCELLED) // Declare static storage for these ... the buffer is "naturally" // aligned and overwritten. diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index bd6aae49515..d90e9fc5503 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -337,6 +337,7 @@ TAO_SYSTEM_EXCEPTION(BAD_QOS); // bad quality of service TAO_SYSTEM_EXCEPTION(INVALID_ACTIVITY); TAO_SYSTEM_EXCEPTION(ACTIVITY_COMPLETED); TAO_SYSTEM_EXCEPTION(ACTIVITY_REQUIRED); +TAO_SYSTEM_EXCEPTION(THREAD_CANCELLED); #undef TAO_SYSTEM_EXCEPTION diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h index fef6980dbf3..4ce1478cf7f 100644 --- a/TAO/tao/corbafwd.h +++ b/TAO/tao/corbafwd.h @@ -332,6 +332,7 @@ namespace CORBA class INVALID_ACTIVITY; class ACTIVITY_COMPLETED; class ACTIVITY_REQUIRED; + class THREAD_CANCELLED; //@} class UnknownUserException; @@ -497,7 +498,8 @@ namespace CORBA TAO_SYSTEM_EXCEPTION(BAD_QOS); \ TAO_SYSTEM_EXCEPTION(INVALID_ACTIVITY); \ TAO_SYSTEM_EXCEPTION(ACTIVITY_COMPLETED); \ - TAO_SYSTEM_EXCEPTION(ACTIVITY_REQUIRED); + TAO_SYSTEM_EXCEPTION(ACTIVITY_REQUIRED); \ + TAO_SYSTEM_EXCEPTION(THREAD_CANCELLED); // = Typecode constants for system exceptions. #define TAO_SYSTEM_EXCEPTION(name) \ |