summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryamuna <yamuna@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-06-29 04:28:15 +0000
committeryamuna <yamuna@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-06-29 04:28:15 +0000
commit45089ad8a8a416c4ba315519903b7a5468458c96 (patch)
tree1ef74336b732c5e7667936c97d1b282a184b1db5
parent7041f11ece9464047ef8c75c06ad529be1cab4f8 (diff)
downloadATCD-45089ad8a8a416c4ba315519903b7a5468458c96.tar.gz
ChangelogTag: Sun Jun 29 00:26:56 2003 Yamuna Krishnamurthy <yamuna@oomworks.com>
-rw-r--r--TAO/tao/Exception.cpp3
-rw-r--r--TAO/tao/Exception.h1
-rw-r--r--TAO/tao/corbafwd.h4
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) \