diff options
Diffstat (limited to 'TAO/DevGuideExamples/Messaging')
5 files changed, 5 insertions, 14 deletions
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp index 1dfb3f8c828..ad31f84aeab 100644 --- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp +++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp @@ -20,9 +20,7 @@ void MessengerHandler::send_message ( CORBA::Boolean ami_return_val, const char * message, CORBA::Long time - ) - throw (CORBA::SystemException) - + ) { if (ami_return_val) { @@ -44,7 +42,6 @@ void MessengerHandler::send_message ( } void MessengerHandler::send_message_excep (Messaging::ExceptionHolder* excep_holder) - throw (CORBA::SystemException) { // We'll print an error message and shut down the orb try @@ -57,4 +54,3 @@ void MessengerHandler::send_message_excep (Messaging::ExceptionHolder* excep_hol } orb_->shutdown(0); } - diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h index 4a77d92742d..986654f44d4 100644 --- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h +++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h @@ -18,13 +18,11 @@ virtual void send_message ( CORBA::Boolean ami_return_val, const char * message, CORBA::Long time - ) - throw(CORBA::SystemException); + ); virtual void send_message_excep ( Messaging::ExceptionHolder * excep_holder - ) - throw(CORBA::SystemException); + ); int message_was_sent() diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp index e80cab4fb2e..820971c777c 100644 --- a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp +++ b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp @@ -30,7 +30,6 @@ CORBA::Boolean Messenger_i::send_message ( char *& message, CORBA::Long_out time_sent ) - throw (CORBA::SystemException, MessengerUnableToSendMessage) { if (throw_exception_) { diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h index 61785d4edf2..2cc2587c3eb 100644 --- a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h +++ b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h @@ -32,8 +32,7 @@ virtual CORBA::Boolean send_message ( const char * subject, char *& message, CORBA::Long_out time_sent - ) - throw (CORBA::SystemException, MessengerUnableToSendMessage); + ); private: // Specify an amount of time to wait inside diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h index af12e09474a..98be27c4cdd 100644 --- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h +++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h @@ -30,8 +30,7 @@ virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, char *& message - ) - throw(CORBA::SystemException); + ); }; |