diff options
Diffstat (limited to 'TAO/DevGuideExamples/NotifyService/Messenger')
6 files changed, 6 insertions, 21 deletions
diff --git a/TAO/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp b/TAO/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp index 79c2da91195..2528e7ffb55 100644 --- a/TAO/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp +++ b/TAO/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp @@ -86,7 +86,6 @@ CORBA::Boolean Messenger_i::send_message ( const char * user_name, const char * subject, char *& message) - throw (CORBA::SystemException) { ACE_OS::printf("Message from: %s\nSubject: %s\nMessage: %s\n", @@ -126,4 +125,3 @@ CORBA::Boolean Messenger_i::send_message ( return 1; } - diff --git a/TAO/DevGuideExamples/NotifyService/Messenger/Messenger_i.h b/TAO/DevGuideExamples/NotifyService/Messenger/Messenger_i.h index 20928c59ae5..07686c54325 100644 --- a/TAO/DevGuideExamples/NotifyService/Messenger/Messenger_i.h +++ b/TAO/DevGuideExamples/NotifyService/Messenger/Messenger_i.h @@ -15,8 +15,7 @@ class Messenger_i : public POA_Messenger CORBA::Boolean send_message (const char * user_name, const char * subject, - char *& message) - throw (CORBA::SystemException); + char *& message); private: CORBA::ORB_var orb_; diff --git a/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp b/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp index 6c1835709ee..9db5dde03bc 100644 --- a/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp +++ b/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp @@ -13,8 +13,6 @@ void StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event ) - throw (CORBA::SystemException, CosEventComm::Disconnected) - { std::cout << "event received " << std::endl; @@ -30,7 +28,6 @@ StructuredEventConsumer_i::push_structured_event( void StructuredEventConsumer_i::disconnect_structured_push_consumer() - throw (CORBA::SystemException) { CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); @@ -47,6 +44,5 @@ StructuredEventConsumer_i::offer_change( const CosNotification::EventTypeSeq &, const CosNotification::EventTypeSeq & ) - throw (CORBA::SystemException, CosNotifyComm::InvalidEventType) { } diff --git a/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h b/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h index 1199e45021e..dc7b62a9a6e 100644 --- a/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h +++ b/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h @@ -13,18 +13,14 @@ public: virtual void push_structured_event( const CosNotification::StructuredEvent ¬ification - ) - throw (CORBA::SystemException, CosEventComm::Disconnected); + ); virtual void offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - - throw (CORBA::SystemException, CosNotifyComm::InvalidEventType); + ); - virtual void disconnect_structured_push_consumer() - throw (CORBA::SystemException); + virtual void disconnect_structured_push_consumer(); private: CORBA::ORB_var orb_; diff --git a/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp b/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp index 3d7e0257c4a..cafef802cb6 100644 --- a/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp +++ b/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp @@ -10,7 +10,6 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) void StructuredEventSupplier_i::disconnect_structured_push_supplier () - throw(CORBA::SystemException) { CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); @@ -27,7 +26,6 @@ StructuredEventSupplier_i::subscription_change ( const CosNotification::EventTypeSeq &, const CosNotification::EventTypeSeq & ) - throw (CORBA::SystemException, CosNotifyComm::InvalidEventType) { } diff --git a/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h b/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h index e36692fde7a..30fea5628d3 100644 --- a/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h +++ b/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h @@ -11,14 +11,12 @@ class StructuredEventSupplier_i : public: // Constructor StructuredEventSupplier_i(CORBA::ORB_ptr orb); - virtual void disconnect_structured_push_supplier () - throw(CORBA::SystemException); + virtual void disconnect_structured_push_supplier (); virtual void subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - throw (CORBA::SystemException, CosNotifyComm::InvalidEventType); + ); private: CORBA::ORB_var orb_; }; |