ChangeLogTag: Fri May 11 08:11:08 2001 Balachandran Natarajan <bala@cs.wustl.edu>

15 files changed, 41 insertions, 23 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 7cc54330669..0f6a353c3de 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,21 @@
+Fri May 11 08:11:08 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* orbsvcs/orbsvcs/Trader/Trading_Loader.cpp: 
+	* orbsvcs/orbsvcs/Trader/Trading_Loader.h:
+	* orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp:
+	* orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h:
+	* orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp:
+	* orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h:
+	* orbvscs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp:
+	* orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h:
+	* orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp:
+	* orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h:
+	* orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp:
+	* orbsvc/orbsvcs/FaultTolerance/FT_Service_Activate.h:
+	* orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp:
+	* orbsvcs/orbsvcs/Trader/Service_Type_Repository.h: More fixes for
+	  FORTE 6.1.
+
 Fri May 11 07:39:27 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* tao/Client_Priority_Policy.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
index c58ac773f8d..c912a460477 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
@@ -64,7 +64,7 @@ CORBA::Object_ptr
 TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
                                      int argc, char *argv[],
                                      CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC (())
+   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
index 56cd976ad96..fcfbc9e01bb 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
@@ -48,7 +48,7 @@ class TAO_Event_Export TAO_CEC_Event_Loader : public TAO_Object_Loader
                                    int argc, char *argv[],
                                    CORBA::Environment
                                    &ACE_TRY_ENV)
-     ACE_THROW_SPEC (());
+     ACE_THROW_SPEC ((CORBA::SystemException));
 
  protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
index 067f3b8ff2a..07472f4c717 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
@@ -33,7 +33,7 @@ TAO_CEC_ProxyPullConsumer::~TAO_CEC_ProxyPullConsumer (void)
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
 TAO_CEC_ProxyPullConsumer::activate (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC (())
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPullConsumer_var result;
   ACE_TRY
@@ -51,7 +51,7 @@ TAO_CEC_ProxyPullConsumer::activate (CORBA::Environment &ACE_TRY_ENV)
 
 void
 TAO_CEC_ProxyPullConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC (())
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
index 4e7416c3813..9408c41e940 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
@@ -56,11 +56,11 @@ public:
   virtual ~TAO_CEC_ProxyPullConsumer (void);
   // destructor...
 
-  virtual CosEventChannelAdmin::ProxyPullConsumer_ptr activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (());
+  virtual CosEventChannelAdmin::ProxyPullConsumer_ptr activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException));
   // Activate in the POA
 
   virtual void deactivate (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC (());
+    ACE_THROW_SPEC ((CORBA::SystemException));
   // Deactivate from the POA
 
   CORBA::Boolean is_connected (void) const;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
index 1932bb080bb..31f687d9ed8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
@@ -32,7 +32,7 @@ TAO_CEC_ProxyPullSupplier::~TAO_CEC_ProxyPullSupplier (void)
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
 TAO_CEC_ProxyPullSupplier::activate (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC (())
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPullSupplier_var result;
   ACE_TRY
@@ -50,7 +50,7 @@ TAO_CEC_ProxyPullSupplier::activate (CORBA::Environment &ACE_TRY_ENV)
 
 void
 TAO_CEC_ProxyPullSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC (())
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
index a84eaf99687..49ee1f1970f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
@@ -60,11 +60,11 @@ public:
   virtual ~TAO_CEC_ProxyPullSupplier (void);
   // destructor...
 
-  virtual CosEventChannelAdmin::ProxyPullSupplier_ptr activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (());
+  virtual CosEventChannelAdmin::ProxyPullSupplier_ptr activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException));
   // Activate in the POA
 
   virtual void deactivate (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC (());
+    ACE_THROW_SPEC ((CORBA::SystemException));
   // Deactivate from the POA
 
   CORBA::Boolean is_connected (void) const;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
index 2d4cfedc482..56bbf4cb21d 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
@@ -30,7 +30,7 @@ template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
     peer_connected (PEER *peer,
                     CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC (())
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Peer_Connected<PROXY,PEER> worker (peer);
 
@@ -41,7 +41,7 @@ template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
     peer_reconnected (PEER *peer,
                       CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC (())
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Peer_Reconnected<PROXY,PEER> worker (peer);
 
@@ -52,7 +52,7 @@ template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
     peer_disconnected (PEER *peer,
                        CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC (())
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Peer_Disconnected<PROXY,PEER> worker (peer);
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
index 6c48183e553..39481c7def0 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
@@ -68,7 +68,7 @@ public:
    */
   virtual void peer_connected (PEER *peer,
                                CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC (());
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
    * A <peer> has reconnected, i.e. its client has invoked the
@@ -78,7 +78,7 @@ public:
    */
   virtual void peer_reconnected (PEER *peer,
                                  CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC (());
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
    * A <peer> has been disconnected. The default implementation
@@ -87,7 +87,7 @@ public:
    */
   virtual void peer_disconnected (PEER *peer,
                                   CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC (());
+      ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
index 4f4195444cd..2fb7fe83069 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
@@ -40,7 +40,7 @@ TAO_FT_Service_Activate::init (int /*argc*/,
 
 TAO_Service_Callbacks *
 TAO_FT_Service_Activate::activate_services (TAO_ORB_Core *orb_core)
-  ACE_THROW_SPEC (())
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_FT_Service_Callbacks *ft_service_callback = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h
index 85a4075a565..c862b9dda6e 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h
@@ -51,7 +51,7 @@ public:
   // Initializes object when dynamic linking occurs.
 
   virtual TAO_Service_Callbacks *activate_services (TAO_ORB_Core *orb)
-    ACE_THROW_SPEC (());
+    ACE_THROW_SPEC ((CORBA::SystemException));
   // Create and activate the service callbacks into the orb.
   // This method cannot throw any exception, but it can return a nil
   // object to indicate an error condition.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
index 19de411621e..a0530aec8ac 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
@@ -38,7 +38,7 @@ TAO_Service_Type_Repository::~TAO_Service_Type_Repository (void)
 
 CosTradingRepos::ServiceTypeRepository::IncarnationNumber
 TAO_Service_Type_Repository::incarnation (CORBA::Environment &)
-      ACE_THROW_SPEC (())
+      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTradingRepos::ServiceTypeRepository::IncarnationNumber inc_num;
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
index a7889dba4fd..40991128986 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
@@ -38,7 +38,7 @@ public:
 
   virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber
     incarnation (CORBA::Environment &)
-      ACE_THROW_SPEC (());
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber
   add_type (const char *name,
@@ -231,7 +231,7 @@ public:
                                    ACE_Equal_To<TAO_String_Hash_Key>,
                                    ACE_Null_Mutex>
                                    Service_Type_Map_Iterator;
-  
+
   void fully_describe_type_i (const CosTradingRepos::ServiceTypeRepository::TypeStruct &type_struct,
                               CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
                               CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
index 07612ebec92..d190ec83050 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
@@ -190,7 +190,7 @@ CORBA::Object_ptr
 TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
                                    int argc, char *argv[],
                                    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC (())
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Duplicate the ORB
   CORBA::ORB_var orb = CORBA::ORB::_duplicate (orb_ptr);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
index a24ed62c372..2536febca92 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
@@ -52,7 +52,7 @@ public:
   CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                    int argc, char *argv[],
                                    CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC (());
+    ACE_THROW_SPEC ((CORBA::SystemException));
   // This function call initializes the Trading Service given a reference to the
   // ORB and the command line parameters.