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

12 files changed, 28 insertions, 12 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 1af31a8757d..7cc54330669 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,18 @@
+Fri May 11 07:39:27 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* tao/Client_Priority_Policy.cpp:
+	* tao/Client_Priority_Policy.h:
+	* tao/LocalObject.cpp:
+	* tao/LocalObject.h:
+	* tao/Object.cpp:
+	* tao/Object.h:
+	* tao/Services_Activate.h:
+	* tao/PortableServer/Collocated_Object.cpp:
+	* tao/PortableServer/Collocated_Object.h:
+	* tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp:
+	* tao/TypeCodeFactory/TypeCodeFactory_Loader.h: Fixed compilation
+	  errors for FORTE 6.1. 
+
 Thu May 10 22:31:22 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* performance-tests/POA/Object_Creation_And_Registration/registration.cpp:
diff --git a/TAO/tao/Client_Priority_Policy.cpp b/TAO/tao/Client_Priority_Policy.cpp
index d93c9fc35e8..2067b12ce75 100644
--- a/TAO/tao/Client_Priority_Policy.cpp
+++ b/TAO/tao/Client_Priority_Policy.cpp
@@ -26,7 +26,7 @@ TAO_Client_Priority_Policy::TAO_Client_Priority_Policy (const TAO_Client_Priorit
 
 TAO::PrioritySpecification
 TAO_Client_Priority_Policy::priority_specification (CORBA::Environment &)
-  ACE_THROW_SPEC (())
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->priority_spec_;
 }
diff --git a/TAO/tao/Client_Priority_Policy.h b/TAO/tao/Client_Priority_Policy.h
index c5e0ba8ae49..bf84663c518 100644
--- a/TAO/tao/Client_Priority_Policy.h
+++ b/TAO/tao/Client_Priority_Policy.h
@@ -63,7 +63,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         CORBA::Environment::default_environment ()
     )
-    ACE_THROW_SPEC (());
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
   virtual CORBA::PolicyType policy_type (
       CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
     )
diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp
index 45843769958..49ffa4fc154 100644
--- a/TAO/tao/LocalObject.cpp
+++ b/TAO/tao/LocalObject.cpp
@@ -58,7 +58,7 @@ CORBA_LocalObject::_hash (CORBA::ULong maximum,
 CORBA::Boolean
 CORBA_LocalObject::_is_equivalent (CORBA_Object_ptr other_obj,
                                    CORBA_Environment &)
-  ACE_THROW_SPEC (())
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return (other_obj == this) ? 1 : 0;
 }
diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h
index a28279b84c7..f31ef3b4063 100644
--- a/TAO/tao/LocalObject.h
+++ b/TAO/tao/LocalObject.h
@@ -167,7 +167,7 @@ public:
   virtual CORBA::Boolean _is_equivalent (CORBA_Object_ptr other_obj,
                                          CORBA_Environment &ACE_TRY_ENV =
                                              TAO_default_environment ())
-    ACE_THROW_SPEC (());
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = Reference count managment.
   /// Increment the reference count.
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 61eb9ca0b44..11b4f4b2e83 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -165,7 +165,7 @@ CORBA_Object::_hash (CORBA::ULong maximum,
 CORBA::Boolean
 CORBA_Object::_is_equivalent (CORBA_Object_ptr other_obj,
                               CORBA::Environment &)
-    ACE_THROW_SPEC (())
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (other_obj == this)
     {
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index a3ab7ce91e5..cecb7bb3e4b 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -187,7 +187,7 @@ public:
   virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj,
                                          CORBA_Environment &ACE_TRY_ENV =
                                              TAO_default_environment ())
-    ACE_THROW_SPEC (());
+    ACE_THROW_SPEC ((CORBA::SystemEception));
 
   /// Return the object key as an out parameter.  Caller should release
   /// return value when finished with it.
diff --git a/TAO/tao/PortableServer/Collocated_Object.cpp b/TAO/tao/PortableServer/Collocated_Object.cpp
index 944a336a861..2a570a99520 100644
--- a/TAO/tao/PortableServer/Collocated_Object.cpp
+++ b/TAO/tao/PortableServer/Collocated_Object.cpp
@@ -81,7 +81,7 @@ TAO_Collocated_Object::_is_a (const CORBA::Char *logical_type_id,
 CORBA::Boolean
 TAO_Collocated_Object::_is_equivalent (CORBA_Object_ptr other_obj,
                                        CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC (())
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean equivalent =
     this->CORBA_Object::_is_equivalent (other_obj, ACE_TRY_ENV);
diff --git a/TAO/tao/PortableServer/Collocated_Object.h b/TAO/tao/PortableServer/Collocated_Object.h
index 8949a219e8a..a193a6ac8f9 100644
--- a/TAO/tao/PortableServer/Collocated_Object.h
+++ b/TAO/tao/PortableServer/Collocated_Object.h
@@ -54,7 +54,7 @@ public:
                                   TAO_default_environment ());
   virtual CORBA::Boolean _is_equivalent (CORBA_Object_ptr other_obj,
                                          CORBA::Environment &)
-    ACE_THROW_SPEC (());
+    ACE_THROW_SPEC ((CORBA::SystemException));
 #if (TAO_HAS_MINIMUM_CORBA == 0)
   virtual CORBA::Boolean _non_existent (CORBA_Environment &ACE_TRY_ENV =
                                           TAO_default_environment ());
diff --git a/TAO/tao/Services_Activate.h b/TAO/tao/Services_Activate.h
index 79bf4b6531b..fa37c6eee7d 100644
--- a/TAO/tao/Services_Activate.h
+++ b/TAO/tao/Services_Activate.h
@@ -52,7 +52,7 @@ public:
    * object to indicate an error condition.
    */
   virtual TAO_Service_Callbacks* activate_services (TAO_ORB_Core *orb)
-    ACE_THROW_SPEC (()) = 0;
+    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
 };
 
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
index d4b9a94da70..7dbaaa872fd 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
@@ -28,7 +28,7 @@ TAO_TypeCodeFactory_Loader::create_object (CORBA::ORB_ptr,
                                            int,
                                            char * [],
                                            CORBA::Environment &)
-  ACE_THROW_SPEC (())
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_ptr obj;
   ACE_NEW_RETURN (obj,
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
index 13b6d9ce41c..0addfac4159 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class TAO_TypeCodeFactory_Export TAO_TypeCodeFactory_Loader 
+class TAO_TypeCodeFactory_Export TAO_TypeCodeFactory_Loader
   : public TAO_Object_Loader
 {
   // = TITLE
@@ -40,7 +40,7 @@ public:
                                            int argc,
                                            char *argv [],
                                            CORBA::Environment &)
-    ACE_THROW_SPEC (());
+    ACE_THROW_SPEC ((CORBA::SystemException));
   // Overload the base class method to create a new instance
   // of a TypeCodeFactory object.