ChangeLogTag: Thu Oct 20 13:01:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 42 insertions, 42 deletions

diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
index 62d29914e6c..e2107878934 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
@@ -28,21 +28,21 @@ Roundtrip_Handler::test_method (Test::Timestamp send_time
                                 ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->pending_callbacks_--;
+  --this->pending_callbacks_;
 
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->latency_stats_.sample (now - send_time);
 }
 
 void
-Roundtrip_Handler::test_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+Roundtrip_Handler::test_method_excep (::Messaging::ExceptionHolder *holder
                                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      this->pending_callbacks_--;
-      holder->raise_test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
+      --this->pending_callbacks_;
+      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -59,13 +59,13 @@ Roundtrip_Handler::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Roundtrip_Handler::shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
+Roundtrip_Handler::shutdown_excep (::Messaging::ExceptionHolder *holder
                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
index 4c944306dbb..213377e6629 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
@@ -32,13 +32,13 @@ public:
   virtual void test_method (Test::Timestamp send_time
                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+  virtual void test_method_excep (::Messaging::ExceptionHolder *holder
                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
+  virtual void shutdown_excep (::Messaging::ExceptionHolder *holder
                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
index 4ebe5921394..cbd5f79b272 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
@@ -30,21 +30,21 @@ Roundtrip_Handler::test_octet_method (Test::Timestamp send_time
                                       ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->pending_callbacks_--;
+  --this->pending_callbacks_;
 
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->latency_stats_.sample (now - send_time);
 }
 
 void
-Roundtrip_Handler::test_octet_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+Roundtrip_Handler::test_octet_method_excep (::Messaging::ExceptionHolder *holder
                                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      this->pending_callbacks_--;
-      holder->raise_test_octet_method (ACE_ENV_SINGLE_ARG_PARAMETER);
+      --this->pending_callbacks_;
+      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -61,21 +61,21 @@ Roundtrip_Handler::test_char_method (Test::Timestamp send_time
                                      ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->pending_callbacks_--;
+  --this->pending_callbacks_;
 
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->latency_stats_.sample (now - send_time);
 }
 
 void
-Roundtrip_Handler::test_char_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+Roundtrip_Handler::test_char_method_excep (::Messaging::ExceptionHolder *holder
                                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      this->pending_callbacks_--;
-      holder->raise_test_char_method (ACE_ENV_SINGLE_ARG_PARAMETER);
+      --this->pending_callbacks_;
+      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -92,21 +92,21 @@ Roundtrip_Handler::test_long_method (Test::Timestamp send_time
                                      ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->pending_callbacks_--;
+  --this->pending_callbacks_;
 
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->latency_stats_.sample (now - send_time);
 }
 
 void
-Roundtrip_Handler::test_long_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+Roundtrip_Handler::test_long_method_excep (::Messaging::ExceptionHolder *holder
                                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      this->pending_callbacks_--;
-      holder->raise_test_long_method (ACE_ENV_SINGLE_ARG_PARAMETER);
+      --this->pending_callbacks_;
+      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -123,21 +123,21 @@ Roundtrip_Handler::test_short_method (Test::Timestamp send_time
                                       ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->pending_callbacks_--;
+  --this->pending_callbacks_;
 
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->latency_stats_.sample (now - send_time);
 }
 
 void
-Roundtrip_Handler::test_short_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+Roundtrip_Handler::test_short_method_excep (::Messaging::ExceptionHolder *holder
                                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      this->pending_callbacks_--;
-      holder->raise_test_short_method (ACE_ENV_SINGLE_ARG_PARAMETER);
+      --this->pending_callbacks_;
+      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -154,21 +154,21 @@ Roundtrip_Handler::test_double_method (Test::Timestamp send_time
                                        ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->pending_callbacks_--;
+  --this->pending_callbacks_;
 
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->latency_stats_.sample (now - send_time);
 }
 
 void
-Roundtrip_Handler::test_double_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+Roundtrip_Handler::test_double_method_excep (::Messaging::ExceptionHolder *holder
                                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      this->pending_callbacks_--;
-      holder->raise_test_double_method (ACE_ENV_SINGLE_ARG_PARAMETER);
+      --this->pending_callbacks_;
+      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -185,21 +185,21 @@ Roundtrip_Handler::test_longlong_method (Test::Timestamp send_time
                                          ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->pending_callbacks_--;
+  --this->pending_callbacks_;
 
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->latency_stats_.sample (now - send_time);
 }
 
 void
-Roundtrip_Handler::test_longlong_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+Roundtrip_Handler::test_longlong_method_excep (::Messaging::ExceptionHolder *holder
                                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      this->pending_callbacks_--;
-      holder->raise_test_longlong_method (ACE_ENV_SINGLE_ARG_PARAMETER);
+      --this->pending_callbacks_;
+      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -219,13 +219,13 @@ Roundtrip_Handler::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Roundtrip_Handler::shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
+Roundtrip_Handler::shutdown_excep (::Messaging::ExceptionHolder *holder
                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
index 0589a8007ac..dd3b92aaf7d 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
@@ -33,7 +33,7 @@ public:
                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void test_octet_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+  virtual void test_octet_method_excep (::Messaging::ExceptionHolder *holder
                                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -41,7 +41,7 @@ public:
   virtual void test_char_method (Test::Timestamp send_time
                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_char_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+  virtual void test_char_method_excep (::Messaging::ExceptionHolder *holder
                                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -49,15 +49,15 @@ public:
   virtual void test_long_method  (Test::Timestamp send_time
                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_long_method_excep (Test::AMI_RoundtripExceptionHolder *holder
-                                        ACE_ENV_ARG_DECL)
+  virtual void test_long_method_excep (::Messaging::ExceptionHolder *holder
+                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The skeleton methods for test short load
   virtual void test_short_method (Test::Timestamp send_time
                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_short_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+  virtual void test_short_method_excep (::Messaging::ExceptionHolder *holder
                                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -65,7 +65,7 @@ public:
   virtual void test_longlong_method (Test::Timestamp send_time
                                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_longlong_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+  virtual void test_longlong_method_excep (::Messaging::ExceptionHolder *holder
                                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -73,7 +73,7 @@ public:
   virtual void test_double_method (Test::Timestamp send_time
                                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_double_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+  virtual void test_double_method_excep (::Messaging::ExceptionHolder *holder
                                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -81,7 +81,7 @@ public:
 
   virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
+  virtual void shutdown_excep (::Messaging::ExceptionHolder *holder
                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));