ChangeLogTag:Thu Aug 28 19:38:38 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

8 files changed, 35 insertions, 26 deletions

diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index 03234d134b5..71d42fb09b7 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,14 @@
+Thu Aug 28 19:38:38 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* tao/ClientRequestInfo_i.cpp:
+	* tao/ClientRequestInterceptor_Adapter.cpp:
+	* tao/Invocation_Adapter.cpp:
+	* tao/Synch_Invocation.cpp:
+	* tao/Messaging/Asynch_Invocation.h:
+	* tao/RTCORBA/RT_Endpoint_Utils.cpp: Fixed compilation errors when
+	  native exceptions are turned off. Most of the compilation errors
+	  are due to wrong macros usage. 
+
 Thu Aug 28 18:36:29 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* tests/Portable_Interceptors/Dynamic/client.cpp:
diff --git a/TAO/tao/ClientRequestInfo_i.cpp b/TAO/tao/ClientRequestInfo_i.cpp
index 3a77ede2977..73f60dd2e5c 100644
--- a/TAO/tao/ClientRequestInfo_i.cpp
+++ b/TAO/tao/ClientRequestInfo_i.cpp
@@ -82,7 +82,7 @@ TAO_ClientRequestInfo_i::setup_picurrent (void)
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo_i::target (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_i::target (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   /*if (CORBA::is_nil (this->target_))
@@ -106,7 +106,7 @@ TAO_ClientRequestInfo_i::target (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo_i::effective_target (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_i::effective_target (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   /*if (this->reply_status_ == PortableInterceptor::LOCATION_FORWARD)
@@ -500,7 +500,7 @@ CORBA::Any *
 TAO_ClientRequestInfo_i::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->invocation_->result ();
+  return this->invocation_->result (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Boolean
diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.cpp b/TAO/tao/ClientRequestInterceptor_Adapter.cpp
index 49a25ff7c48..9695f3526d9 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter.cpp
+++ b/TAO/tao/ClientRequestInterceptor_Adapter.cpp
@@ -210,9 +210,7 @@ namespace TAO
   {
     ri->forward_reference (exc);
 
-    this->invocation_->forwarded_reference (exc.forward.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->invocation_->forwarded_reference (exc.forward.in ());
 
     // receive_other() is potentially invoked recursively.
     this->receive_other (ri
diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp
index 4ac101ed4c9..bf1b252a22b 100644
--- a/TAO/tao/Invocation_Adapter.cpp
+++ b/TAO/tao/Invocation_Adapter.cpp
@@ -197,11 +197,12 @@ namespace TAO
       this->target_->_stubobj ();
 
     if (stub == 0)
-      ACE_THROW (CORBA::INTERNAL (
-                   CORBA::SystemException::_tao_minor_code (
-                     TAO_DEFAULT_MINOR_CODE,
-                     EINVAL),
-                   CORBA::COMPLETED_NO));
+      ACE_THROW_RETURN (CORBA::INTERNAL (
+                          CORBA::SystemException::_tao_minor_code (
+                            TAO_DEFAULT_MINOR_CODE,
+                            EINVAL),
+                          CORBA::COMPLETED_NO),
+                        0);
 
     return stub;
   }
@@ -218,11 +219,12 @@ namespace TAO
         && this->mode_ == TAO_ASYNCHRONOUS_CALLBACK_INVOCATION)
       {
 
-        ACE_THROW (CORBA::INTERNAL (
-               CORBA::SystemException::_tao_minor_code (
-                 TAO_DEFAULT_MINOR_CODE,
-                 EINVAL),
-               CORBA::COMPLETED_NO));
+        ACE_THROW_RETURN (CORBA::INTERNAL (
+            CORBA::SystemException::_tao_minor_code (
+                TAO_DEFAULT_MINOR_CODE,
+                EINVAL),
+            CORBA::COMPLETED_NO),
+                          TAO_INVOKE_FAILURE);
       }
 
     ACE_Time_Value tmp_wait_time;
diff --git a/TAO/tao/Messaging/Asynch_Invocation.h b/TAO/tao/Messaging/Asynch_Invocation.h
index 99b7f59bcd5..aaa7f4a677f 100644
--- a/TAO/tao/Messaging/Asynch_Invocation.h
+++ b/TAO/tao/Messaging/Asynch_Invocation.h
@@ -46,7 +46,7 @@ namespace TAO
                               bool response_expected = true);
 
     Invocation_Status remote_invocation (ACE_Time_Value *value
-                                         ACE_ENV_SINGLE_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::Exception));
 
   private:
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
index 216606c262a..5c9e4b9161a 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
@@ -93,7 +93,7 @@ TAO_RT_Endpoint_Utils::client_protocol_policy (TAO_GIOP_Invocation *invocation
     {
       retval =
         rt_stub->effective_client_protocol (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::INV_POLICY, ex)
     {
@@ -128,7 +128,7 @@ TAO_RT_Endpoint_Utils::client_protocol_policy (
     {
       retval =
         rt_stub->effective_client_protocol (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::INV_POLICY, ex)
     {
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index 38242303394..c6f5e16a37d 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -402,11 +402,12 @@ namespace TAO
     this->resolver_.stub ()->add_forward_profiles (stubobj->base_profiles ());
 
     if (this->resolver_.stub ()->next_profile () == 0)
-      ACE_THROW (CORBA::TRANSIENT (
+      ACE_THROW_RETURN (CORBA::TRANSIENT (
         CORBA::SystemException::_tao_minor_code (
           TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE,
           errno),
-        CORBA::COMPLETED_NO));
+        CORBA::COMPLETED_NO),
+                        TAO_INVOKE_FAILURE);
 
     mon.set_status (TAO_INVOKE_RESTART);
 
diff --git a/TAO/tao/TODO b/TAO/tao/TODO
index 5474053734b..e15163af250 100644
--- a/TAO/tao/TODO
+++ b/TAO/tao/TODO
@@ -35,8 +35,6 @@
 
 . Interaction between location forward and collocation.
 
-. Ask Jai to include a test for out parameters in Interceptors
-
 . Memory leaks with Transport, run valgrind in Param_Test
 
 . Move traits classes in the header file to the cpp file.
@@ -45,15 +43,14 @@
 
 . Try a build with MESSAGING == 0;
 
-. Real-time CORBA
+. Real-time CORBA testing
 
 . Code set translators 
 
-. Collocation and generated code
-
 . Complete documentation
 
 . Add the BAD_PARAM exception for bounded strings
 
 . Different versions of GIOP
 
+. What about AMH