diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-12 07:54:49 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-12 07:54:49 +0000 |
| commit | 7aa9fc442f7fa830226f128a0c72af6d3ae49905 (patch) | |
| tree | ca67b90f907b4280abebcd8718d992fd8a8dd2f3 | |
| parent | fa9c845ca5d5bb3130669ce3bb53177dc26b983a (diff) | |
| download | ATCD-7aa9fc442f7fa830226f128a0c72af6d3ae49905.tar.gz | |
Mon Feb 12 06:50:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
508 files changed, 3232 insertions, 17184 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 1d38abfb415..91703c551b6 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -81,8 +81,6 @@ TAO_Basic_StreamCtrl::TAO_Basic_StreamCtrl (void) // Empty the_spec means apply operation to all flows void TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow)) { try { @@ -125,8 +123,6 @@ TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec) // Empty the_spec means apply operation to all flows void TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow)) { try { @@ -172,8 +168,6 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec) void TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow)) { try { @@ -218,9 +212,6 @@ CORBA::Boolean TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & /*new_qos*/, const AVStreams::flowSpec &/*flowspec*/) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed)) { return 1; } @@ -229,7 +220,6 @@ TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & /*new_qos*/, // E.g., loss of flow, reestablishment of flow, etc.. void TAO_Basic_StreamCtrl::push_event (const struct CosPropertyService::Property &/*the_event*/) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) Recieved event \"")); @@ -240,9 +230,6 @@ void TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &flow_spec, const char *fp_name, const CORBA::Any &fp_settings) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::FPError)) { if (!CORBA::is_nil (this->sep_a_.in ())) @@ -254,9 +241,6 @@ TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &flow_spec, // Gets the flow connection. CORBA::Object_ptr TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::notSupported)) { ACE_CString flow_name_key (flow_name); AVStreams::FlowConnection_var flow_connection_entry; @@ -274,9 +258,6 @@ TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name) void TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name, CORBA::Object_ptr flow_connection_obj) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::notSupported)) { AVStreams::FlowConnection_var flow_connection; try @@ -311,7 +292,6 @@ TAO_Basic_StreamCtrl::~TAO_Basic_StreamCtrl (void) CORBA::Boolean TAO_Negotiator::negotiate (AVStreams::Negotiator_ptr /* remote_negotiator */, const AVStreams::streamQoS &/* qos_spec */) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "TAO_Negotiator::negotiate\n")); @@ -441,8 +421,6 @@ TAO_StreamCtrl::~TAO_StreamCtrl (void) // Empty the_spec means apply operation to all flows void TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow)) { try { @@ -472,8 +450,6 @@ TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec) // Empty the_spec means apply operation to all flows void TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow)) { try { @@ -505,8 +481,6 @@ TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec) // Empty the_spec means apply operation to all flows void TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow)) { try { @@ -546,10 +520,6 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, AVStreams::MMDevice_ptr b_party, AVStreams::streamQoS &the_qos, const AVStreams::flowSpec &the_flows) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed)) { try { @@ -881,10 +851,6 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, AVStreams::StreamEndPoint_B_ptr sep_b, AVStreams::streamQoS &stream_qos, const AVStreams::flowSpec &flow_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed)) { this->sep_a_ = AVStreams::StreamEndPoint_A::_duplicate(sep_a); this->sep_b_ = AVStreams::StreamEndPoint_B::_duplicate(sep_b); @@ -1147,8 +1113,6 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, void TAO_StreamCtrl::unbind (void) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed)) { try { @@ -1180,26 +1144,18 @@ TAO_StreamCtrl::unbind (void) void TAO_StreamCtrl::unbind_party (AVStreams::StreamEndPoint_ptr /* the_ep */, const AVStreams::flowSpec &/* the_spec */) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::noSuchFlow)) { } void TAO_StreamCtrl::unbind_dev (AVStreams::MMDevice_ptr /* dev */, const AVStreams::flowSpec & /* the_spec */) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::noSuchFlow)) { } AVStreams::VDev_ptr TAO_StreamCtrl::get_related_vdev (AVStreams::MMDevice_ptr adev, AVStreams::StreamEndPoint_out sep) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed)) { MMDevice_Map_Hash_Key key (adev); MMDevice_Map_Entry entry; @@ -1219,9 +1175,6 @@ CORBA::Boolean TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -1324,9 +1277,6 @@ CORBA::Boolean TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer, AVStreams::streamQoS & qos, const AVStreams::flowSpec & flow_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::QoSRequestFailed, - AVStreams::streamOpFailed)) { try { @@ -1350,7 +1300,6 @@ TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer, // In future this should be a multicast message instead of point-to-point unicasts. void TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configuration) - ACE_THROW_SPEC ((CORBA::SystemException)) { Peer_Info *info; try @@ -1373,7 +1322,6 @@ TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configurati void TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properties &initial) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->initial_configuration_ = initial; } @@ -1382,8 +1330,6 @@ TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properti void TAO_MCastConfigIf::set_format (const char * flowName, const char * format_name) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported)) { Peer_Info *info; try @@ -1409,9 +1355,6 @@ TAO_MCastConfigIf::set_format (const char * flowName, void TAO_MCastConfigIf::set_dev_params (const char * flowName, const CosPropertyService::Properties & new_params) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::PropertyException, - AVStreams::streamOpFailed)) { Peer_Info *info; try @@ -1596,10 +1539,6 @@ CORBA::Boolean TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, AVStreams::streamQoS &qos, const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed, - AVStreams::streamOpFailed)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::Connect ()\n")); @@ -1784,8 +1723,6 @@ TAO_StreamEndPoint::translate_qos (const AVStreams::streamQoS& application_qos, void TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow)) { // Make the upcall into the app this->handle_stop (flow_spec); @@ -1834,8 +1771,6 @@ TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec) // Empty the_spec --> apply to all flows void TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::start\n")); // Make the upcall into the app @@ -1923,8 +1858,6 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec) // Close the connection void TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow)) { CORBA::Any_var vdev_any = this->get_property_value ("Related_VDev"); @@ -2055,11 +1988,6 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato CORBA::Boolean /*is_mcast*/, AVStreams::streamQoS &qos, AVStreams::flowSpec &flow_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpDenied, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed, - AVStreams::FPError)) { if (TAO_debug_level > 0) @@ -2179,9 +2107,6 @@ TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos, CORBA::Boolean TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &the_flows) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -2200,7 +2125,6 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, CORBA::Boolean TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &protocols) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -2223,9 +2147,6 @@ TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &pro void TAO_StreamEndPoint::disconnect (const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::streamOpFailed)) { ACE_UNUSED_ARG (the_spec); } @@ -2236,9 +2157,6 @@ void TAO_StreamEndPoint::set_FPStatus (const AVStreams::flowSpec &/*the_spec*/, const char *fp_name, const CORBA::Any &fp_settings) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::FPError)) { if (ACE_OS::strcmp (fp_name, "SFP1.0") != 0) return; @@ -2249,9 +2167,6 @@ TAO_StreamEndPoint::set_FPStatus (const AVStreams::flowSpec &/*the_spec*/, CORBA::Object_ptr TAO_StreamEndPoint::get_fep (const char *flow_name) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported, - AVStreams::noSuchFlow)) { ACE_CString fep_name_key (flow_name); AVStreams::FlowEndPoint_var fep_entry; @@ -2262,9 +2177,6 @@ TAO_StreamEndPoint::get_fep (const char *flow_name) char* TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported, - AVStreams::streamOpFailed)) { ACE_CString flow_name; @@ -2292,9 +2204,6 @@ TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep) char* TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported, - AVStreams::streamOpFailed)) { CORBA::String_var flow_name; try @@ -2316,9 +2225,6 @@ TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep) char * TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported, - AVStreams::streamOpFailed)) { AVStreams::FlowEndPoint_var fep = AVStreams::FlowEndPoint::_narrow (fep_obj); @@ -2357,9 +2263,6 @@ TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj) void TAO_StreamEndPoint::remove_fep (const char *flow_name) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported, - AVStreams::streamOpFailed)) { try { @@ -2389,7 +2292,6 @@ TAO_StreamEndPoint::remove_fep (const char *flow_name) // Sets the negotiator object. void TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -2411,7 +2313,6 @@ TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator) void TAO_StreamEndPoint::set_key (const char *flow_name, const AVStreams::key & the_key) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -2432,7 +2333,6 @@ TAO_StreamEndPoint::set_key (const char *flow_name, // Set the source id. void TAO_StreamEndPoint::set_source_id (CORBA::Long source_id) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->source_id_ = source_id; } @@ -2490,10 +2390,6 @@ TAO_StreamEndPoint_A::TAO_StreamEndPoint_A (void) CORBA::Boolean TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, AVStreams::flowSpec &flow_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed, - AVStreams::streamOpFailed)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPointA::multiconnect\n")); try @@ -2667,11 +2563,6 @@ CORBA::Boolean TAO_StreamEndPoint_A::connect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */, AVStreams::streamQoS & /* the_qos */, const AVStreams::flowSpec & /* the_flows */) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed, - AVStreams::notSupported)) { throw AVStreams::notSupported (); } @@ -2681,10 +2572,6 @@ void TAO_StreamEndPoint_A::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */, const AVStreams::flowSpec & /* theSpec */) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::noSuchFlow, - AVStreams::notSupported)) { throw AVStreams::notSupported (); @@ -2708,11 +2595,6 @@ TAO_StreamEndPoint_B::TAO_StreamEndPoint_B (void) CORBA::Boolean TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos, AVStreams::flowSpec &flow_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed, - AVStreams::FPError)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint_B::multiconnect\n")); try @@ -2847,10 +2729,6 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, AVStreams::VDev_ptr the_peer_dev, AVStreams::streamQoS &the_qos, const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed, - AVStreams::streamOpFailed)) { ACE_UNUSED_ARG (the_qos); ACE_UNUSED_ARG (the_spec); @@ -2905,10 +2783,6 @@ TAO_VDev::set_Mcast_peer (AVStreams::StreamCtrl_ptr /* the_ctrl */, AVStreams::MCastConfigIf_ptr mcast_peer, AVStreams::streamQoS &/* the_qos */, const AVStreams::flowSpec &/* the_spec */) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed, - AVStreams::streamOpFailed)) { this->mcast_peer_ = AVStreams::MCastConfigIf::_duplicate (mcast_peer); return 1; @@ -2917,9 +2791,6 @@ TAO_VDev::set_Mcast_peer (AVStreams::StreamCtrl_ptr /* the_ctrl */, // applications should override this to handle configuration changes. void TAO_VDev::configure (const CosPropertyService::Property &/*the_config_mesg*/) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::PropertyException, - AVStreams::streamOpFailed)) { } @@ -2927,8 +2798,6 @@ TAO_VDev::configure (const CosPropertyService::Property &/*the_config_mesg*/) void TAO_VDev::set_format (const char *flowName, const char *format_name) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported)) { try { @@ -2953,9 +2822,6 @@ TAO_VDev::set_format (const char *flowName, void TAO_VDev::set_dev_params (const char *flowName, const CosPropertyService::Properties &new_params) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::PropertyException, - AVStreams::streamOpFailed)) { try { @@ -2980,9 +2846,6 @@ TAO_VDev::set_dev_params (const char *flowName, CORBA::Boolean TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos, const AVStreams::flowSpec &flowspec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -3045,10 +2908,6 @@ TAO_MMDevice::bind (AVStreams::MMDevice_ptr peer_device, AVStreams::streamQoS &the_qos, CORBA::Boolean_out is_met, const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed)) { AVStreams::StreamCtrl_ptr streamctrl (AVStreams::StreamCtrl::_nil ()); try @@ -3078,10 +2937,6 @@ TAO_MMDevice::bind_mcast (AVStreams::MMDevice_ptr first_peer, AVStreams::streamQoS &the_qos, CORBA::Boolean_out is_met, const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed)) { ACE_UNUSED_ARG (first_peer); ACE_UNUSED_ARG (the_qos); @@ -3268,12 +3123,6 @@ TAO_MMDevice::create_A (AVStreams::StreamCtrl_ptr streamctrl, CORBA::Boolean_out met_qos, char *&named_vdev, const AVStreams::flowSpec &flow_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::streamOpDenied, - AVStreams::notSupported, - AVStreams::QoSRequestFailed, - AVStreams::noSuchFlow)) { AVStreams::StreamEndPoint_A_ptr sep_a = 0; AVStreams::StreamEndPoint_var sep; @@ -3301,12 +3150,6 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl, CORBA::Boolean_out met_qos, char *&named_vdev, const AVStreams::flowSpec &flow_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::streamOpDenied, - AVStreams::notSupported, - AVStreams::QoSRequestFailed, - AVStreams::noSuchFlow)) { AVStreams::StreamEndPoint_B_ptr sep_b = AVStreams::StreamEndPoint_B::_nil (); AVStreams::StreamEndPoint_var sep; @@ -3331,8 +3174,6 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl, void TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr /* the_ep */, const char * /* vdev_name */) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported)) { // Remove self from POA. Because of reference counting, the POA // will automatically delete the servant when all pending requests @@ -3344,9 +3185,6 @@ TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr /* the_ep */, char * TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported, - AVStreams::streamOpFailed)) { char* tmp; ACE_NEW_RETURN (tmp, @@ -3374,9 +3212,6 @@ TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev) // Adds the fdev object to the MMDevice. char * TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported, - AVStreams::streamOpFailed)) { CORBA::String_var flow_name; AVStreams::FDev_var fdev; @@ -3432,9 +3267,6 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj) // Gets the FDev object associated with this flow. CORBA::Object_ptr TAO_MMDevice::get_fdev (const char *flow_name) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported, - AVStreams::noSuchFlow)) { ACE_CString fdev_name_key (flow_name); @@ -3447,10 +3279,6 @@ TAO_MMDevice::get_fdev (const char *flow_name) // Removes the fdev from this MMDevice. void TAO_MMDevice::remove_fdev (const char *flow_name) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported, - AVStreams::noSuchFlow, - AVStreams::streamOpFailed)) { try { @@ -3519,7 +3347,6 @@ TAO_FlowConnection::set_protocol (const char *protocol) // stop this flow. void TAO_FlowConnection::stop (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -3550,7 +3377,6 @@ TAO_FlowConnection::stop (void) // start this flow. void TAO_FlowConnection::start (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -3581,7 +3407,6 @@ TAO_FlowConnection::start (void) // destroy this flow. void TAO_FlowConnection::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -3615,8 +3440,6 @@ TAO_FlowConnection::destroy (void) // modify the QoS for this flow. CORBA::Boolean TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::QoSRequestFailed)) { ACE_UNUSED_ARG (new_qos); return 0; @@ -3626,9 +3449,6 @@ TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos) CORBA::Boolean TAO_FlowConnection::use_flow_protocol (const char * fp_name, const CORBA::Any & fp_settings) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::FPError, - AVStreams::notSupported)) { this->fp_name_ = fp_name; this->fp_settings_ = fp_settings; @@ -3655,7 +3475,6 @@ TAO_FlowConnection::use_flow_protocol (const char * fp_name, void TAO_FlowConnection::push_event (const AVStreams::streamEvent & the_event) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG (the_event); } @@ -3664,10 +3483,6 @@ CORBA::Boolean TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party, AVStreams::FDev_ptr b_party, AVStreams::QoS & flow_qos) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::streamOpDenied, - AVStreams::QoSRequestFailed)) { CORBA::Boolean result = 0; try @@ -3703,10 +3518,6 @@ CORBA::Boolean TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer, AVStreams::FlowConsumer_ptr consumer, AVStreams::QoS & the_qos) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::formatMismatch, - AVStreams::FEPMismatch, - AVStreams::alreadyConnected)) { try { @@ -3766,7 +3577,6 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer, CORBA::Boolean TAO_FlowConnection::disconnect (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } @@ -3774,9 +3584,6 @@ TAO_FlowConnection::disconnect (void) CORBA::Boolean TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer, AVStreams::QoS & the_qos) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::alreadyConnected, - AVStreams::notSupported)) { try { @@ -3866,8 +3673,6 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer, CORBA::Boolean TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer, AVStreams::QoS & the_qos) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::alreadyConnected)) { try { @@ -3954,8 +3759,6 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer, CORBA::Boolean TAO_FlowConnection::drop (AVStreams::FlowEndPoint_ptr target) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notConnected)) { ACE_UNUSED_ARG (target); return 0; @@ -4036,7 +3839,6 @@ TAO_FlowEndPoint::set_flowname (const char *flowname) // the same flowendpoint. CORBA::Boolean TAO_FlowEndPoint::lock (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // lock the current flowendpoint @@ -4049,7 +3851,6 @@ TAO_FlowEndPoint::lock (void) // unlocks the flowendpoint , becomes free to be used in another flow. void TAO_FlowEndPoint::unlock (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->lock_ = 0; } @@ -4057,7 +3858,6 @@ TAO_FlowEndPoint::unlock (void) void TAO_FlowEndPoint::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { int result = TAO_AV_Core::deactivate_servant (this); if (result < 0) @@ -4070,7 +3870,6 @@ TAO_FlowEndPoint::destroy (void) AVStreams::StreamEndPoint_ptr TAO_FlowEndPoint::related_sep (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return AVStreams::StreamEndPoint::_duplicate (this->related_sep_.in ()); @@ -4078,21 +3877,18 @@ TAO_FlowEndPoint::related_sep (void) void TAO_FlowEndPoint::related_sep (AVStreams::StreamEndPoint_ptr related_sep) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->related_sep_ = AVStreams::StreamEndPoint::_duplicate (related_sep); } AVStreams::FlowConnection_ptr TAO_FlowEndPoint::related_flow_connection (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return AVStreams::FlowConnection::_duplicate (this->related_flow_connection_.in ()); } void TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->related_flow_connection_ = AVStreams::FlowConnection::_duplicate (related_flow_connection); } @@ -4100,9 +3896,6 @@ TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related // returns the connected peer for this flow AVStreams::FlowEndPoint_ptr TAO_FlowEndPoint::get_connected_fep (void) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notConnected, - AVStreams::notSupported)) { return AVStreams::FlowEndPoint::_duplicate (this->peer_fep_.in ()); } @@ -4110,9 +3903,6 @@ TAO_FlowEndPoint::get_connected_fep (void) CORBA::Boolean TAO_FlowEndPoint::use_flow_protocol (const char * fp_name, const CORBA::Any &) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::FPError, - AVStreams::notSupported)) { try { @@ -4133,8 +3923,6 @@ TAO_FlowEndPoint::use_flow_protocol (const char * fp_name, void TAO_FlowEndPoint::set_format (const char * format) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported)) { this->format_ = format; try @@ -4154,9 +3942,6 @@ TAO_FlowEndPoint::set_format (const char * format) void TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_settings) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::PropertyException, - AVStreams::streamOpFailed)) { this->dev_params_ = new_settings; try @@ -4175,8 +3960,6 @@ TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_set void TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & protocols) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported)) { try { @@ -4211,9 +3994,6 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot CORBA::Boolean TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::formatMismatch, - AVStreams::deviceQosMismatch)) { const char *exception_message = ""; try @@ -4293,9 +4073,6 @@ CORBA::Boolean TAO_FlowEndPoint::set_peer (AVStreams::FlowConnection_ptr /* the_fc */, AVStreams::FlowEndPoint_ptr the_peer_fep, AVStreams::QoS & /* the_qos */) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::QoSRequestFailed, - AVStreams::streamOpFailed)) { this->peer_fep_ = AVStreams::FlowEndPoint::_duplicate (the_peer_fep); @@ -4306,8 +4083,6 @@ CORBA::Boolean TAO_FlowEndPoint::set_Mcast_peer (AVStreams::FlowConnection_ptr /* the_fc */, AVStreams::MCastConfigIf_ptr mcast_peer, AVStreams::QoS & /* the_qos */) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::QoSRequestFailed)) { this->mcast_peer_ = AVStreams::MCastConfigIf::_duplicate (mcast_peer); return 0; @@ -4319,10 +4094,6 @@ TAO_FlowEndPoint::go_to_listen_i (TAO_FlowSpec_Entry::Role role, CORBA::Boolean /*is_mcast*/, AVStreams::FlowEndPoint_ptr peer_fep, char *& flowProtocol) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::failedToListen, - AVStreams::FPError, - AVStreams::QoSRequestFailed)) { char direction [BUFSIZ]; switch (role) @@ -4407,10 +4178,6 @@ TAO_FlowEndPoint::connect_to_peer_i (TAO_FlowSpec_Entry::Role role, AVStreams::QoS & /*the_qos*/, const char * address, const char * use_flow_protocol) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::failedToConnect, - AVStreams::FPError, - AVStreams::QoSRequestFailed)) { char direction [BUFSIZ]; switch (role) @@ -4470,7 +4237,6 @@ TAO_FlowProducer::TAO_FlowProducer (const char *flowname, // gets the reverse channel for feedback. char * TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } @@ -4478,7 +4244,6 @@ TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/) // The start, stop and destroy are to be handled by the application. void TAO_FlowProducer::stop (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end (); for (TAO_AV_FlowSpecSetItor begin = this->flow_spec_set_.begin (); @@ -4491,7 +4256,6 @@ TAO_FlowProducer::stop (void) void TAO_FlowProducer::start (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end (); for (TAO_AV_FlowSpecSetItor begin = this->flow_spec_set_.begin (); @@ -4514,10 +4278,6 @@ TAO_FlowProducer::go_to_listen (AVStreams::QoS & the_qos, CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer_fep, char *& flowProtocol) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::failedToListen, - AVStreams::FPError, - AVStreams::QoSRequestFailed)) { return this->go_to_listen_i (TAO_FlowSpec_Entry::TAO_AV_PRODUCER, the_qos, @@ -4530,10 +4290,6 @@ CORBA::Boolean TAO_FlowProducer::connect_to_peer (AVStreams::QoS & the_qos, const char * address, const char * use_flow_protocol) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::failedToConnect, - AVStreams::FPError, - AVStreams::QoSRequestFailed)) { return this->connect_to_peer_i (TAO_FlowSpec_Entry::TAO_AV_PRODUCER, the_qos, @@ -4546,11 +4302,6 @@ TAO_FlowProducer::connect_mcast (AVStreams::QoS & /* the_qos */, CORBA::Boolean_out /* is_met */, const char *address, const char * use_flow_protocol) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::failedToConnect, - AVStreams::notSupported, - AVStreams::FPError, - AVStreams::QoSRequestFailed)) { // The address variable gives the multicast address to subscribe to. for (u_int i=0;i<this->protocols_.length ();i++) @@ -4589,7 +4340,6 @@ TAO_FlowProducer::connect_mcast (AVStreams::QoS & /* the_qos */, // sets the key for this flow. void TAO_FlowProducer::set_key (const AVStreams::key & the_key) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -4607,7 +4357,6 @@ TAO_FlowProducer::set_key (const AVStreams::key & the_key) // source id to be used to distinguish this source from others. void TAO_FlowProducer::set_source_id (CORBA::Long source_id) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->source_id_ = source_id; } @@ -4632,7 +4381,6 @@ TAO_FlowConsumer::TAO_FlowConsumer (const char *flowname, // The start, stop and destroy are to be handled by the application. void TAO_FlowConsumer::stop (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end (); for (TAO_AV_FlowSpecSetItor begin = this->flow_spec_set_.begin (); @@ -4642,7 +4390,6 @@ TAO_FlowConsumer::stop (void) void TAO_FlowConsumer::start (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end (); for (TAO_AV_FlowSpecSetItor begin = this->flow_spec_set_.begin (); @@ -4657,10 +4404,6 @@ TAO_FlowConsumer::go_to_listen (AVStreams::QoS & the_qos, CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer_fep, char *& flowProtocol) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::failedToListen, - AVStreams::FPError, - AVStreams::QoSRequestFailed)) { return this->go_to_listen_i (TAO_FlowSpec_Entry::TAO_AV_CONSUMER, the_qos, @@ -4673,10 +4416,6 @@ CORBA::Boolean TAO_FlowConsumer::connect_to_peer (AVStreams::QoS & the_qos, const char * address, const char * use_flow_protocol) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::failedToConnect, - AVStreams::FPError, - AVStreams::QoSRequestFailed)) { return this->connect_to_peer_i (TAO_FlowSpec_Entry::TAO_AV_CONSUMER, the_qos, diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index e71d0896172..27eb4180aa7 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -83,60 +83,41 @@ public: /// Stop the transfer of data of the stream /// Empty the_spec means apply operation to all flows - virtual void stop (const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow)); + virtual void stop (const AVStreams::flowSpec &the_spec); /// Start the transfer of data in the stream. /// Empty the_spec means apply operation to all flows - virtual void start (const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow)); + virtual void start (const AVStreams::flowSpec &the_spec); /** * Tears down the stream. This will close the connection, and delete * the streamendpoint and vdev associated with this stream * Empty the_spec means apply operation to all flows */ - virtual void destroy (const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow)); + virtual void destroy (const AVStreams::flowSpec &the_spec); /// Changes the QoS associated with the stream /// Empty the_spec means apply operation to all flows virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed)); + const AVStreams::flowSpec &the_spec); /// Used by StreamEndPoint and VDev to inform StreamCtrl of events. /// E.g., loss of flow, reestablishment of flow, etc.. - virtual void push_event (const struct CosPropertyService::Property & the_event) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push_event (const struct CosPropertyService::Property & the_event); /// Used to control the flow protocol parameters. virtual void set_FPStatus (const AVStreams::flowSpec &the_spec, const char *fp_name, - const CORBA::Any &fp_settings) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::FPError)); + const CORBA::Any &fp_settings); /// Not implemented in the light profile, will raise the notsupported /// exception - virtual CORBA::Object_ptr get_flow_connection (const char *flow_name) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::notSupported)); + virtual CORBA::Object_ptr get_flow_connection (const char *flow_name); /// Not implemented in the light profile, will raise the notsupported /// exception virtual void set_flow_connection (const char *flow_name, - CORBA::Object_ptr flow_connection) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::notSupported)); + CORBA::Object_ptr flow_connection); protected: @@ -169,8 +150,7 @@ class TAO_AV_Export TAO_Negotiator { public: virtual CORBA::Boolean negotiate (AVStreams::Negotiator_ptr remote_negotiator, - const AVStreams::streamQoS &qos_spec) - ACE_THROW_SPEC ((CORBA::SystemException)); + const AVStreams::streamQoS &qos_spec); }; class TAO_MCastConfigIf; @@ -226,24 +206,18 @@ public: /// Stop the transfer of data of the stream /// Empty the_spec means apply operation to all flows - virtual void stop (const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow)); + virtual void stop (const AVStreams::flowSpec &the_spec); /// Start the transfer of data in the stream. /// Empty the_spec means apply operation to all flows - virtual void start (const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow)); + virtual void start (const AVStreams::flowSpec &the_spec); /** * Tears down the stream. This will close the connection, and delete * the streamendpoint and vdev associated with this stream * Empty the_spec means apply operation to all flows */ - virtual void destroy (const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow)); + virtual void destroy (const AVStreams::flowSpec &the_spec); /** * Establish a stream between a_party and b_party, @@ -255,11 +229,7 @@ public: virtual CORBA::Boolean bind_devs (AVStreams::MMDevice_ptr a_party, AVStreams::MMDevice_ptr b_party, AVStreams::streamQoS& the_qos, - const AVStreams::flowSpec& the_flows) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed)); + const AVStreams::flowSpec& the_flows); /** * Establish a connection between two streamendpoints. This can @@ -269,42 +239,25 @@ public: virtual CORBA::Boolean bind (AVStreams::StreamEndPoint_A_ptr a_party, AVStreams::StreamEndPoint_B_ptr b_party, AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &the_flows) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed)); + const AVStreams::flowSpec &the_flows); virtual void unbind_dev (AVStreams::MMDevice_ptr dev, - const AVStreams::flowSpec & the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::noSuchFlow)); + const AVStreams::flowSpec & the_spec); /// Unbind the_ep from the stream. Empty the_spec means apply to all flows. virtual void unbind_party (AVStreams::StreamEndPoint_ptr the_ep, - const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::noSuchFlow)); + const AVStreams::flowSpec &the_spec); /// unbind the stream. Same effect as Basic_StreamCtrl::destroy () - virtual void unbind (void) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed)); + virtual void unbind (void); virtual AVStreams::VDev_ptr get_related_vdev (AVStreams::MMDevice_ptr adev, - AVStreams::StreamEndPoint_out sep) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed)); + AVStreams::StreamEndPoint_out sep); /// Changes the QoS associated with the stream /// Empty the_spec means apply operation to all flows virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed)); + const AVStreams::flowSpec &the_spec); protected: @@ -351,28 +304,18 @@ public: virtual CORBA::Boolean set_peer (CORBA::Object_ptr peer, AVStreams::streamQoS & the_qos, - const AVStreams::flowSpec & the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::QoSRequestFailed, - AVStreams::streamOpFailed)); + const AVStreams::flowSpec & the_spec); - virtual void configure (const CosPropertyService::Property & a_configuration) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void configure (const CosPropertyService::Property & a_configuration); - virtual void set_initial_configuration (const CosPropertyService::Properties & initial) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void set_initial_configuration (const CosPropertyService::Properties & initial); virtual void set_format (const char * flowName, - const char * format_name) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported)); + const char * format_name); virtual void set_dev_params (const char * flowName, const CosPropertyService::Properties & new_params) - - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::PropertyException, - AVStreams::streamOpFailed)); +; protected: /// checks whether the flowname is in the flow_spec. @@ -520,99 +463,62 @@ public: TAO_StreamEndPoint (void); /// Stop the stream. Empty the_spec means, for all the flows - virtual void stop (const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow)); + virtual void stop (const AVStreams::flowSpec &the_spec); /// Start the stream, Empty the_spec means, for all the flows - virtual void start (const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow)); + virtual void start (const AVStreams::flowSpec &the_spec); /// Destroy the stream, Empty the_spec means, for all the flows - virtual void destroy (const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow)); + virtual void destroy (const AVStreams::flowSpec &the_spec); /// Called by StreamCtrl. responder is the peer to connect to virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder, AVStreams::streamQoS& qos_spec, - const AVStreams::flowSpec& the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed, - AVStreams::streamOpFailed)); + const AVStreams::flowSpec& the_spec); /// Called by the peer StreamEndPoint. The flow_spec indicates the /// flows (which contain transport addresses etc.) virtual CORBA::Boolean request_connection (AVStreams::StreamEndPoint_ptr initiator, CORBA::Boolean is_mcast, AVStreams::streamQoS &qos, - AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpDenied, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed, - AVStreams::FPError)); + AVStreams::flowSpec &the_spec); /// Change the transport qos on a stream virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &the_flows) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed)); + const AVStreams::flowSpec &the_flows); virtual int change_qos (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &the_flows); /// Used to restrict the set of protocols - virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec); /// disconnect the flows - virtual void disconnect (const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::streamOpFailed)); + virtual void disconnect (const AVStreams::flowSpec &the_spec); /// Used to control the flow virtual void set_FPStatus (const AVStreams::flowSpec &the_spec, const char *fp_name, - const CORBA::Any &fp_settings) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::FPError)); + const CORBA::Any &fp_settings); /// Not implemented in the light profile, throws notsupported - virtual CORBA::Object_ptr get_fep (const char *flow_name) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported, - AVStreams::noSuchFlow)); + virtual CORBA::Object_ptr get_fep (const char *flow_name); /// Not implemented in the light profile, throws notsupported - virtual char * add_fep (CORBA::Object_ptr the_fep) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported, - AVStreams::streamOpFailed)); + virtual char * add_fep (CORBA::Object_ptr the_fep); /// Not implemented in the light profile, throws notsupported - virtual void remove_fep (const char *fep_name) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported, - AVStreams::streamOpFailed)); + virtual void remove_fep (const char *fep_name); /// Used to "attach" a negotiator to the endpoint - virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator); /// Used for public key encryption. virtual void set_key (const char *flow_name, - const AVStreams::key & the_key) - ACE_THROW_SPEC ((CORBA::SystemException)); + const AVStreams::key & the_key); /// Used to set a unique id for packets sent by this streamendpoint - virtual void set_source_id (CORBA::Long source_id) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void set_source_id (CORBA::Long source_id); /// Destructor virtual ~TAO_StreamEndPoint (void); @@ -622,14 +528,8 @@ public: protected: /// Helper methods to implement add_fep() - char* add_fep_i (AVStreams::FlowEndPoint_ptr fep) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported, - AVStreams::streamOpFailed)); - char* add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported, - AVStreams::streamOpFailed)); + char* add_fep_i (AVStreams::FlowEndPoint_ptr fep); + char* add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep); /// translate from application level to network level qos. int translate_qos (const AVStreams::streamQoS& application_qos, @@ -690,29 +590,16 @@ public: /// Used for ATM-style multicast virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, - AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed, - AVStreams::streamOpFailed)); + AVStreams::flowSpec &the_spec); /// Used for ATM-style multicast virtual CORBA::Boolean connect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep, AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &the_flows) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed, - AVStreams::notSupported)); + const AVStreams::flowSpec &the_flows); /// Used to remove a multicast leaf virtual void disconnect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep, - const AVStreams::flowSpec &theSpec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::noSuchFlow, - AVStreams::notSupported)); + const AVStreams::flowSpec &theSpec); /// Destructor virtual ~TAO_StreamEndPoint_A (void); @@ -739,12 +626,7 @@ public: /// Used for internet-style multicast virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, - AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed, - AVStreams::FPError)); + AVStreams::flowSpec &the_spec); /// Destructor virtual ~TAO_StreamEndPoint_B (void); @@ -768,47 +650,28 @@ public: virtual CORBA::Boolean set_peer (AVStreams::StreamCtrl_ptr the_ctrl, AVStreams::VDev_ptr the_peer_dev, AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed, - AVStreams::streamOpFailed)); + const AVStreams::flowSpec &the_spec); /// Used to set the streamctrl and multicast device virtual CORBA::Boolean set_Mcast_peer (AVStreams::StreamCtrl_ptr the_ctrl, AVStreams::MCastConfigIf_ptr a_mcastconfigif, AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed, - AVStreams::streamOpFailed)); + const AVStreams::flowSpec &the_spec); /// Called by the peer VDev to configure the device (catch all) - virtual void configure (const CosPropertyService::Property &the_config_mesg) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::PropertyException, - AVStreams::streamOpFailed)); + virtual void configure (const CosPropertyService::Property &the_config_mesg); /// Used to set a format on a flowname virtual void set_format (const char *flowName, - const char *format_name) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported)); + const char *format_name); /// Used to set device parameters virtual void set_dev_params (const char *flowName, - const CosPropertyService::Properties &new_params) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::PropertyException, - AVStreams::streamOpFailed)); + const CosPropertyService::Properties &new_params); /// Called to change QoS of the device virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed)); + const AVStreams::flowSpec &the_spec); protected: /// Destructor for a servant should be protected or private. @@ -858,21 +721,13 @@ public: virtual AVStreams::StreamCtrl_ptr bind (AVStreams::MMDevice_ptr peer_device, AVStreams::streamQoS &the_qos, CORBA::Boolean_out is_met, - const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed)); + const AVStreams::flowSpec &the_spec); /// Multicast bind virtual AVStreams::StreamCtrl_ptr bind_mcast (AVStreams::MMDevice_ptr first_peer, AVStreams::streamQoS &the_qos, CORBA::Boolean_out is_met, - const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed)); + const AVStreams::flowSpec &the_spec); /// Called by StreamCtrl to create a "A" type streamandpoint and vdev virtual AVStreams::StreamEndPoint_A_ptr create_A (AVStreams::StreamCtrl_ptr the_requester, @@ -880,13 +735,7 @@ public: AVStreams::streamQoS &the_qos, CORBA::Boolean_out met_qos, char *&named_vdev, - const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::streamOpDenied, - AVStreams::notSupported, - AVStreams::QoSRequestFailed, - AVStreams::noSuchFlow)); + const AVStreams::flowSpec &the_spec); /// Called by StreamCtrl to create a "B" type streamandpoint and vdev virtual AVStreams::StreamEndPoint_B_ptr create_B (AVStreams::StreamCtrl_ptr the_requester, @@ -894,48 +743,27 @@ public: AVStreams::streamQoS &the_qos, CORBA::Boolean_out met_qos, char *&named_vdev, - const AVStreams::flowSpec &the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::streamOpDenied, - AVStreams::notSupported, - AVStreams::QoSRequestFailed, - AVStreams::noSuchFlow)); + const AVStreams::flowSpec &the_spec); /// Remove the StreamEndPoint and the related vdev virtual void destroy (AVStreams::StreamEndPoint_ptr the_ep, - const char *vdev_name) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported)); + const char *vdev_name); /// Not supported in the light profile, raises notsupported - virtual char * add_fdev (CORBA::Object_ptr the_fdev) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported, - AVStreams::streamOpFailed)); + virtual char * add_fdev (CORBA::Object_ptr the_fdev); /// Not supported in the light profile, raises notsupported - virtual CORBA::Object_ptr get_fdev (const char *flow_name) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported, - AVStreams::noSuchFlow)); + virtual CORBA::Object_ptr get_fdev (const char *flow_name); /// Not supported in the light profile, raises notsupported - virtual void remove_fdev (const char *flow_name) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported, - AVStreams::noSuchFlow, - AVStreams::streamOpFailed)); + virtual void remove_fdev (const char *flow_name); /// Destructor virtual ~TAO_MMDevice (void); protected: /// Helper method to implement add_fdev() - char* add_fdev_i (AVStreams::FDev_ptr fdev) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported, - AVStreams::streamOpFailed)); + char* add_fdev_i (AVStreams::FDev_ptr fdev); protected: @@ -980,73 +808,48 @@ public: TAO_FlowConnection (void); /// stop this flow. - virtual void stop (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void stop (void); /// start this flow. - virtual void start (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void start (void); /// destroy this flow. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); /// modify the QoS for this flow. - virtual CORBA::Boolean modify_QoS (AVStreams::QoS & new_qos) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::QoSRequestFailed)); + virtual CORBA::Boolean modify_QoS (AVStreams::QoS & new_qos); /// use the specified flow protocol for this flow. virtual CORBA::Boolean use_flow_protocol (const char * fp_name, - const CORBA::Any & fp_settings) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::FPError, - AVStreams::notSupported)); + const CORBA::Any & fp_settings); /// pushes an event , to be handled by the application. - virtual void push_event (const AVStreams::streamEvent & the_event) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push_event (const AVStreams::streamEvent & the_event); /// connect 2 Flow Devices. virtual CORBA::Boolean connect_devs (AVStreams::FDev_ptr a_party, AVStreams::FDev_ptr b_party, - AVStreams::QoS & the_qos) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::streamOpDenied, - AVStreams::QoSRequestFailed)); + AVStreams::QoS & the_qos); /// Connect a flow producer and consumer under this flow connection. virtual CORBA::Boolean connect (AVStreams::FlowProducer_ptr flow_producer, AVStreams::FlowConsumer_ptr flow_consumer, - AVStreams::QoS & the_qos) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::formatMismatch, - AVStreams::FEPMismatch, - AVStreams::alreadyConnected)); + AVStreams::QoS & the_qos); /// disconnect this flow connection. - virtual CORBA::Boolean disconnect (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean disconnect (void); /// adds the producer to this flow connection. virtual CORBA::Boolean add_producer (AVStreams::FlowProducer_ptr flow_producer, - AVStreams::QoS & the_qos) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::alreadyConnected, - AVStreams::notSupported)); + AVStreams::QoS & the_qos); /// adds a consumer to this flow connection. virtual CORBA::Boolean add_consumer (AVStreams::FlowConsumer_ptr flow_consumer, - AVStreams::QoS & the_qos) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::alreadyConnected)); + AVStreams::QoS & the_qos); /// drops a flow endpoint from the flow. - virtual CORBA::Boolean drop (AVStreams::FlowEndPoint_ptr target) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notConnected)); + virtual CORBA::Boolean drop (AVStreams::FlowEndPoint_ptr target); int set_mcast_addr (ACE_CString addr,u_short port); void set_protocol (const char *protocol); @@ -1104,86 +907,58 @@ public: TAO_AV_Protocol_Object *object); /// lock the flow endpoint for a particular flow. - virtual CORBA::Boolean lock (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean lock (void); /// unlock the flow endpoint for subsequent use. - virtual void unlock (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void unlock (void); /// destroy this flow. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); /// get method for the related streamendpoint under which this /// flowendpoint is. - virtual AVStreams::StreamEndPoint_ptr related_sep(void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual AVStreams::StreamEndPoint_ptr related_sep(void); /// set method for the related streamendpoint under which this /// flowendpoint is. - virtual void related_sep (AVStreams::StreamEndPoint_ptr related_sep) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void related_sep (AVStreams::StreamEndPoint_ptr related_sep); - virtual AVStreams::FlowConnection_ptr related_flow_connection(void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual AVStreams::FlowConnection_ptr related_flow_connection(void); // accessor for the related flow connection attribute. /// set method for the related flow connection attribute. - virtual void related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection); /// returns the other flowendpoint to which this is connected. - virtual AVStreams::FlowEndPoint_ptr get_connected_fep (void) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notConnected, - AVStreams::notSupported)); + virtual AVStreams::FlowEndPoint_ptr get_connected_fep (void); //// use the specified flow protocol. virtual CORBA::Boolean use_flow_protocol (const char * fp_name, - const CORBA::Any & fp_settings) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::FPError, - AVStreams::notSupported)); + const CORBA::Any & fp_settings); /// sets the data format. - virtual void set_format (const char * format) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported)); + virtual void set_format (const char * format); /// sets the device parameters. - virtual void set_dev_params (const CosPropertyService::Properties & new_settings) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::PropertyException, - AVStreams::streamOpFailed)); + virtual void set_dev_params (const CosPropertyService::Properties & new_settings); /// sets the list of protocols to be used. - virtual void set_protocol_restriction (const AVStreams::protocolSpec & the_spec) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported)); + virtual void set_protocol_restriction (const AVStreams::protocolSpec & the_spec); /// checks whether the passed flowendpoint is compatible with this. - virtual CORBA::Boolean is_fep_compatible (AVStreams::FlowEndPoint_ptr fep) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::formatMismatch, - AVStreams::deviceQosMismatch)); + virtual CORBA::Boolean is_fep_compatible (AVStreams::FlowEndPoint_ptr fep); /// sets the peer flowendpoint. virtual CORBA::Boolean set_peer (AVStreams::FlowConnection_ptr the_fc, AVStreams::FlowEndPoint_ptr the_peer_fep, - AVStreams::QoS & the_qos) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::QoSRequestFailed, - AVStreams::streamOpFailed)); + AVStreams::QoS & the_qos); /// sets the multicast peer flowendpoint, not implemented. virtual CORBA::Boolean set_Mcast_peer (AVStreams::FlowConnection_ptr the_fc, AVStreams::MCastConfigIf_ptr a_mcastconfigif, - AVStreams::QoS & the_qos) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::QoSRequestFailed)); + AVStreams::QoS & the_qos); /** @@ -1194,20 +969,13 @@ public: virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos, const char * address, const char * use_flow_protocol) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::failedToConnect, - AVStreams::FPError, - AVStreams::QoSRequestFailed)) = 0; + = 0; /// connect to the peer endpoint. virtual CORBA::Boolean connect_to_peer_i (TAO_FlowSpec_Entry::Role role, AVStreams::QoS & the_qos, const char * address, - const char * use_flow_protocol) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::failedToConnect, - AVStreams::FPError, - AVStreams::QoSRequestFailed)); + const char * use_flow_protocol); /** * This should be implemented in both the FlowProducer and consumer and hence is @@ -1218,21 +986,14 @@ public: CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer, char *& flowProtocol) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::failedToListen, - AVStreams::FPError, - AVStreams::QoSRequestFailed)) = 0; + = 0; /// listen request from the peer. virtual char * go_to_listen_i (TAO_FlowSpec_Entry::Role role, AVStreams::QoS & the_qos, CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer, - char *& flowProtocol) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::failedToListen, - AVStreams::FPError, - AVStreams::QoSRequestFailed)); + char *& flowProtocol); protected: @@ -1283,55 +1044,37 @@ public: * UDP if the producer is listening and the consumer connects (logically) then the producer needs to * know the reverse channel on its peer fep to send data to. */ - virtual char * get_rev_channel (const char * pcol_name) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_rev_channel (const char * pcol_name); /// stop this flow, to be overridden by the application. - virtual void stop (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void stop (void); /// start this flow, to be overridden by the application. - virtual void start (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void start (void); virtual char * go_to_listen (AVStreams::QoS & the_qos, CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer, - char *& flowProtocol) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::failedToListen, - AVStreams::FPError, - AVStreams::QoSRequestFailed)); + char *& flowProtocol); virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos, const char * address, - const char * use_flow_protocol) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::failedToConnect, - AVStreams::FPError, - AVStreams::QoSRequestFailed)); + const char * use_flow_protocol); /// connect to the multicast address, not implemented. virtual char * connect_mcast (AVStreams::QoS & the_qos, CORBA::Boolean_out is_met, const char * address, - const char * use_flow_protocol) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::failedToConnect, - AVStreams::notSupported, - AVStreams::FPError, - AVStreams::QoSRequestFailed)); + const char * use_flow_protocol); /// sets the public key to be used for encryption of the data. - virtual void set_key (const AVStreams::key & the_key) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void set_key (const AVStreams::key & the_key); /// sets the source id of this flow producer so that it can be used /// to distinguish this producer from others in the multicast case. - virtual void set_source_id (CORBA::Long source_id) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void set_source_id (CORBA::Long source_id); protected: /// source id of this producer. @@ -1352,29 +1095,19 @@ public: const char *format); /// stop this flow, to be overridden by the application. - virtual void stop (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void stop (void); /// start this flow, to be overridden by the application. - virtual void start (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void start (void); virtual char * go_to_listen (AVStreams::QoS & the_qos, CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer, - char *& flowProtocol) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::failedToListen, - AVStreams::FPError, - AVStreams::QoSRequestFailed)); + char *& flowProtocol); virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos, const char * address, - const char * use_flow_protocol) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::failedToConnect, - AVStreams::FPError, - AVStreams::QoSRequestFailed)); + const char * use_flow_protocol); }; /** @@ -1393,29 +1126,22 @@ public: virtual AVStreams::Position get_media_position (AVStreams::PositionOrigin an_origin, AVStreams::PositionKey a_key) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::MediaControl::PostionKeyNotSupported)) =0; + =0; virtual void set_media_position (const AVStreams::Position & a_position) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::MediaControl::PostionKeyNotSupported, - AVStreams::InvalidPosition)) =0; + =0; virtual void start (const AVStreams::Position & a_position) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::InvalidPosition)) =0; + =0; virtual void pause (const AVStreams::Position & a_position) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::InvalidPosition)) =0; + =0; virtual void resume (const AVStreams::Position & a_position) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::InvalidPosition)) =0; + =0; virtual void stop (const AVStreams::Position & a_position) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::InvalidPosition)) =0; + =0; }; diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp index 19c338b876f..2537084feb1 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp @@ -72,11 +72,6 @@ TAO_FDev<T_Producer, T_Consumer>::create_producer (AVStreams::FlowConnection_ptr AVStreams::QoS & the_qos, CORBA::Boolean_out met_qos, char *& named_fdev) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::streamOpDenied, - AVStreams::notSupported, - AVStreams::QoSRequestFailed)) { // call the bridge method. return this->make_producer (the_requester, @@ -142,11 +137,6 @@ TAO_FDev<T_Producer, T_Consumer>::create_consumer (AVStreams::FlowConnection_ptr AVStreams::QoS & the_qos, CORBA::Boolean_out met_qos, char *& named_fdev) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::streamOpDenied, - AVStreams::notSupported, - AVStreams::QoSRequestFailed)) { return this->make_consumer (the_requester, the_qos, @@ -160,9 +150,6 @@ AVStreams::FlowConnection_ptr TAO_FDev<T_Producer, T_Consumer>::bind (AVStreams::FDev_ptr peer_device, AVStreams::QoS & the_qos, CORBA::Boolean_out is_met) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::QoSRequestFailed)) { ACE_UNUSED_ARG (peer_device); ACE_UNUSED_ARG (the_qos); @@ -176,9 +163,6 @@ AVStreams::FlowConnection_ptr TAO_FDev<T_Producer, T_Consumer>::bind_mcast (AVStreams::FDev_ptr first_peer, AVStreams::QoS & the_qos, CORBA::Boolean_out is_met) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::QoSRequestFailed)) { ACE_UNUSED_ARG (first_peer); ACE_UNUSED_ARG (the_qos); @@ -190,8 +174,6 @@ template <class T_Producer, class T_Consumer> void TAO_FDev<T_Producer, T_Consumer>::destroy (AVStreams::FlowEndPoint_ptr /* the_ep */, const char * /* fdev_name */) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported)) { // @@ Shouldn't the parameters be made use of! // Destroy/delete all the producers and consumers. diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h index d600e9d1a32..7ceecd16b24 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h @@ -47,12 +47,7 @@ public: AVStreams::FlowProducer_ptr create_producer (AVStreams::FlowConnection_ptr the_requester, AVStreams::QoS & the_qos, CORBA::Boolean_out met_qos, - char *& named_fdev) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::streamOpDenied, - AVStreams::notSupported, - AVStreams::QoSRequestFailed)); + char *& named_fdev); /// bridge method for the application to override the producer object /// creation. Default implementation creates a TAO_FlowProducer. @@ -65,12 +60,7 @@ public: virtual AVStreams::FlowConsumer_ptr create_consumer (AVStreams::FlowConnection_ptr the_requester, AVStreams::QoS & the_qos, CORBA::Boolean_out met_qos, - char *& named_fdev) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::streamOpDenied, - AVStreams::notSupported, - AVStreams::QoSRequestFailed)); + char *& named_fdev); /// bridge method for the application to override the consumer object /// creation. Default implementation creates a TAO_FlowConsumer. @@ -82,24 +72,16 @@ public: /// bind this FDev with another FDev. virtual AVStreams::FlowConnection_ptr bind (AVStreams::FDev_ptr peer_device, AVStreams::QoS & the_qos, - CORBA::Boolean_out is_met) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::QoSRequestFailed)); + CORBA::Boolean_out is_met); /// multicast bind is not implemented yet. virtual AVStreams::FlowConnection_ptr bind_mcast (AVStreams::FDev_ptr first_peer, AVStreams::QoS & the_qos, - CORBA::Boolean_out is_met) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::streamOpFailed, - AVStreams::QoSRequestFailed)); + CORBA::Boolean_out is_met); /// destroys this FDev. virtual void destroy (AVStreams::FlowEndPoint_ptr the_ep, - const char * fdev_name) - ACE_THROW_SPEC ((CORBA::SystemException, - AVStreams::notSupported)); + const char * fdev_name); protected: ACE_DLList <TAO_FlowProducer> producer_list_; diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp index 2185c7146c7..308bcd713f7 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp @@ -13,14 +13,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class TARGET> void ACE_PushConsumer_Adapter<TARGET>::push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { target_->push (events); } template<class TARGET> void ACE_PushConsumer_Adapter<TARGET>::disconnect_push_consumer () - ACE_THROW_SPEC ((CORBA::SystemException)) { target_->disconnect_push_consumer (); @@ -28,7 +26,6 @@ ACE_PushConsumer_Adapter<TARGET>::disconnect_push_consumer () template<class TARGET> void ACE_PushSupplier_Adapter<TARGET>::disconnect_push_supplier () - ACE_THROW_SPEC ((CORBA::SystemException)) { target_->disconnect_push_supplier (); } diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h index 5f5a0b217ae..b61b8ebb51f 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h @@ -45,12 +45,10 @@ public: ACE_PushConsumer_Adapter (TARGET *target); /// Forwards to target_. - virtual void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC (( CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet& events); /// Forwards to target_. - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC (( CORBA::SystemException)); + virtual void disconnect_push_consumer (void); private: TARGET *target_; @@ -73,8 +71,7 @@ public: ACE_PushSupplier_Adapter (TARGET *target); /// Forwards to target_. - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC (( CORBA::SystemException)); + virtual void disconnect_push_supplier (void); private: TARGET *target_; diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp index 2a35c3b7c6c..e418dccbd89 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp @@ -92,7 +92,6 @@ CORBA::Boolean CC_LockSet::compatible (CC_LockModeEnum mr) void CC_LockSet::lock (CosConcurrencyControl::lock_mode mode) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "CC_LockSet::lock\n")); @@ -112,7 +111,6 @@ CC_LockSet::lock (CosConcurrencyControl::lock_mode mode) CORBA::Boolean CC_LockSet::try_lock (CosConcurrencyControl::lock_mode mode) - ACE_THROW_SPEC ((CORBA::SystemException)) { CC_LockModeEnum lm = lmconvert (mode); @@ -152,8 +150,6 @@ CC_LockSet::lmconvert (CosConcurrencyControl::lock_mode mode) void CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode) - ACE_THROW_SPEC ((CORBA::SystemException, - CosConcurrencyControl::LockNotHeld)) { ACE_DEBUG ((LM_DEBUG, "CC_LockSet::unlock\n")); @@ -196,8 +192,6 @@ CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode) void CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode, CosConcurrencyControl::lock_mode new_mode) - ACE_THROW_SPEC ((CORBA::SystemException, - CosConcurrencyControl::LockNotHeld)) { ACE_DEBUG ((LM_DEBUG, "CC_LockSet::change_mode\n")); diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h index b38884f9ae8..6ba6b207376 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h @@ -92,24 +92,18 @@ public: // = CosConcurrencyControl methods /// Acquires this lock. Blocks until lock is obtained - virtual void lock (CosConcurrencyControl::lock_mode mode) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void lock (CosConcurrencyControl::lock_mode mode); /// Tries to acquire this lock. If it is not possible to acquire the /// lock, false is returned - virtual CORBA::Boolean try_lock (CosConcurrencyControl::lock_mode mode) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean try_lock (CosConcurrencyControl::lock_mode mode); /// Releases this lock. - virtual void unlock (CosConcurrencyControl::lock_mode mode) - ACE_THROW_SPEC ((CORBA::SystemException, - CosConcurrencyControl::LockNotHeld)); + virtual void unlock (CosConcurrencyControl::lock_mode mode); /// Changes the mode of this lock. virtual void change_mode (CosConcurrencyControl::lock_mode held_mode, - CosConcurrencyControl::lock_mode new_mode) - ACE_THROW_SPEC ((CORBA::SystemException, - CosConcurrencyControl::LockNotHeld)); + CosConcurrencyControl::lock_mode new_mode); // = Debugging methods /// Dump the state of the object to stdout diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp index 092216de5ef..9b7f29ca0e6 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp @@ -28,7 +28,6 @@ CC_LockSetFactory::~CC_LockSetFactory (void) CosConcurrencyControl::LockSet_ptr CC_LockSetFactory::create (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CC_LockSet *ls = 0; @@ -43,7 +42,6 @@ CC_LockSetFactory::create (void) CosConcurrencyControl::LockSet_ptr CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which) - ACE_THROW_SPEC ((CORBA::SystemException)) { CC_LockSet *ls = 0; diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h index a1d1fbd238a..42e2e4184ab 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h @@ -47,12 +47,10 @@ public: /// Destructor. ~CC_LockSetFactory (void); - virtual CosConcurrencyControl::LockSet_ptr create () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosConcurrencyControl::LockSet_ptr create (); virtual CosConcurrencyControl::LockSet_ptr create_related ( - CosConcurrencyControl::LockSet_ptr which) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosConcurrencyControl::LockSet_ptr which); private: /// Lock to serialize the access to the factory. diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp index 85025d207f4..8220dcb8478 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp @@ -61,7 +61,6 @@ CORBA::Object_ptr TAO_Concurrency_Loader::create_object (CORBA::ORB_ptr orb, int /* argc */, char * /* argv */ []) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var object = orb->resolve_initial_references ("RootPOA"); diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h index 56d900178d1..302c7cfd25e 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h @@ -50,8 +50,7 @@ public: /// This function call initializes the Concurrency Service given a /// reference to the ORB and the command line parameters. CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, - int argc, char *argv[]) - ACE_THROW_SPEC ((CORBA::SystemException)); + int argc, char *argv[]); protected: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp index 02f47b5c48b..887b373af45 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp @@ -89,14 +89,12 @@ TAO_CEC_ConsumerAdmin::shutdown (void) CosEventChannelAdmin::ProxyPushSupplier_ptr TAO_CEC_ConsumerAdmin::obtain_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->push_admin_.obtain (); } CosEventChannelAdmin::ProxyPullSupplier_ptr TAO_CEC_ConsumerAdmin::obtain_pull_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->pull_admin_.obtain (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h index 3f85a431cb5..24f70ef42d3 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h @@ -83,11 +83,9 @@ public: // = The CosEventChannelAdmin::ConsumerAdmin methods... virtual CosEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_push_supplier (void); virtual CosEventChannelAdmin::ProxyPullSupplier_ptr - obtain_pull_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_pull_supplier (void); // = The PortableServer::ServantBase methods virtual PortableServer::POA_ptr _default_POA (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp index f5ae3599809..96a058330cc 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp @@ -22,7 +22,6 @@ TAO_CEC_DynamicImplementationServer::~TAO_CEC_DynamicImplementationServer (void) // The DSI invoke request void TAO_CEC_DynamicImplementationServer::invoke (CORBA::ServerRequest_ptr request) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Trap the _is_a request if (ACE_OS::strcmp ("_is_a", request->operation () ) == 0) @@ -67,7 +66,6 @@ TAO_CEC_DynamicImplementationServer::invoke (CORBA::ServerRequest_ptr request) CORBA::RepositoryId TAO_CEC_DynamicImplementationServer::_primary_interface (const PortableServer::ObjectId &, PortableServer::POA_ptr) - ACE_THROW_SPEC (()) { return CORBA::string_dup (repository_id_); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h index dbaf7a259b7..e4e0257a061 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h @@ -42,17 +42,13 @@ public: virtual ~TAO_CEC_DynamicImplementationServer (void); // = The DynamicImplementation methods. - virtual void invoke (CORBA::ServerRequest_ptr request) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void invoke (CORBA::ServerRequest_ptr request); virtual CORBA::RepositoryId _primary_interface ( const PortableServer::ObjectId &oid, - PortableServer::POA_ptr poa - ) - ACE_THROW_SPEC (()); + PortableServer::POA_ptr poa); - virtual PortableServer::POA_ptr _default_POA ( - ); + virtual PortableServer::POA_ptr _default_POA (void); // Handles the _is_a call virtual void is_a (CORBA::ServerRequest_ptr request); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp index 3decba50304..dfdf410281a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp @@ -181,21 +181,18 @@ TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullSupplier* supplier) CosEventChannelAdmin::ConsumerAdmin_ptr TAO_CEC_EventChannel::for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->consumer_admin_->_this (); } CosEventChannelAdmin::SupplierAdmin_ptr TAO_CEC_EventChannel::for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->supplier_admin_->_this (); } void TAO_CEC_EventChannel::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->shutdown (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h index d26f2731cea..3154f1c4fde 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h @@ -231,18 +231,15 @@ public: /// The default implementation is: /// this->consumer_admin ()->_this (env); virtual CosEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + for_consumers (void); /// The default implementation is: /// this->supplier_admin ()->_this (env); virtual CosEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + for_suppliers (void); /// Commit suicide. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); ServantRetryMap& get_servant_retry_map (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index e2259d6df85..e8f7e35a480 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -82,7 +82,6 @@ CORBA::Object_ptr TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, int argc, ACE_TCHAR *argv[]) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h index 4af10142439..81e5490e03a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h @@ -59,8 +59,7 @@ public: */ virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, - ACE_TCHAR *argv[]) - ACE_THROW_SPEC ((CORBA::SystemException)); + ACE_TCHAR *argv[]); //@} protected: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp index 53a57550bd7..de916724b81 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp @@ -45,7 +45,6 @@ TAO_CEC_ProxyPullConsumer::~TAO_CEC_ProxyPullConsumer (void) void TAO_CEC_ProxyPullConsumer::activate ( CosEventChannelAdmin::ProxyPullConsumer_ptr &activated_proxy) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPullConsumer_var result; try @@ -61,7 +60,6 @@ TAO_CEC_ProxyPullConsumer::activate ( void TAO_CEC_ProxyPullConsumer::deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -259,8 +257,6 @@ TAO_CEC_ProxyPullConsumer::_decr_refcnt (void) void TAO_CEC_ProxyPullConsumer::connect_pull_supplier ( CosEventComm::PullSupplier_ptr pull_supplier) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected)) { // Nil PullSuppliers are illegal if (CORBA::is_nil (pull_supplier)) @@ -334,7 +330,6 @@ TAO_CEC_ProxyPullConsumer::apply_policy (CosEventComm::PullSupplier_ptr pre) void TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer () - ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventComm::PullSupplier_var supplier; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h index 4ef91c2091b..aad8a9365cd 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h @@ -58,12 +58,10 @@ public: /// Activate in the POA virtual void activate ( - CosEventChannelAdmin::ProxyPullConsumer_ptr &activated_proxy) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosEventChannelAdmin::ProxyPullConsumer_ptr &activated_proxy); /// Deactivate from the POA - virtual void deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void deactivate (void); /// Return 0 if no supplier is connected... CORBA::Boolean is_connected (void) const; @@ -92,11 +90,8 @@ public: // = The CosEventChannelAdmin::ProxyPullConsumer methods... virtual void connect_pull_supplier ( - CosEventComm::PullSupplier_ptr pull_supplier) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected)); - virtual void disconnect_pull_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosEventComm::PullSupplier_ptr pull_supplier); + virtual void disconnect_pull_consumer (void); // = The Servant methods virtual PortableServer::POA_ptr _default_POA (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp index 787ab1a4bdb..5863632eeab 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp @@ -44,7 +44,6 @@ TAO_CEC_ProxyPullSupplier::~TAO_CEC_ProxyPullSupplier (void) void TAO_CEC_ProxyPullSupplier::activate ( CosEventChannelAdmin::ProxyPullSupplier_ptr &activated_proxy) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPullSupplier_var result; try @@ -60,7 +59,6 @@ TAO_CEC_ProxyPullSupplier::activate ( void TAO_CEC_ProxyPullSupplier::deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -157,8 +155,6 @@ TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event) CORBA::Any * TAO_CEC_ProxyPullSupplier::pull (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)) { if (this->is_connected () == 0) throw CosEventComm::Disconnected (); @@ -178,7 +174,6 @@ TAO_CEC_ProxyPullSupplier::pull (void) CORBA::Any * TAO_CEC_ProxyPullSupplier::try_pull (CORBA::Boolean_out has_event) - ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)) { has_event = 0; if (this->is_connected () == 0) @@ -233,8 +228,6 @@ TAO_CEC_ProxyPullSupplier::_decr_refcnt (void) void TAO_CEC_ProxyPullSupplier::connect_pull_consumer ( CosEventComm::PullConsumer_ptr pull_consumer) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected)) { { ACE_GUARD_THROW_EX ( @@ -304,7 +297,6 @@ TAO_CEC_ProxyPullSupplier::apply_policy (CosEventComm::PullConsumer_ptr pre) void TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier () - ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventComm::PullConsumer_var consumer; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h index 534549e1859..159be9c7807 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h @@ -65,12 +65,10 @@ public: /// Activate in the POA virtual void activate ( - CosEventChannelAdmin::ProxyPullSupplier_ptr &activated_proxy) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosEventChannelAdmin::ProxyPullSupplier_ptr &activated_proxy); /// Deactivate from the POA - virtual void deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void deactivate (void); /// Return 0 if no consumer is connected... CORBA::Boolean is_connected (void) const; @@ -98,15 +96,10 @@ public: // = The CosEventChannelAdmin::ProxyPullSupplier methods... virtual void connect_pull_consumer ( - CosEventComm::PullConsumer_ptr pull_consumer) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected)); - virtual CORBA::Any * pull (void) - ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)); - virtual CORBA::Any * try_pull (CORBA::Boolean_out has_event) - ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)); - virtual void disconnect_pull_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosEventComm::PullConsumer_ptr pull_consumer); + virtual CORBA::Any * pull (void); + virtual CORBA::Any * try_pull (CORBA::Boolean_out has_event); + virtual void disconnect_pull_supplier (void); /// Increment and decrement the reference count. CORBA::ULong _incr_refcnt (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp index 6fad8240c31..57d981a8c27 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp @@ -45,7 +45,6 @@ TAO_CEC_ProxyPushConsumer::~TAO_CEC_ProxyPushConsumer (void) void TAO_CEC_ProxyPushConsumer::activate ( CosEventChannelAdmin::ProxyPushConsumer_ptr &activated_proxy) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPushConsumer_var result; try @@ -61,7 +60,6 @@ TAO_CEC_ProxyPushConsumer::activate ( void TAO_CEC_ProxyPushConsumer::deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -174,8 +172,6 @@ TAO_CEC_ProxyPushConsumer::_decr_refcnt (void) void TAO_CEC_ProxyPushConsumer::connect_push_supplier ( CosEventComm::PushSupplier_ptr push_supplier) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected)) { { ACE_GUARD_THROW_EX ( @@ -247,7 +243,6 @@ TAO_CEC_ProxyPushConsumer::apply_policy (CosEventComm::PushSupplier_ptr pre) void TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_CEC_ProxyPushConsumer_Guard ace_mon (this->lock_, this->refcount_, @@ -261,7 +256,6 @@ TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event) void TAO_CEC_ProxyPushConsumer::disconnect_push_consumer () - ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventComm::PushSupplier_var supplier; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h index 9ea04838f5d..3bf07075cd9 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h @@ -60,12 +60,10 @@ public: /// Activate in the POA virtual void activate ( - CosEventChannelAdmin::ProxyPushConsumer_ptr &activated_proxy) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosEventChannelAdmin::ProxyPushConsumer_ptr &activated_proxy); /// Deactivate from the POA - virtual void deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void deactivate (void); /// Return false if no supplier is connected... CORBA::Boolean is_connected (void) const; @@ -90,13 +88,9 @@ public: // = The CosEventChannelAdmin::ProxyPushConsumer methods... virtual void connect_push_supplier ( - CosEventComm::PushSupplier_ptr push_supplier) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected)); - virtual void push (const CORBA::Any& event) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosEventComm::PushSupplier_ptr push_supplier); + virtual void push (const CORBA::Any& event); + virtual void disconnect_push_consumer (void); // = The Servant methods virtual PortableServer::POA_ptr _default_POA (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index cab237cbb77..4e964d3c8e7 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -98,7 +98,6 @@ TAO_CEC_ProxyPushSupplier::~TAO_CEC_ProxyPushSupplier (void) void TAO_CEC_ProxyPushSupplier::activate ( CosEventChannelAdmin::ProxyPushSupplier_ptr &activated_proxy) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPushSupplier_var result; try @@ -114,7 +113,6 @@ TAO_CEC_ProxyPushSupplier::activate ( void TAO_CEC_ProxyPushSupplier::deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -330,9 +328,6 @@ TAO_CEC_ProxyPushSupplier::_decr_refcnt (void) void TAO_CEC_ProxyPushSupplier::connect_push_consumer ( CosEventComm::PushConsumer_ptr push_consumer) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected, - CosEventChannelAdmin::TypeError)) { // Nil PushConsumers are illegal if (CORBA::is_nil (push_consumer)) @@ -512,7 +507,6 @@ TAO_CEC_ProxyPushSupplier::apply_policy void TAO_CEC_ProxyPushSupplier::disconnect_push_supplier () - ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventComm::PushConsumer_var consumer; #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h index a5f7531a37b..606bd52b2e5 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h @@ -76,12 +76,10 @@ public: /// Activate in the POA virtual void activate ( - CosEventChannelAdmin::ProxyPushSupplier_ptr &) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosEventChannelAdmin::ProxyPushSupplier_ptr &); /// Deactivate from the POA - virtual void deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void deactivate (void); /// Return 0 if no consumer is connected... CORBA::Boolean is_connected (void) const; @@ -122,12 +120,8 @@ public: // = The CosEventChannelAdmin::ProxyPushSupplier methods... virtual void connect_push_consumer ( - CosEventComm::PushConsumer_ptr push_consumer) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected, - CosEventChannelAdmin::TypeError)); - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosEventComm::PushConsumer_ptr push_consumer); + virtual void disconnect_push_supplier (void); /// Increment and decrement the reference count. CORBA::ULong _incr_refcnt (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp index a0c900ff46a..1f77e5ecdba 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp @@ -82,14 +82,12 @@ TAO_CEC_SupplierAdmin::shutdown (void) CosEventChannelAdmin::ProxyPushConsumer_ptr TAO_CEC_SupplierAdmin::obtain_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->push_admin_.obtain (); } CosEventChannelAdmin::ProxyPullConsumer_ptr TAO_CEC_SupplierAdmin::obtain_pull_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->pull_admin_.obtain (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h index 8712301644f..c189bcc064c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h @@ -81,11 +81,9 @@ public: // = The CosEventChannelAdmin::SupplierAdmin methods... virtual CosEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_push_consumer (void); virtual CosEventChannelAdmin::ProxyPullConsumer_ptr - obtain_pull_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_pull_consumer (void); // = The PortableServer::ServantBase methods virtual PortableServer::POA_ptr _default_POA (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp index 5a6615e297d..17086f22b0c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp @@ -29,7 +29,6 @@ TAO_CEC_TypedConsumerAdmin::~TAO_CEC_TypedConsumerAdmin (void) void TAO_CEC_TypedConsumerAdmin::invoke (const TAO_CEC_TypedEvent& typed_event) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_CEC_Propagate_Typed_Event typed_event_worker (typed_event, this->typed_event_channel_); @@ -64,10 +63,6 @@ CosTypedEventChannelAdmin::TypedProxyPullSupplier_ptr TAO_CEC_TypedConsumerAdmin::obtain_typed_pull_supplier ( const char * /*supported_interface*/ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosTypedEventChannelAdmin::InterfaceNotSupported - )) { throw CosTypedEventChannelAdmin::InterfaceNotSupported (); } @@ -76,10 +71,6 @@ CosEventChannelAdmin::ProxyPushSupplier_ptr TAO_CEC_TypedConsumerAdmin::obtain_typed_push_supplier ( const char * uses_interface ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosTypedEventChannelAdmin::NoSuchImplementation - )) { // Register the consumer uses_interface with the EC @@ -95,14 +86,12 @@ TAO_CEC_TypedConsumerAdmin::obtain_typed_push_supplier ( CosEventChannelAdmin::ProxyPushSupplier_ptr TAO_CEC_TypedConsumerAdmin::obtain_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } CosEventChannelAdmin::ProxyPullSupplier_ptr TAO_CEC_TypedConsumerAdmin::obtain_pull_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h index 45b8002f12b..7c39f234645 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h @@ -49,8 +49,7 @@ public: void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker); /// Invoke the typed event on all the consumers - virtual void invoke (const TAO_CEC_TypedEvent& typed_event) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void invoke (const TAO_CEC_TypedEvent& typed_event); /// Used to inform the EC that a Supplier has connected or /// disconnected from it. @@ -64,22 +63,16 @@ public: // = The CosTypedEventChannelAdmin::TypedConsumerAdmin methods... virtual CosEventChannelAdmin::ProxyPushSupplier_ptr - obtain_typed_push_supplier (const char * uses_interface) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTypedEventChannelAdmin::NoSuchImplementation)); + obtain_typed_push_supplier (const char * uses_interface); virtual CosTypedEventChannelAdmin::TypedProxyPullSupplier_ptr - obtain_typed_pull_supplier (const char * supported_interface) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTypedEventChannelAdmin::InterfaceNotSupported)); + obtain_typed_pull_supplier (const char * supported_interface); // = The CosEventChannelAdmin::ConsumerAdmin methods... virtual CosEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_push_supplier (void); virtual CosEventChannelAdmin::ProxyPullSupplier_ptr - obtain_pull_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_pull_supplier (void); // = The PortableServer::ServantBase methods virtual PortableServer::POA_ptr _default_POA (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp index aa0da5850e8..f3f41ddcd7c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp @@ -526,21 +526,18 @@ TAO_CEC_TypedEventChannel::create_list (CORBA::Long count, // The CosTypedEventChannelAdmin::TypedEventChannel methods... CosTypedEventChannelAdmin::TypedConsumerAdmin_ptr TAO_CEC_TypedEventChannel::for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->typed_consumer_admin_->_this (); } CosTypedEventChannelAdmin::TypedSupplierAdmin_ptr TAO_CEC_TypedEventChannel::for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->typed_supplier_admin_->_this (); } void TAO_CEC_TypedEventChannel::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (!destroyed_) { diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h index 10cf213a0fd..be8c2d6d59f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h @@ -247,15 +247,12 @@ public: // = The CosTypedEventChannelAdmin::TypedEventChannel methods... virtual ::CosTypedEventChannelAdmin::TypedConsumerAdmin_ptr - for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + for_consumers (void); virtual ::CosTypedEventChannelAdmin::TypedSupplierAdmin_ptr - for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + for_suppliers (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); ServantRetryMap& get_servant_retry_map (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp index 44490753e28..97110286488 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp @@ -74,7 +74,6 @@ TAO_CEC_TypedProxyPushConsumer::~TAO_CEC_TypedProxyPushConsumer (void) void TAO_CEC_TypedProxyPushConsumer::activate ( CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr &activated_proxy) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosTypedEventChannelAdmin::TypedProxyPushConsumer_var result; try @@ -90,7 +89,6 @@ TAO_CEC_TypedProxyPushConsumer::activate ( void TAO_CEC_TypedProxyPushConsumer::deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -204,8 +202,6 @@ TAO_CEC_TypedProxyPushConsumer::_decr_refcnt (void) void TAO_CEC_TypedProxyPushConsumer::connect_push_supplier ( CosEventComm::PushSupplier_ptr push_supplier) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected)) { { ACE_GUARD_THROW_EX ( @@ -275,14 +271,12 @@ TAO_CEC_TypedProxyPushConsumer::apply_policy void TAO_CEC_TypedProxyPushConsumer::push (const CORBA::Any& /* event */) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } void TAO_CEC_TypedProxyPushConsumer::disconnect_push_consumer () - ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventComm::PushSupplier_var supplier; @@ -340,7 +334,6 @@ TAO_CEC_TypedProxyPushConsumer::_remove_ref (void) CORBA::Object_ptr TAO_CEC_TypedProxyPushConsumer::get_typed_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var server = @@ -351,7 +344,6 @@ TAO_CEC_TypedProxyPushConsumer::get_typed_consumer (void) void TAO_CEC_TypedProxyPushConsumer::invoke (const TAO_CEC_TypedEvent& typed_event) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_CEC_TypedProxyPushConsumer_Guard ace_mon (this->lock_, this->refcount_, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h index 6f8b2e53b07..547df4ccbfd 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h @@ -51,12 +51,10 @@ public: /// Activate in the POA virtual void activate ( - CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr &activated_proxy) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr &activated_proxy); /// Deactivate from the POA - virtual void deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void deactivate (void); /** * Invoke the _non_existent() pseudo-operation on the supplier. If @@ -74,23 +72,17 @@ public: // = The CosEventChannelAdmin::ProxyPushConsumer methods (abstract overloads)... virtual void connect_push_supplier ( - CosEventComm::PushSupplier_ptr push_supplier) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected)); + CosEventComm::PushSupplier_ptr push_supplier); - virtual void push (const CORBA::Any& event) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const CORBA::Any& event); - virtual void invoke (const TAO_CEC_TypedEvent& typed_event) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void invoke (const TAO_CEC_TypedEvent& typed_event); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_consumer (void); // = The CosTypedEventComm::TypedPushConsumer methods (abstract overloads)... virtual CORBA::Object_ptr get_typed_consumer ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // = The Servant methods virtual PortableServer::POA_ptr _default_POA (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp index e978f362023..0f075e4bef4 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp @@ -58,10 +58,6 @@ CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr TAO_CEC_TypedSupplierAdmin::obtain_typed_push_consumer ( const char * supported_interface ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosTypedEventChannelAdmin::InterfaceNotSupported - )) { int result = this->typed_event_channel_->supplier_register_supported_interface (supported_interface); @@ -78,10 +74,6 @@ CosEventChannelAdmin::ProxyPullConsumer_ptr TAO_CEC_TypedSupplierAdmin::obtain_typed_pull_consumer ( const char * /* uses_interface */ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosTypedEventChannelAdmin::NoSuchImplementation - )) { throw CosTypedEventChannelAdmin::NoSuchImplementation (); @@ -89,14 +81,12 @@ TAO_CEC_TypedSupplierAdmin::obtain_typed_pull_consumer ( CosEventChannelAdmin::ProxyPushConsumer_ptr TAO_CEC_TypedSupplierAdmin::obtain_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } CosEventChannelAdmin::ProxyPullConsumer_ptr TAO_CEC_TypedSupplierAdmin::obtain_pull_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h index a804e384981..7a12d3e759a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h @@ -57,23 +57,17 @@ public: // = The CosTypedEventChannelAdmin::TypedSupplierAdmin methods... virtual CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr - obtain_typed_push_consumer (const char * supported_interface) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTypedEventChannelAdmin::InterfaceNotSupported)); + obtain_typed_push_consumer (const char * supported_interface); virtual CosEventChannelAdmin::ProxyPullConsumer_ptr - obtain_typed_pull_consumer (const char * uses_interface) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTypedEventChannelAdmin::NoSuchImplementation)); + obtain_typed_pull_consumer (const char * uses_interface); // = The CosEventChannelAdmin::SupplierAdmin methods... virtual CosEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_push_consumer (void); virtual CosEventChannelAdmin::ProxyPullConsumer_ptr - obtain_pull_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_pull_consumer (void); // = The PortableServer::ServantBase methods virtual PortableServer::POA_ptr _default_POA (void); diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp index a51b175716f..5637669fa38 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp @@ -9,8 +9,6 @@ #include "orbsvcs/ESF/ESF_Copy_On_Write.inl" #endif /* __ACE_INLINE__ */ -#include "tao/Environment.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class COLLECTION, class ITERATOR> CORBA::ULong diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp index 474ccde8989..29aa2402b68 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp @@ -23,7 +23,6 @@ TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>:: template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>:: peer_connected (PEER *peer) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ESF_Peer_Connected<PROXY,PEER> worker (peer); @@ -33,7 +32,6 @@ TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>:: template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>:: peer_reconnected (PEER *peer) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ESF_Peer_Reconnected<PROXY,PEER> worker (peer); @@ -43,7 +41,6 @@ TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>:: template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>:: peer_disconnected (PEER *peer) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ESF_Peer_Disconnected<PROXY,PEER> worker (peer); diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h index 5e1c81f3194..1333f171dc3 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h @@ -69,8 +69,7 @@ public: * has invoked the connect_xxx_yyy() method. * The default implementation is a no-op. */ - virtual void peer_connected (PEER *peer) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void peer_connected (PEER *peer); /** * A <peer> has reconnected, i.e. its client has invoked the @@ -78,16 +77,14 @@ public: * The default implementation delegates on the collection * <reconnected> method */ - virtual void peer_reconnected (PEER *peer) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void peer_reconnected (PEER *peer); /** * A <peer> has been disconnected. The default implementation * removes the object from the collection and deactivates the * proxy. */ - virtual void peer_disconnected (PEER *peer) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void peer_disconnected (PEER *peer); }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp index 6c842836abc..e5952ed3a96 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp @@ -29,7 +29,6 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>:: template<class EVENT_CHANNEL, class PROXY, class INTERFACE> INTERFACE* TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>:: obtain (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PROXY* proxy; this->event_channel_->create_proxy (proxy); @@ -49,7 +48,6 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>:: template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>:: shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ESF_Shutdown_Proxy<PROXY> worker; @@ -62,14 +60,12 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>:: template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>:: connected (PROXY *) - ACE_THROW_SPEC ((CORBA::SystemException)) { } template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>:: reconnected (PROXY *proxy) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->collection_->reconnected (proxy); } @@ -77,7 +73,6 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>:: template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>:: disconnected (PROXY *proxy) - ACE_THROW_SPEC ((CORBA::SystemException)) { proxy->deactivate (); // Cannot happen, just following the discipline. diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h index e16e340bb1c..b3b2dd058a8 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h @@ -72,8 +72,7 @@ public: virtual ~TAO_ESF_Proxy_Admin (void); /// Iterate over its internal collection. - void for_each (TAO_ESF_Worker<PROXY> *worker) - ACE_THROW_SPEC ((CORBA::SystemException)); + void for_each (TAO_ESF_Worker<PROXY> *worker); // @todo We should use INTERFACE::_ptr_type or PROXY::_ptr_type, but // the MSVC compiler (v6.0) gets confused when we do so. So we have @@ -82,24 +81,21 @@ public: // code is supposed to run under TAO only. /// Create a new PROXY and activate it. virtual INTERFACE* - obtain (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain (void); /** * The Event Channel that owns this Admin object is going * down. Invoke <shutdown> on all the proxies, cleanup the * collection and prepare to terminate. */ - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); /** * A <proxy> has connected, this is invoked when the proxy's client * has invoked the connect_xxx_yyy() method. * The default implementation is a no-op. */ - virtual void connected (PROXY *proxy) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void connected (PROXY *proxy); /** * A <proxy> has reconnected, i.e. its client has invoked the @@ -107,16 +103,14 @@ public: * The default implementation delegates on the collection * <reconnected> method */ - virtual void reconnected (PROXY *proxy) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void reconnected (PROXY *proxy); /** * A <proxy> has been disconnected. The default implementation * removes the object from the collection and deactivates the * proxy. */ - virtual void disconnected (PROXY *proxy) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnected (PROXY *proxy); protected: /// The Event Channel we belong to diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl index dfb7f2a7429..f44945d45bf 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl @@ -7,7 +7,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class EC,class P,class I> ACE_INLINE void TAO_ESF_Proxy_Admin<EC,P,I>:: for_each (TAO_ESF_Worker<P> *worker) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->collection_->for_each (worker); } diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp index 4c3e161c54f..a57a0da8f9d 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp @@ -8,7 +8,6 @@ #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/Any.h" -#include "tao/Environment.h" #include "tao/CDR.h" #if ! defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h index 500f4b2eb4c..9df6a92d93b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h @@ -20,7 +20,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/CDR.h" -#include "tao/Environment.h" #include "ace/Hash_Map_Manager.h" #include "ace/INET_Addr.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp index 9fec02fdf71..8a241a85c17 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp @@ -17,7 +17,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO_ECG_CDR_Message_Sender::init ( TAO_ECG_Refcounted_Endpoint endpoint_rptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (endpoint_rptr.get () == 0 || endpoint_rptr->dgram ().get_handle () == ACE_INVALID_HANDLE) @@ -33,7 +32,6 @@ TAO_ECG_CDR_Message_Sender::init ( void TAO_ECG_CDR_Message_Sender::send_message (const TAO_OutputCDR &cdr, const ACE_INET_Addr &addr) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->endpoint_rptr_.get () == 0) { diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h index 1faa1eb22bd..c44bbadd074 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h @@ -23,7 +23,6 @@ #include /**/ "orbsvcs/Event/event_serv_export.h" #include "tao/SystemException.h" -#include "tao/Environment.h" #include "ace/INET_Addr.h" @@ -94,8 +93,7 @@ public: * sender is no longer needed. If shutdown () is not called by the * user, cleanup activities will be performed by the destructor. */ - void init (TAO_ECG_Refcounted_Endpoint endpoint_rptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + void init (TAO_ECG_Refcounted_Endpoint endpoint_rptr); // Shutdown this component. Frees up the endpoint. void shutdown (void); @@ -131,8 +129,7 @@ public: * to send later via the reactor. */ void send_message (const TAO_OutputCDR &cdr, - const ACE_INET_Addr &addr) - ACE_THROW_SPEC ((CORBA::SystemException)); + const ACE_INET_Addr &addr); private: /// Return the datagram... diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp index 5dcd07128ac..73980d20c69 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp @@ -125,7 +125,6 @@ void TAO_ECG_Complex_Address_Server::get_addr ( const RtecEventComm::EventHeader& header, RtecUDPAdmin::UDP_Addr_out addr) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Long key; if (this->is_source_mapping_) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h index 286aa5fe160..4f51296ef99 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h @@ -70,8 +70,7 @@ public: // = The RtecUDPAdmin::AddrServer methods virtual void get_addr (const RtecEventComm::EventHeader& header, - RtecUDPAdmin::UDP_Addr_out addr) - ACE_THROW_SPEC ((CORBA::SystemException)); + RtecUDPAdmin::UDP_Addr_out addr); /// Prints out complete content of the address server. Useful for /// debugging. diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp index 6200c868e9b..82405c6d2b6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp @@ -131,7 +131,6 @@ TAO_ECG_Mcast_EH::handle_input (ACE_HANDLE fd) void TAO_ECG_Mcast_EH::update_consumer ( const RtecEventChannelAdmin::ConsumerQOS& sub) - ACE_THROW_SPEC ((CORBA::SystemException)) { Address_Set multicast_addresses; @@ -147,7 +146,6 @@ void TAO_ECG_Mcast_EH::compute_required_subscriptions ( const RtecEventChannelAdmin::ConsumerQOS& sub, Address_Set& multicast_addresses) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong count = sub.dependencies.length (); for (CORBA::ULong i = 0; i != count; ++i) @@ -267,7 +265,6 @@ TAO_ECG_Mcast_EH::Observer::Observer (TAO_ECG_Mcast_EH* eh) void TAO_ECG_Mcast_EH::Observer::update_consumer ( const RtecEventChannelAdmin::ConsumerQOS& sub) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->eh_) this->eh_->update_consumer (sub); @@ -276,7 +273,6 @@ TAO_ECG_Mcast_EH::Observer::update_consumer ( void TAO_ECG_Mcast_EH::Observer::update_supplier ( const RtecEventChannelAdmin::SupplierQOS&) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h index 968a7d4fb07..e899440ebd1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h @@ -123,11 +123,9 @@ private: /// Event Channel Observer methods //@{ virtual void update_consumer ( - const RtecEventChannelAdmin::ConsumerQOS& sub) - ACE_THROW_SPEC ((CORBA::SystemException)); + const RtecEventChannelAdmin::ConsumerQOS& sub); virtual void update_supplier ( - const RtecEventChannelAdmin::SupplierQOS& pub) - ACE_THROW_SPEC ((CORBA::SystemException)); + const RtecEventChannelAdmin::SupplierQOS& pub); private: /// Handler we notify of subscriptions changes. @@ -144,8 +142,7 @@ private: /// The Observer method. Subscribe/unsubscribe to multicast groups /// according to changes in consumer subscriptions. - void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub) - ACE_THROW_SPEC ((CORBA::SystemException)); + void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub); typedef ACE_Unbounded_Set<ACE_INET_Addr> Address_Set; @@ -169,8 +166,7 @@ private: */ void compute_required_subscriptions ( const RtecEventChannelAdmin::ConsumerQOS& sub, - Address_Set& multicast_addresses) - ACE_THROW_SPEC ((CORBA::SystemException)); + Address_Set& multicast_addresses); /// Unsubscribe from any multicast addresses we are currently /// subscribed to that are not in the \a multicast_addresses list. diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp index a115866b93a..9d10b9f730c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp @@ -26,7 +26,6 @@ void TAO_ECG_Simple_Address_Server::get_addr ( const RtecEventComm::EventHeader& /*header*/, RtecUDPAdmin::UDP_Addr_out addr) - ACE_THROW_SPEC ((CORBA::SystemException)) { // unsigned long addr.ipaddr = this->addr_.get_ip_address (); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h index 8ff36c72745..8bddc3cc95d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h @@ -44,8 +44,7 @@ public: // = The RtecUDPAdmin::AddrServer methods virtual void get_addr (const RtecEventComm::EventHeader& header, - RtecUDPAdmin::UDP_Addr_out addr) - ACE_THROW_SPEC ((CORBA::SystemException)); + RtecUDPAdmin::UDP_Addr_out addr); protected: diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp index 4c7871f5e89..59c1add7710 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp @@ -133,7 +133,6 @@ TAO_ECG_UDP_Receiver::reconnect (const RtecEventChannelAdmin::SupplierQOS& pub) void TAO_ECG_UDP_Receiver::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Prevent attempts to disconnect. this->auto_proxy_disconnect_.disallow_command (); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h index 34c19e3eeaa..f83c73692f7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h @@ -171,8 +171,7 @@ public: /// The PushSupplier idl method. /// Invokes shutdown (), which may result in the object being deleted, if /// refcounting is used to manage its lifetime. - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); /// TAO_ECG_Dgram_Handler method. /** diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp index f3c26bba399..fbf072250d8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp @@ -137,7 +137,6 @@ TAO_ECG_UDP_Sender::reconnect (const RtecEventChannelAdmin::ConsumerQOS& sub) void TAO_ECG_UDP_Sender::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Prevent attempts to disconnect. this->auto_proxy_disconnect_.disallow_command (); @@ -162,7 +161,6 @@ TAO_ECG_UDP_Sender::shutdown (void) void TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) { diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h index 29b7306ab74..20118e46426 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h @@ -174,10 +174,8 @@ public: //@{ /// Invokes shutdown (), which may result in the object being deleted, if /// refcounting is used to manage its lifetime. - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void push (const RtecEventComm::EventSet &events) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_consumer (void); + virtual void push (const RtecEventComm::EventSet &events); //@} protected: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp index 81912d74e57..5de824e5745 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp @@ -13,7 +13,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO_EC_Channel_Destroyer_Functor::operator() ( TAO_EC_Event_Channel_Base * event_channel) - ACE_THROW_SPEC (()) { try { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h index 4b18ad808fd..5f9fde9de70 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h @@ -26,8 +26,7 @@ struct TAO_RTEvent_Serv_Export TAO_EC_Channel_Destroyer_Functor typedef TAO_EC_Event_Channel_Base * argument; /// Destroy @c event_channel - void operator() (TAO_EC_Event_Channel_Base * event_channel) - ACE_THROW_SPEC (()); + void operator() (TAO_EC_Event_Channel_Base * event_channel); }; /** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp index d12e6b6fb52..8c7026d2c59 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp @@ -27,7 +27,6 @@ TAO_EC_ConsumerAdmin::~TAO_EC_ConsumerAdmin (void) RtecEventChannelAdmin::ProxyPushSupplier_ptr TAO_EC_ConsumerAdmin::obtain_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->obtain (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h index c6804bd5dcb..623d7154457 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h @@ -63,8 +63,7 @@ public: // = The RtecEventChannelAdmin::ConsumerAdmin methods... virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_push_supplier (void); // = The PortableServer::ServantBase methods virtual PortableServer::POA_ptr _default_POA (void); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp index 321bb4b733b..e8a1f41cb43 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp @@ -26,8 +26,6 @@ void TAO_EC_Default_ProxyPushConsumer::connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS& qos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecEventChannelAdmin::AlreadyConnected)) { { ACE_GUARD_THROW_EX ( @@ -85,7 +83,6 @@ TAO_EC_Default_ProxyPushConsumer::connect_push_supplier ( void TAO_EC_Default_ProxyPushConsumer::push (const RtecEventComm::EventSet& event) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_, this->refcount_, @@ -99,7 +96,6 @@ TAO_EC_Default_ProxyPushConsumer::push (const RtecEventComm::EventSet& event) void TAO_EC_Default_ProxyPushConsumer::disconnect_push_consumer () - ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventComm::PushSupplier_var supplier; int connected = 0; @@ -161,14 +157,12 @@ TAO_EC_Default_ProxyPushConsumer::_remove_ref (void) void TAO_EC_Default_ProxyPushConsumer::activate ( RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy) - ACE_THROW_SPEC ((CORBA::SystemException)) { proxy = this->_this (); } PortableServer::ObjectId TAO_EC_Default_ProxyPushConsumer::object_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var result = this->default_POA_->servant_to_id (this); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h index 5e518a211bf..7ebb52251b5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h @@ -49,19 +49,14 @@ public: virtual ~TAO_EC_Default_ProxyPushConsumer (void); virtual void activate ( - RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy) - ACE_THROW_SPEC ((CORBA::SystemException)); + RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy); // = The RtecEventChannelAdmin::ProxyPushConsumer methods... virtual void connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, - const RtecEventChannelAdmin::SupplierQOS& qos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecEventChannelAdmin::AlreadyConnected)); - virtual void push (const RtecEventComm::EventSet& event) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + const RtecEventChannelAdmin::SupplierQOS& qos); + virtual void push (const RtecEventComm::EventSet& event); + virtual void disconnect_push_consumer (void); // = The Servant methods virtual PortableServer::POA_ptr _default_POA (void); @@ -71,8 +66,7 @@ public: private: virtual PortableServer::ObjectId - object_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + object_id (void); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp index 5b2b612d69c..6b97a3226de 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp @@ -29,9 +29,6 @@ void TAO_EC_Default_ProxyPushSupplier::connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS& qos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecEventChannelAdmin::AlreadyConnected, - RtecEventChannelAdmin::TypeError)) { // Nil PushConsumers are illegal if (CORBA::is_nil (push_consumer)) @@ -114,7 +111,6 @@ TAO_EC_Default_ProxyPushSupplier::connect_push_consumer ( void TAO_EC_Default_ProxyPushSupplier::disconnect_push_supplier () - ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventComm::PushConsumer_var consumer; int connected = 0; @@ -157,14 +153,12 @@ TAO_EC_Default_ProxyPushSupplier::disconnect_push_supplier () void TAO_EC_Default_ProxyPushSupplier::suspend_connection (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->suspend_connection_locked (); } void TAO_EC_Default_ProxyPushSupplier::resume_connection (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->resume_connection_locked (); } @@ -190,14 +184,12 @@ TAO_EC_Default_ProxyPushSupplier::_remove_ref (void) void TAO_EC_Default_ProxyPushSupplier::activate ( RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy) - ACE_THROW_SPEC ((CORBA::SystemException)) { proxy = this->_this (); } PortableServer::ObjectId TAO_EC_Default_ProxyPushSupplier::object_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var result = this->default_POA_->servant_to_id (this); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h index d577085e134..45fc706138b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h @@ -44,22 +44,15 @@ public: virtual ~TAO_EC_Default_ProxyPushSupplier (void); void activate ( - RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy) - ACE_THROW_SPEC ((CORBA::SystemException)); + RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy); /// IDL methods. virtual void connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, - const RtecEventChannelAdmin::ConsumerQOS &qos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecEventChannelAdmin::AlreadyConnected, - RtecEventChannelAdmin::TypeError)); - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void suspend_connection (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void resume_connection (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + const RtecEventChannelAdmin::ConsumerQOS &qos); + virtual void disconnect_push_supplier (void); + virtual void suspend_connection (void); + virtual void resume_connection (void); // = The Servant methods virtual PortableServer::POA_ptr _default_POA (void); @@ -69,8 +62,7 @@ public: private: virtual PortableServer::ObjectId - object_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + object_id (void); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp index 831bd3f1be5..aa68b7259ad 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp @@ -248,21 +248,18 @@ TAO_EC_Event_Channel_Base::disconnected (TAO_EC_ProxyPushSupplier* supplier) RtecEventChannelAdmin::ConsumerAdmin_ptr TAO_EC_Event_Channel_Base::for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->consumer_admin_->_this (); } RtecEventChannelAdmin::SupplierAdmin_ptr TAO_EC_Event_Channel_Base::for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->supplier_admin_->_this (); } void TAO_EC_Event_Channel_Base::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->shutdown (); } @@ -270,10 +267,6 @@ TAO_EC_Event_Channel_Base::destroy (void) RtecEventChannelAdmin::Observer_Handle TAO_EC_Event_Channel_Base::append_observer ( RtecEventChannelAdmin::Observer_ptr observer) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)) { return this->observer_strategy_->append_observer (observer); } @@ -281,10 +274,6 @@ TAO_EC_Event_Channel_Base::append_observer ( void TAO_EC_Event_Channel_Base::remove_observer ( RtecEventChannelAdmin::Observer_Handle handle) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)) { this->observer_strategy_->remove_observer (handle); } @@ -292,7 +281,6 @@ TAO_EC_Event_Channel_Base::remove_observer ( void TAO_EC_Event_Channel_Base::for_each_consumer ( TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> *worker) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->consumer_admin_->for_each (worker); } @@ -300,7 +288,6 @@ TAO_EC_Event_Channel_Base::for_each_consumer ( void TAO_EC_Event_Channel_Base::for_each_supplier ( TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> *worker) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->supplier_admin_->for_each (worker); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h index 20df5b0d3a3..cdc66d07297 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h @@ -123,12 +123,10 @@ public: virtual void shutdown (void); virtual void for_each_consumer ( - TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> *worker) - ACE_THROW_SPEC ((CORBA::SystemException)); + TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> *worker); virtual void for_each_supplier ( - TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> *worker) - ACE_THROW_SPEC ((CORBA::SystemException)); + TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> *worker); /// Access the dispatching module.... TAO_EC_Dispatching* dispatching (void) const; @@ -221,31 +219,20 @@ public: /// The default implementation is: /// this->consumer_admin ()->_this (); virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + for_consumers (void); /// The default implementation is: /// this->supplier_admin ()->_this (); virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + for_suppliers (void); /// Commit suicide. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual RtecEventChannelAdmin::Observer_Handle - append_observer (RtecEventChannelAdmin::Observer_ptr) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); + append_observer (RtecEventChannelAdmin::Observer_ptr); virtual void - remove_observer (RtecEventChannelAdmin::Observer_Handle) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)); + remove_observer (RtecEventChannelAdmin::Observer_Handle); /// Return 1 if the event channel is already destroyed. int destroyed (void); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp index b21479fe024..84ae467f391 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp @@ -190,7 +190,6 @@ TAO_EC_Gateway_IIOP::reconnect_consumer_ec(void) void TAO_EC_Gateway_IIOP::update_consumer ( const RtecEventChannelAdmin::ConsumerQOS& c_qos) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (c_qos.dependencies.length () == 0) return; @@ -422,7 +421,6 @@ TAO_EC_Gateway_IIOP::open_i ( void TAO_EC_Gateway_IIOP::update_supplier ( const RtecEventChannelAdmin::SupplierQOS&) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing... } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h index 03d35384fe7..cb21f9c16aa 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h @@ -91,10 +91,8 @@ public: // The following methods are documented in the base class. virtual void close (void); - virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub); + virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub); // Let the gateway reconnect itself to the consumer ec given exisiting QoS void reconnect_consumer_ec(void); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp index 122eb70ea15..877b6993a5e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp @@ -26,10 +26,6 @@ TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy (void) RtecEventChannelAdmin::Observer_Handle TAO_EC_Null_ObserverStrategy::append_observer ( RtecEventChannelAdmin::Observer_ptr) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)) { throw RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER(); } @@ -37,10 +33,6 @@ TAO_EC_Null_ObserverStrategy::append_observer ( void TAO_EC_Null_ObserverStrategy::remove_observer ( RtecEventChannelAdmin::Observer_Handle) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)) { throw RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER(); } @@ -76,10 +68,6 @@ TAO_EC_Basic_ObserverStrategy::~TAO_EC_Basic_ObserverStrategy (void) RtecEventChannelAdmin::Observer_Handle TAO_EC_Basic_ObserverStrategy::append_observer ( RtecEventChannelAdmin::Observer_ptr obs) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)) { { ACE_GUARD_THROW_EX ( @@ -109,10 +97,6 @@ TAO_EC_Basic_ObserverStrategy::append_observer ( void TAO_EC_Basic_ObserverStrategy::remove_observer ( RtecEventChannelAdmin::Observer_Handle handle) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)) { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR()); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h index 6bf462dccf0..3241e5d81bb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h @@ -65,17 +65,9 @@ public: /// The basic methods to support the EC strategies. virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)) = 0; virtual void remove_observer ( RtecEventChannelAdmin::Observer_Handle) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)) = 0; /// Used by the EC to inform the ObserverStrategy that a Consumer has @@ -107,17 +99,9 @@ public: // = The TAO_EC_ObserverStrategy methods. virtual RtecEventChannelAdmin::Observer_Handle - append_observer (RtecEventChannelAdmin::Observer_ptr) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); + append_observer (RtecEventChannelAdmin::Observer_ptr); virtual void remove_observer ( - RtecEventChannelAdmin::Observer_Handle) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)); + RtecEventChannelAdmin::Observer_Handle); virtual void connected (TAO_EC_ProxyPushConsumer*); virtual void disconnected (TAO_EC_ProxyPushConsumer*); virtual void connected (TAO_EC_ProxyPushSupplier*); @@ -154,17 +138,9 @@ public: // = The TAO_EC_ObserverStrategy methods. virtual RtecEventChannelAdmin::Observer_Handle - append_observer (RtecEventChannelAdmin::Observer_ptr) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); + append_observer (RtecEventChannelAdmin::Observer_ptr); virtual void remove_observer ( - RtecEventChannelAdmin::Observer_Handle) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)); + RtecEventChannelAdmin::Observer_Handle); virtual void connected (TAO_EC_ProxyPushConsumer*); virtual void disconnected (TAO_EC_ProxyPushConsumer*); virtual void connected (TAO_EC_ProxyPushSupplier*); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h index 5fa313c5857..16f9e6056f6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h @@ -69,7 +69,7 @@ public: /// Activate in the POA virtual void activate ( RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; /// Deactivate from the POA virtual void deactivate (void); @@ -168,7 +168,7 @@ private: virtual PortableServer::ObjectId object_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h index 9b80a1241f7..b81860cce6a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h @@ -69,11 +69,10 @@ public: /// Activate in the POA virtual void activate ( RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; /// Deactivate from the POA - virtual void deactivate (void) - ACE_THROW_SPEC (()); + virtual void deactivate (void); /// Disconnect this from virtual void disconnect_push_supplier () = 0; @@ -152,14 +151,10 @@ protected: void consumer (RtecEventComm::PushConsumer_ptr consumer); void consumer_i (RtecEventComm::PushConsumer_ptr consumer); - void suspend_connection_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - void resume_connection_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - void suspend_connection_locked (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - void resume_connection_locked (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void suspend_connection_i (void); + void resume_connection_i (void); + void suspend_connection_locked (void); + void resume_connection_locked (void); /// The private version (without locking) of is_connected(). CORBA::Boolean is_connected_i (void) const; @@ -200,7 +195,7 @@ private: virtual void pre_dispatch_hook (RtecEventComm::EventSet&); virtual PortableServer::ObjectId object_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl index efe0d76ae82..ae28f7d1ccd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl @@ -6,14 +6,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void TAO_EC_ProxyPushSupplier::suspend_connection_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->suspended_ = 1; } ACE_INLINE void TAO_EC_ProxyPushSupplier::suspend_connection_locked (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, @@ -25,14 +23,12 @@ TAO_EC_ProxyPushSupplier::suspend_connection_locked (void) ACE_INLINE void TAO_EC_ProxyPushSupplier::resume_connection_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->suspended_ = 0; } ACE_INLINE void TAO_EC_ProxyPushSupplier::resume_connection_locked (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp index f6c327c190e..e0dbb97b275 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp @@ -13,7 +13,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO_EC_Supplier_Proxy_Disconnect_Functor::operator() ( RtecEventComm::PushSupplier_ptr supplier) - ACE_THROW_SPEC (()) { try { @@ -27,7 +26,6 @@ TAO_EC_Supplier_Proxy_Disconnect_Functor::operator() ( void TAO_EC_Consumer_Proxy_Disconnect_Functor::operator() ( RtecEventComm::PushConsumer_ptr consumer) - ACE_THROW_SPEC (()) { try { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h index 8aeda423586..6cf63eccbc7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h @@ -26,8 +26,7 @@ struct TAO_RTEvent_Serv_Export TAO_EC_Supplier_Proxy_Disconnect_Functor typedef RtecEventComm::PushSupplier_ptr argument; /// Disconnect from @c supplier - void operator() (RtecEventComm::PushSupplier_ptr supplier) - ACE_THROW_SPEC (()); + void operator() (RtecEventComm::PushSupplier_ptr supplier); }; /** @@ -54,8 +53,7 @@ struct TAO_RTEvent_Serv_Export TAO_EC_Consumer_Proxy_Disconnect_Functor typedef RtecEventComm::PushConsumer_ptr argument; /// Disconnect from @c consumer - void operator() (RtecEventComm::PushConsumer_ptr consumer) - ACE_THROW_SPEC (()); + void operator() (RtecEventComm::PushConsumer_ptr consumer); }; /** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp index 6856520575c..1b2f58cd72e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp @@ -25,7 +25,6 @@ TAO_EC_SupplierAdmin::~TAO_EC_SupplierAdmin (void) RtecEventChannelAdmin::ProxyPushConsumer_ptr TAO_EC_SupplierAdmin::obtain_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->obtain (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h index 57e05628b48..7647eac77d4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h @@ -55,8 +55,7 @@ public: // = The RtecEventChannelAdmin::SupplierAdmin methods... virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_push_consumer (void); // = The PortableServer::ServantBase methods virtual PortableServer::POA_ptr _default_POA (void); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp index 09b2c3fdcac..8f110b385d3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp @@ -37,7 +37,6 @@ TAO_EC_TPC_ProxyPushConsumer::~TAO_EC_TPC_ProxyPushConsumer (void) void TAO_EC_TPC_ProxyPushConsumer::disconnect_push_consumer () - ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventComm::PushConsumer_var emulated_exceptions_suck = this->_this (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h index 586d6218b5c..b28c209507c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h @@ -35,8 +35,7 @@ public: TAO_EC_TPC_ProxyPushConsumer (TAO_EC_Event_Channel_Base* ec); virtual ~TAO_EC_TPC_ProxyPushConsumer (void); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_consumer (void); private: typedef TAO_EC_Default_ProxyPushConsumer BASECLASS; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp index 26b206d447d..91580b75705 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp @@ -22,7 +22,6 @@ TAO_EC_TPC_ProxyPushSupplier::~TAO_EC_TPC_ProxyPushSupplier (void) void TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_EC_TPC_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): enter EC_TPC_ProxySupplier::disconnect_push_supplier (%@): refcount=%u,consumer=%@\n", @@ -52,9 +51,6 @@ void TAO_EC_TPC_ProxyPushSupplier::connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS& qos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecEventChannelAdmin::AlreadyConnected, - RtecEventChannelAdmin::TypeError)) { BASECLASS::connect_push_consumer (push_consumer, qos); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h index ceda25e79fe..d4ef0ac955e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h @@ -39,13 +39,9 @@ public: // = The RtecEventChannelAdmin::ProxyPushSupplier methods... virtual void connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, - const RtecEventChannelAdmin::ConsumerQOS &qos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecEventChannelAdmin::AlreadyConnected, - RtecEventChannelAdmin::TypeError)); + const RtecEventChannelAdmin::ConsumerQOS &qos); - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); private: typedef TAO_EC_Default_ProxyPushSupplier BASECLASS; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp index a52e42d1ca7..2a75a4a9a9a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp @@ -20,7 +20,6 @@ TAO_EC_Simple_AddrServer::~TAO_EC_Simple_AddrServer (void) void TAO_EC_Simple_AddrServer::get_addr (const RtecEventComm::EventHeader& header, RtecUDPAdmin::UDP_Addr_out addr) - ACE_THROW_SPEC ((CORBA::SystemException)) { addr.ipaddr = header.type; addr.port = this->port_; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h index 1b2600c1178..01ea084fa39 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h @@ -46,8 +46,7 @@ public: // = The RtecUDPAdmin::AddrServer methods virtual void get_addr (const RtecEventComm::EventHeader& header, - RtecUDPAdmin::UDP_Addr_out addr) - ACE_THROW_SPEC ((CORBA::SystemException)); + RtecUDPAdmin::UDP_Addr_out addr); private: CORBA::UShort port_; diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp index 4a35a62a269..ade4db7d656 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp @@ -16,14 +16,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO_FT_ClientORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO_FT_ClientORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_policy_factories (info); @@ -37,7 +35,6 @@ TAO_FT_ClientORBInitializer::post_init ( void TAO_FT_ClientORBInitializer::register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Register the FTCORBA policy factories. @@ -80,7 +77,6 @@ TAO_FT_ClientORBInitializer::register_policy_factories ( void TAO_FT_ClientORBInitializer::register_client_request_interceptors ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ClientRequestInterceptor_ptr cri = PortableInterceptor::ClientRequestInterceptor::_nil (); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h index 278a80f3c4b..3a933b94c75 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h @@ -39,23 +39,19 @@ class TAO_FT_ClientORBInitializer { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: /// Register FTCORBA policy factories. void register_policy_factories ( - PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ORBInitInfo_ptr info); /// Register the necessary interceptors. void register_client_request_interceptors ( - PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ORBInitInfo_ptr info); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp index d3a1f29f20f..ef3795e1fc2 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp @@ -15,8 +15,6 @@ CORBA::Policy_ptr TAO_FT_ClientPolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &val) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)) { if (type == FT::REQUEST_DURATION_POLICY) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h index 0e16efe8059..49a8b165b93 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h @@ -43,9 +43,7 @@ class TAO_FT_ClientPolicyFactory public: virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, - const CORBA::Any &value) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)); + const CORBA::Any &value); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp index 9c46f6c1eae..48892c1f083 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp @@ -16,14 +16,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TimeBase::TimeT TAO_FT_Request_Duration_Policy::request_duration_policy_value (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->request_duration_; } CORBA::PolicyType TAO_FT_Request_Duration_Policy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return FT::REQUEST_DURATION_POLICY; } @@ -56,7 +54,6 @@ TAO_FT_Request_Duration_Policy::clone (void) const CORBA::Policy_ptr TAO_FT_Request_Duration_Policy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_FT_Request_Duration_Policy* tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_FT_Request_Duration_Policy (*this), @@ -68,7 +65,6 @@ TAO_FT_Request_Duration_Policy::copy (void) void TAO_FT_Request_Duration_Policy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -94,7 +90,6 @@ TAO_FT_Request_Duration_Policy::set_time_value (ACE_Time_Value &time_value) FT::HeartbeatPolicyValue TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { FT::HeartbeatPolicyValue val; val.heartbeat = this->heartbeat_; @@ -126,7 +121,6 @@ TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val) CORBA::PolicyType TAO_FT_Heart_Beat_Policy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return FT::HEARTBEAT_POLICY; } @@ -134,7 +128,6 @@ TAO_FT_Heart_Beat_Policy::policy_type (void) CORBA::Policy_ptr TAO_FT_Heart_Beat_Policy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_FT_Heart_Beat_Policy * tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Policy (*this), @@ -156,7 +149,6 @@ TAO_FT_Heart_Beat_Policy::clone (void) const void TAO_FT_Heart_Beat_Policy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h index 7ccdac2f82a..870a3c23f6e 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h @@ -62,17 +62,13 @@ public: virtual TAO_FT_Request_Duration_Policy *clone (void) const; // = The FT::RequestDurationPolicy methods - virtual TimeBase::TimeT request_duration_policy_value (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual TimeBase::TimeT request_duration_policy_value (void); - virtual CORBA::PolicyType policy_type () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr copy (); - virtual void destroy () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (); /// Change the CORBA representation to the ACE representation. void set_time_value (ACE_Time_Value &time_value); @@ -113,17 +109,13 @@ public: virtual TAO_FT_Heart_Beat_Policy *clone (void) const; // = The FT::HeartBeatPolicy methods - virtual FT::HeartbeatPolicyValue heartbeat_policy_value (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual FT::HeartbeatPolicyValue heartbeat_policy_value (void); - virtual CORBA::PolicyType policy_type () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr copy (); - virtual void destroy () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (); /// Change the CORBA representation to the ACE representation. void set_time_value (ACE_Time_Value &time_value, diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp index 368385946fc..d787f0e0e6d 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp @@ -49,21 +49,18 @@ namespace TAO char * FT_ClientRequest_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->name_); } void FT_ClientRequest_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void FT_ClientRequest_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Do Nothing } @@ -71,8 +68,6 @@ namespace TAO void FT_ClientRequest_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { if (TAO_debug_level > 3) { @@ -105,15 +100,12 @@ namespace TAO void FT_ClientRequest_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void FT_ClientRequest_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { TAO_ClientRequestInfo* tao_ri = dynamic_cast<TAO_ClientRequestInfo*> (ri); @@ -170,8 +162,6 @@ namespace TAO void FT_ClientRequest_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { #if 0 // @@ Will be used later. @@ -235,7 +225,6 @@ namespace TAO FT_ClientRequest_Interceptor::group_version_context ( PortableInterceptor::ClientRequestInfo_ptr ri, IOP::TaggedComponent* tp) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -298,7 +287,6 @@ namespace TAO void FT_ClientRequest_Interceptor::request_service_context ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -375,7 +363,6 @@ namespace TAO TimeBase::TimeT FT_ClientRequest_Interceptor::request_expiration_time ( CORBA::Policy *policy) - ACE_THROW_SPEC ((CORBA::SystemException)) { FT::RequestDurationPolicy_var p; diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h index 6c8e4424575..8cef31a964b 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h @@ -76,30 +76,20 @@ namespace TAO FT_ClientRequest_Interceptor (void); /// Canonical name of the interceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); protected: @@ -108,14 +98,11 @@ namespace TAO private: void group_version_context (PortableInterceptor::ClientRequestInfo_ptr ri, - IOP::TaggedComponent* tp) - ACE_THROW_SPEC ((CORBA::SystemException)); + IOP::TaggedComponent* tp); - void request_service_context (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + void request_service_context (PortableInterceptor::ClientRequestInfo_ptr ri); - TimeBase::TimeT request_expiration_time (CORBA::Policy *policy) - ACE_THROW_SPEC ((CORBA::SystemException)); + TimeBase::TimeT request_expiration_time (CORBA::Policy *policy); private: diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp index 7adfd628330..4d84c639da7 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp @@ -24,7 +24,6 @@ TAO_FT_ClientService_Activate::~TAO_FT_ClientService_Activate (void) TAO_Service_Callbacks * TAO_FT_ClientService_Activate::activate_services (TAO_ORB_Core *orb_core) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_FT_Service_Callbacks *ft_service_callback = 0; diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h index c6b8c863e6f..cb5594e44f8 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h @@ -54,8 +54,7 @@ public: * This method cannot throw any exception, but it can return a nil * object to indicate an error condition. */ - virtual TAO_Service_Callbacks *activate_services (TAO_ORB_Core *orb) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual TAO_Service_Callbacks *activate_services (TAO_ORB_Core *orb); /// Used to force the initialization. static int Initializer (void); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp index 3a785fe5698..199956473af 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp @@ -3,7 +3,6 @@ #include "orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h" #include "orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h" #include "tao/SystemException.h" -#include "tao/Environment.h" ACE_RCSID (FaultTolerance, diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp index 6e3e8f31d5b..98fb0329c25 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp @@ -24,8 +24,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Boolean TAO_FT_IOGR_Property::set_property ( CORBA::Object_ptr &ior) - ACE_THROW_SPEC ((CORBA::SystemException, - TAO_IOP::Invalid_IOR)) { // We need to apply the property for every profile in the IOR @@ -77,9 +75,6 @@ TAO_FT_IOGR_Property::set_property ( CORBA::Boolean TAO_FT_IOGR_Property::is_primary_set ( CORBA::Object_ptr ior) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (this->get_primary_profile (ior) != 0) return 1; @@ -91,10 +86,6 @@ TAO_FT_IOGR_Property::is_primary_set ( CORBA::Object_ptr TAO_FT_IOGR_Property::get_primary ( CORBA::Object_ptr ior) - ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::NotFound - )) { TAO_Profile *pfile = @@ -160,11 +151,6 @@ CORBA::Boolean TAO_FT_IOGR_Property::set_primary ( CORBA::Object_ptr &ior1, CORBA::Object_ptr ior2) - ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::NotFound, - TAO_IOP::Duplicate - )) { // Check for primary in <ior2> IOP::TaggedComponent tagged_components; @@ -338,7 +324,6 @@ CORBA::Boolean TAO_FT_IOGR_Property::get_tagged_component ( const CORBA::Object_ptr iogr, FT::TagFTGroupTaggedComponent &fgtc) const - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Stub *stub = iogr->_stubobj (); @@ -388,7 +373,6 @@ TAO_FT_IOGR_Property::get_tagged_component ( CORBA::Boolean TAO_FT_IOGR_Property::remove_primary_tag ( CORBA::Object_ptr &iogr) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the MProfile TAO_MProfile &mprofile = diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h index 36cdbfbfdf8..947686c2c51 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h @@ -67,40 +67,23 @@ public: /// Set the property for the IOGR virtual CORBA::Boolean set_property ( - CORBA::Object_ptr &ior) - ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::Invalid_IOR - )); + CORBA::Object_ptr &ior); /// Set <ior1> as primary which is a part of <ior2> virtual CORBA::Boolean set_primary ( CORBA::Object_ptr &ior1, - CORBA::Object_ptr ior2) - ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::NotFound, - TAO_IOP::Duplicate - )); + CORBA::Object_ptr ior2); /// Get the primary member from the IOGR <ior> virtual CORBA::Object_ptr get_primary ( - CORBA::Object_ptr ior) - ACE_THROW_SPEC (( - CORBA::SystemException, - TAO_IOP::NotFound - )); + CORBA::Object_ptr ior); /// Is there a primary available for <ior> virtual CORBA::Boolean is_primary_set ( - CORBA::Object_ptr ior) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + CORBA::Object_ptr ior); virtual CORBA::Boolean remove_primary_tag ( - CORBA::Object_ptr &iogr) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Object_ptr &iogr); /// Reset the underlying tagged components held by the class CORBA::Boolean reset_tagged_components ( @@ -109,8 +92,7 @@ public: /// Extract the TagFTGroupTaggedComponent inside the <ior> CORBA::Boolean get_tagged_component ( const CORBA::Object_ptr iogr, - FT::TagFTGroupTaggedComponent &ft_group) const - ACE_THROW_SPEC ((CORBA::SystemException)); + FT::TagFTGroupTaggedComponent &ft_group) const; private: diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp index cdc5d50b363..5c6b3cf6212 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp @@ -7,7 +7,7 @@ #include "tao/Profile.h" #include "tao/Endpoint.h" #include "tao/Base_Transport_Property.h" -#include "tao/Environment.h" +#include "tao/SystemException.h" #include "tao/debug.h" #include "ace/Log_Msg.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp index 05312105af0..4d99eaf8b0a 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp @@ -19,14 +19,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO_FT_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO_FT_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_policy_factories (info); @@ -38,7 +36,6 @@ TAO_FT_ORBInitializer::post_init ( void TAO_FT_ORBInitializer::register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Register the FTCORBA policy factories. @@ -81,7 +78,6 @@ TAO_FT_ORBInitializer::register_policy_factories ( void TAO_FT_ORBInitializer::register_server_request_interceptors ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ServerRequestInterceptor_ptr sri = PortableInterceptor::ServerRequestInterceptor::_nil (); @@ -100,7 +96,6 @@ TAO_FT_ORBInitializer::register_server_request_interceptors ( void TAO_FT_ORBInitializer::register_client_request_interceptors ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ClientRequestInterceptor_ptr cri = PortableInterceptor::ClientRequestInterceptor::_nil (); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h index e3c00a8dc2a..aba180a7e2d 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h @@ -40,27 +40,22 @@ class TAO_FT_ORBInitializer { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: /// Register FTCORBA policy factories. void register_policy_factories ( - PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ORBInitInfo_ptr info); /// Register the necessary interceptors. void register_server_request_interceptors ( - PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ORBInitInfo_ptr info); void register_client_request_interceptors ( - PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ORBInitInfo_ptr info); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp index 8d0fb2b0d53..2c101c7601f 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp @@ -16,8 +16,6 @@ CORBA::Policy_ptr TAO_FT_PolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &val) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)) { if (type == FT::REQUEST_DURATION_POLICY) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h index 849f149480e..fd3ba323a2d 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h @@ -45,9 +45,7 @@ class TAO_FT_PolicyFactory public: virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, - const CORBA::Any &value) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)); + const CORBA::Any &value); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp index 4ebfaaa3e0a..de34ec90dd8 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp @@ -13,14 +13,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TimeBase::TimeT TAO_FT_Request_Duration_Policy::request_duration_policy_value (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->request_duration_; } CORBA::PolicyType TAO_FT_Request_Duration_Policy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return FT::REQUEST_DURATION_POLICY; } @@ -53,7 +51,6 @@ TAO_FT_Request_Duration_Policy::clone (void) const CORBA::Policy_ptr TAO_FT_Request_Duration_Policy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_FT_Request_Duration_Policy* tmp; ACE_NEW_THROW_EX (tmp, TAO_FT_Request_Duration_Policy (*this), @@ -65,7 +62,6 @@ TAO_FT_Request_Duration_Policy::copy (void) void TAO_FT_Request_Duration_Policy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -93,7 +89,6 @@ TAO_FT_Request_Duration_Policy::set_time_value (ACE_Time_Value &time_value) FT::HeartbeatPolicyValue TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { FT::HeartbeatPolicyValue val; val.heartbeat = this->heartbeat_; @@ -125,7 +120,6 @@ TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val) CORBA::PolicyType TAO_FT_Heart_Beat_Policy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return FT::HEARTBEAT_POLICY; } @@ -133,7 +127,6 @@ TAO_FT_Heart_Beat_Policy::policy_type (void) CORBA::Policy_ptr TAO_FT_Heart_Beat_Policy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_FT_Heart_Beat_Policy * tmp; ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Policy (*this), @@ -155,7 +148,6 @@ TAO_FT_Heart_Beat_Policy::clone (void) const void TAO_FT_Heart_Beat_Policy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -183,7 +175,6 @@ TAO_FT_Heart_Beat_Policy::set_time_value (ACE_Time_Value &time_value, CORBA::Boolean TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value () - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->heartbeat_enabled_value_; } @@ -208,7 +199,6 @@ TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val) CORBA::PolicyType TAO_FT_Heart_Beat_Enabled_Policy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return FT::HEARTBEAT_ENABLED_POLICY; } @@ -216,7 +206,6 @@ TAO_FT_Heart_Beat_Enabled_Policy::policy_type (void) CORBA::Policy_ptr TAO_FT_Heart_Beat_Enabled_Policy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_FT_Heart_Beat_Enabled_Policy * tmp; ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Enabled_Policy (*this), @@ -239,7 +228,6 @@ TAO_FT_Heart_Beat_Enabled_Policy::clone (void) const void TAO_FT_Heart_Beat_Enabled_Policy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h index b4706c0b528..5e40b4b054c 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h @@ -60,17 +60,13 @@ public: virtual TAO_FT_Request_Duration_Policy *clone (void) const; // = The FT::RequestDurationPolicy methods - virtual TimeBase::TimeT request_duration_policy_value (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual TimeBase::TimeT request_duration_policy_value (void); - virtual CORBA::PolicyType policy_type () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr copy (); - virtual void destroy () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (); /// Change the CORBA representation to the ACE representation. void set_time_value (ACE_Time_Value &time_value); @@ -111,17 +107,13 @@ public: virtual TAO_FT_Heart_Beat_Policy *clone (void) const; // = The FT::HeartBeatPolicy methods - virtual FT::HeartbeatPolicyValue heartbeat_policy_value (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual FT::HeartbeatPolicyValue heartbeat_policy_value (void); - virtual CORBA::PolicyType policy_type () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr copy (); - virtual void destroy () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (); /// Change the CORBA representation to the ACE representation. void set_time_value (ACE_Time_Value &time_value, @@ -171,17 +163,13 @@ public: virtual TAO_FT_Heart_Beat_Enabled_Policy *clone (void) const; // = The FT::HeartBeatPolicy methods - virtual CORBA::Boolean heartbeat_enabled_policy_value () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean heartbeat_enabled_policy_value (); - virtual CORBA::PolicyType policy_type () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr copy (); - virtual void destroy () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (); private: diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp index 99537c5b495..b19137688dd 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp @@ -17,14 +17,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO_FT_ServerORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO_FT_ServerORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_policy_factories (info); @@ -34,7 +32,6 @@ TAO_FT_ServerORBInitializer::post_init ( void TAO_FT_ServerORBInitializer::register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Register the FTCORBA policy factories. @@ -68,7 +65,6 @@ TAO_FT_ServerORBInitializer::register_policy_factories ( void TAO_FT_ServerORBInitializer::register_server_request_interceptors ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ServerRequestInterceptor_ptr sri = PortableInterceptor::ServerRequestInterceptor::_nil (); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h index c328b8ccfd3..ee39f94e988 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h @@ -39,23 +39,19 @@ class TAO_FT_ServerORBInitializer { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: /// Register FTCORBA policy factories. void register_policy_factories ( - PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ORBInitInfo_ptr info); /// Register the necessary interceptors. void register_server_request_interceptors ( - PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ORBInitInfo_ptr info); }; diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp index 610d9a2f621..26803b15aaf 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp @@ -18,8 +18,6 @@ CORBA::Policy_ptr TAO_FT_ServerPolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &val) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)) { if (type == FT::HEARTBEAT_ENABLED_POLICY) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h index b1f8c50e3fc..55eba9ef6fb 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h @@ -43,9 +43,7 @@ class TAO_FT_ServerPolicyFactory public: virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, - const CORBA::Any &value) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)); + const CORBA::Any &value); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp index 9bcc2981aa0..004a5dc57aa 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp @@ -15,7 +15,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Boolean TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value () - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->heartbeat_enabled_value_; } @@ -40,7 +39,6 @@ TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val) CORBA::PolicyType TAO_FT_Heart_Beat_Enabled_Policy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return FT::HEARTBEAT_ENABLED_POLICY; } @@ -48,7 +46,6 @@ TAO_FT_Heart_Beat_Enabled_Policy::policy_type (void) CORBA::Policy_ptr TAO_FT_Heart_Beat_Enabled_Policy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_FT_Heart_Beat_Enabled_Policy * tmp; ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Enabled_Policy (*this), @@ -70,7 +67,6 @@ TAO_FT_Heart_Beat_Enabled_Policy::clone (void) const void TAO_FT_Heart_Beat_Enabled_Policy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h index 0fb86dbeb7a..5d602eec42e 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h @@ -58,17 +58,13 @@ public: virtual TAO_FT_Heart_Beat_Enabled_Policy *clone (void) const; // = The FT::HeartBeatPolicy methods - virtual CORBA::Boolean heartbeat_enabled_policy_value () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean heartbeat_enabled_policy_value (); - virtual CORBA::PolicyType policy_type () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr copy (); - virtual void destroy () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (); private: diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp index f609b5c34e9..d9ed6f5259d 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp @@ -30,22 +30,18 @@ namespace TAO char * FT_ServerRequest_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("TAO_FT_ServerRequest_Interceptor"); } void FT_ServerRequest_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void FT_ServerRequest_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Check for the group version service context try @@ -70,8 +66,6 @@ namespace TAO void FT_ServerRequest_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Check for the group version service context CORBA::String_var op = @@ -89,31 +83,24 @@ namespace TAO void FT_ServerRequest_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void FT_ServerRequest_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void FT_ServerRequest_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void FT_ServerRequest_Interceptor::check_iogr_version ( const IOP::ServiceContext &svc) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { TAO_InputCDR cdr (reinterpret_cast<const char*> (svc.context_data.get_buffer ()), svc.context_data.length ()); @@ -165,7 +152,6 @@ namespace TAO void FT_ServerRequest_Interceptor::update_iogr ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->orb_.in () == 0) { diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h index 9e5e2b6e869..3af991ac16e 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h @@ -69,45 +69,31 @@ namespace TAO */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); //@} private: - void check_iogr_version (const IOP::ServiceContext &svc) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + void check_iogr_version (const IOP::ServiceContext &svc); void update_iogr ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ServerRequestInfo_ptr ri); private: diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp index 9c0e8ed16a2..9485b217bec 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp @@ -22,7 +22,6 @@ TAO_FT_Service_Activate::~TAO_FT_Service_Activate (void) TAO_Service_Callbacks * TAO_FT_Service_Activate::activate_services (TAO_ORB_Core *orb_core) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_FT_Service_Callbacks *ft_service_callback = 0; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp index 3c74fec8208..de912b10127 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp @@ -17,14 +17,12 @@ FTRT_ClientORB_Initializer::FTRT_ClientORB_Initializer (int transaction_depth) void FTRT_ClientORB_Initializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void FTRT_ClientORB_Initializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { info->add_client_request_interceptor (client_interceptor_.in()); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h index 355ff4bb270..3c46e040344 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h @@ -42,11 +42,9 @@ public: /// Priority mapping types FTRT_ClientORB_Initializer (int transaction_depth); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: PortableInterceptor::ClientRequestInterceptor_var client_interceptor_; }; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp index 054fe0838e3..0776f22a784 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp @@ -30,29 +30,24 @@ FTRT_ClientORB_Interceptor::~FTRT_ClientORB_Interceptor (void) char * FTRT_ClientORB_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void FTRT_ClientORB_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void FTRT_ClientORB_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void FTRT_ClientORB_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { ACE_TRACE("FTRT_ClientORB_Interceptor::send_request"); try @@ -98,7 +93,6 @@ FTRT_ClientORB_Interceptor::send_request ( void FTRT_ClientORB_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRACE("FTRT_ClientORB_Interceptor::receive_reply"); @@ -133,16 +127,12 @@ FTRT_ClientORB_Interceptor::receive_reply ( void FTRT_ClientORB_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void FTRT_ClientORB_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr /* ri */) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h index 304a186c184..e1eb6fa03ef 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h @@ -47,29 +47,19 @@ public: virtual ~FTRT_ClientORB_Interceptor (); /// Canonical name of the interceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); private: const char *myname_; CORBA::Long transaction_depth_; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp index 83d7e6c3079..208494e8db1 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp @@ -30,7 +30,6 @@ TAO_FTEC_ConsumerAdmin::~TAO_FTEC_ConsumerAdmin (void) RtecEventChannelAdmin::ProxyPushSupplier_ptr TAO_FTEC_ConsumerAdmin::obtain_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG((LM_DEBUG,"obtain_push_supplier\n" )); return obtain_proxy(); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h index dbaf815d55e..80aedc2752a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h @@ -61,8 +61,7 @@ public: // = The RtecEventChannelAdmin::ConsumerAdmin methods... virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_push_supplier (void); void disconnect(RtecEventChannelAdmin::ProxyPushSupplier_ptr obj); }; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp index 391cc4d77e5..45467d61e82 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp @@ -140,11 +140,6 @@ void TAO_FTEC_Event_Channel::set_listener(TAO_FTEC_Become_Primary_Listener* list void TAO_FTEC_Event_Channel::set_update ( const FTRT::State & s ) - ACE_THROW_SPEC (( - CORBA::SystemException - , FTRT::InvalidUpdate - , FTRT::OutOfSequence - )) { ec_impl_->set_update(s); } @@ -152,9 +147,6 @@ void TAO_FTEC_Event_Channel::set_update ( void TAO_FTEC_Event_Channel::oneway_set_update ( const FTRT::State & s ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ec_impl_->set_update(s); } @@ -162,14 +154,12 @@ void TAO_FTEC_Event_Channel::oneway_set_update ( RtecEventChannelAdmin::ConsumerAdmin_ptr TAO_FTEC_Event_Channel::for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return ec_impl_->for_consumers(); } RtecEventChannelAdmin::SupplierAdmin_ptr TAO_FTEC_Event_Channel::for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return ec_impl_->for_suppliers(); } @@ -177,7 +167,6 @@ TAO_FTEC_Event_Channel::for_suppliers (void) void TAO_FTEC_Event_Channel::set_state (const FTRT::State & s) - ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidState)) { ACE_DEBUG((LM_DEBUG, "TAO_FTEC_Event_Channel::set_state\n")); ec_impl_->set_state(s); @@ -185,7 +174,6 @@ TAO_FTEC_Event_Channel::set_state (const FTRT::State & s) void TAO_FTEC_Event_Channel::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (Fault_Detector::instance()) Fault_Detector::instance()->stop(); @@ -196,10 +184,6 @@ TAO_FTEC_Event_Channel::destroy (void) RtecEventChannelAdmin::Observer_Handle TAO_FTEC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)) { /// we have yet to implement the replication of observers /// throw an exception for the moment @@ -210,10 +194,6 @@ TAO_FTEC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr) void TAO_FTEC_Event_Channel::remove_observer (RtecEventChannelAdmin::Observer_Handle) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)) { /// we have yet to implement the replication of observers /// throw an exception for the moment @@ -229,9 +209,6 @@ TAO_FTEC_Event_Channel::start ( FTRT::FaultListener_ptr listener, FTRT::Location_out location ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return ec_impl_->start(listener, location); } @@ -241,10 +218,6 @@ TAO_FTEC_Event_Channel::create_group ( const FTRT::ManagerInfoList & info_list, CORBA::ULong object_group_ref_version ) - ACE_THROW_SPEC (( - CORBA::SystemException - , FTRT::PredecessorUnreachable - )) { ec_impl_->create_group(info_list, object_group_ref_version); } @@ -253,9 +226,6 @@ void TAO_FTEC_Event_Channel::join_group ( const FTRT::ManagerInfo & info ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ec_impl_->join_group(info); } @@ -265,9 +235,6 @@ TAO_FTEC_Event_Channel::add_member ( const FTRT::ManagerInfo & info, CORBA::ULong object_group_ref_version ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ec_impl_->add_member(info, object_group_ref_version); } @@ -276,9 +243,6 @@ void TAO_FTEC_Event_Channel::remove_member ( const FTRT::Location & crashed_location, CORBA::ULong object_group_ref_version) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ec_impl_->remove_member(crashed_location, object_group_ref_version); @@ -288,9 +252,6 @@ void TAO_FTEC_Event_Channel::replica_crashed ( const FTRT::Location & location ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ec_impl_->replica_crashed(location); } @@ -303,10 +264,6 @@ TAO_FTEC_Event_Channel::connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS & qos ) - ACE_THROW_SPEC (( - CORBA::SystemException - , RtecEventChannelAdmin::TypeError - )) { return ec_impl_->connect_push_consumer(push_consumer, qos); } @@ -317,9 +274,6 @@ TAO_FTEC_Event_Channel::connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS & qos ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return ec_impl_->connect_push_supplier(push_supplier, qos); @@ -329,9 +283,6 @@ void TAO_FTEC_Event_Channel::disconnect_push_supplier ( const FtRtecEventChannelAdmin::ObjectId & oid ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ec_impl_->disconnect_push_supplier(oid); } @@ -340,9 +291,6 @@ void TAO_FTEC_Event_Channel::disconnect_push_consumer ( const FtRtecEventChannelAdmin::ObjectId & oid ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ec_impl_->disconnect_push_consumer(oid); } @@ -351,10 +299,6 @@ void TAO_FTEC_Event_Channel::suspend_push_supplier ( const FtRtecEventChannelAdmin::ObjectId & oid ) - ACE_THROW_SPEC (( - CORBA::SystemException - , FtRtecEventComm::InvalidObjectID - )) { ec_impl_->suspend_push_supplier(oid); } @@ -363,10 +307,6 @@ void TAO_FTEC_Event_Channel::resume_push_supplier ( const FtRtecEventChannelAdmin::ObjectId & oid ) - ACE_THROW_SPEC (( - CORBA::SystemException - , FtRtecEventComm::InvalidObjectID - )) { ec_impl_->resume_push_supplier(oid); } @@ -376,10 +316,6 @@ TAO_FTEC_Event_Channel::push ( const FtRtecEventChannelAdmin::ObjectId & oid, const RtecEventComm::EventSet & data ) - ACE_THROW_SPEC (( - CORBA::SystemException - , FtRtecEventComm::InvalidObjectID - )) { ec_impl_->push(oid, data); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h index a82b2fddcc8..d38754f62a2 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h @@ -64,82 +64,63 @@ public: /// RtecEventChannelAdmin::EventChannel Interface virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + for_consumers (void); virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + for_suppliers (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual RtecEventChannelAdmin::Observer_Handle - append_observer (RtecEventChannelAdmin::Observer_ptr observer) - ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); + append_observer (RtecEventChannelAdmin::Observer_ptr observer); - virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle) - ACE_THROW_SPEC ((CORBA::SystemException,RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)); + virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle); /// EventChannelFacade Interface, used by FTEC gateway virtual ::FtRtecEventChannelAdmin::ObjectId * connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, - const RtecEventChannelAdmin::ConsumerQOS & qos) - ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::TypeError)) ; + const RtecEventChannelAdmin::ConsumerQOS & qos); virtual ::FtRtecEventChannelAdmin::ObjectId * connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, - const RtecEventChannelAdmin::SupplierQOS & qos) - ACE_THROW_SPEC ((CORBA::SystemException)) ; + const RtecEventChannelAdmin::SupplierQOS & qos); virtual void disconnect_push_supplier ( - const FtRtecEventChannelAdmin::ObjectId & oid) - ACE_THROW_SPEC ((CORBA::SystemException)); + const FtRtecEventChannelAdmin::ObjectId & oid); virtual void disconnect_push_consumer ( - const FtRtecEventChannelAdmin::ObjectId & oid) - ACE_THROW_SPEC ((CORBA::SystemException)) ; + const FtRtecEventChannelAdmin::ObjectId & oid); virtual void suspend_push_supplier ( - const FtRtecEventChannelAdmin::ObjectId & oid) - ACE_THROW_SPEC ((CORBA::SystemException, FtRtecEventComm::InvalidObjectID)); + const FtRtecEventChannelAdmin::ObjectId & oid); virtual void resume_push_supplier ( - const FtRtecEventChannelAdmin::ObjectId & oid) - ACE_THROW_SPEC ((CORBA::SystemException, FtRtecEventComm::InvalidObjectID)) ; + const FtRtecEventChannelAdmin::ObjectId & oid); virtual void push ( const FtRtecEventChannelAdmin::ObjectId & oid, - const RtecEventComm::EventSet & data) - ACE_THROW_SPEC ((CORBA::SystemException, FtRtecEventComm::InvalidObjectID)); + const RtecEventComm::EventSet & data); /// FTRT::GroupManager Interfaces /// These are used for inter-replica communications void set_state ( - const FTRT::State & s) - ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidState)); + const FTRT::State & s); - virtual void set_update (const FTRT::State & s) - ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidUpdate, FTRT::OutOfSequence)); + virtual void set_update (const FTRT::State & s); - virtual void oneway_set_update (const FTRT::State & s) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void oneway_set_update (const FTRT::State & s); virtual CORBA::Boolean start ( FTRT::FaultListener_ptr listener, - FTRT::Location_out cur) - ACE_THROW_SPEC ((CORBA::SystemException)); + FTRT::Location_out cur); virtual void create_group ( const FTRT::ManagerInfoList & info_list, - CORBA::ULong object_group_ref_version) - ACE_THROW_SPEC ((CORBA::SystemException, FTRT::PredecessorUnreachable)) ; + CORBA::ULong object_group_ref_version); virtual void join_group ( const FTRT::ManagerInfo & info @@ -147,17 +128,14 @@ public: virtual void add_member ( const FTRT::ManagerInfo & info, - CORBA::ULong object_group_ref_version) - ACE_THROW_SPEC ((CORBA::SystemException)) ; + CORBA::ULong object_group_ref_version); virtual void remove_member ( const FTRT::Location & crashed_location, - CORBA::ULong object_group_ref_version) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ULong object_group_ref_version); virtual void replica_crashed ( - const FTRT::Location & location) - ACE_THROW_SPEC ((CORBA::SystemException)) ; + const FTRT::Location & location); private: diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp index 5171b434179..0a871bebfdf 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -234,7 +234,6 @@ TAO_FTEC_Event_Channel_Impl::activate_object ( /// this->consumer_admin ()->_this (); RtecEventChannelAdmin::ConsumerAdmin_ptr TAO_FTEC_Event_Channel_Impl::for_consumers (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var obj = consumer_admin()->reference(); obj = IOGR_Maker::instance()->forge_iogr(obj.in()); @@ -246,7 +245,6 @@ ACE_THROW_SPEC ((CORBA::SystemException)) /// this->supplier_admin ()->_this (); RtecEventChannelAdmin::SupplierAdmin_ptr TAO_FTEC_Event_Channel_Impl::for_suppliers (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var obj = supplier_admin()->reference(); obj = IOGR_Maker::instance()->forge_iogr(obj.in()); @@ -427,7 +425,6 @@ void TAO_FTEC_Event_Channel_Impl::set_state (const FTRT::State & stat) void TAO_FTEC_Event_Channel_Impl::set_update (const FTRT::State & s) - ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidUpdate)) { FTRTEC::Replication_Service::instance()->check_validity(); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h index 6ae1dd368fd..36c72ef69f6 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h @@ -49,20 +49,17 @@ public: // = The RtecEventChannelAdmin::EventChannel methods... virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + for_consumers (void); virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + for_suppliers (void); void get_state (FtRtecEventChannelAdmin::EventChannelState & s); void set_state (const FTRT::State & stat); - void set_update (const FTRT::State & s) - ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidUpdate)); + void set_update (const FTRT::State & s); /// EventChannelFacade Interface diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp index 5ea216610e2..8d79ea9a362 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp @@ -61,9 +61,6 @@ CORBA::Boolean TAO_FTEC_Group_Manager::start ( FTRT::FaultListener_ptr listener, FTRT::Location_out cur ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { listener_ = listener; ACE_NEW_RETURN(cur , FTRT::Location(Fault_Detector::instance()->my_location()), false); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h index b154e25448f..97981362ac6 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h @@ -35,8 +35,7 @@ public: virtual CORBA::Boolean start ( FTRT::FaultListener_ptr listener, - FTRT::Location_out cur) - ACE_THROW_SPEC ((CORBA::SystemException)); + FTRT::Location_out cur); void create_group ( const FTRT::ManagerInfoList & info_list, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp index 75ee7462d2b..146adb31e89 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp @@ -16,14 +16,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void FTEC_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void FTEC_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { Request_Context_Repository().allocate_slots(info); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h index 80502fc5245..877c6a26205 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h @@ -27,11 +27,9 @@ class FTEC_ORBInitializer , public virtual TAO_Local_RefCounted_Object { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp index 74aea4e3390..bbadda70bea 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp @@ -32,7 +32,6 @@ TAO_FTEC_ProxyPushConsumer::id() const void TAO_FTEC_ProxyPushConsumer::activate ( RtecEventChannelAdmin::ProxyPushConsumer_ptr &result) - ACE_THROW_SPEC ((CORBA::SystemException)) { result = RtecEventChannelAdmin::ProxyPushConsumer::_nil(); try{ @@ -51,8 +50,6 @@ TAO_FTEC_ProxyPushConsumer::activate ( void TAO_FTEC_ProxyPushConsumer::connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS& qos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecEventChannelAdmin::AlreadyConnected)) { if (Request_Context_Repository().is_executed_request()) return; @@ -80,7 +77,6 @@ void TAO_FTEC_ProxyPushConsumer::connect_push_supplier ( } void TAO_FTEC_ProxyPushConsumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (Request_Context_Repository().is_executed_request()) return; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h index 2e45f985862..2da0867c22f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h @@ -34,18 +34,14 @@ public: TAO_FTEC_ProxyPushConsumer (TAO_EC_Event_Channel_Base* event_channel); virtual void activate ( - RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy) - ACE_THROW_SPEC ((CORBA::SystemException)); + RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy); // = The RtecEventChannelAdmin::ProxyPushConsumer methods... virtual void connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, - const RtecEventChannelAdmin::SupplierQOS& qos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecEventChannelAdmin::AlreadyConnected)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + const RtecEventChannelAdmin::SupplierQOS& qos); + virtual void disconnect_push_consumer (void); const FtRtecEventChannelAdmin::ObjectId& id() const; void get_state(FtRtecEventChannelAdmin::ProxyPushConsumerStat& state); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp index e215955c4d5..941de2b9a07 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp @@ -31,7 +31,6 @@ TAO_FTEC_ProxyPushSupplier::id() const void TAO_FTEC_ProxyPushSupplier::activate ( RtecEventChannelAdmin::ProxyPushSupplier_ptr &result) - ACE_THROW_SPEC ((CORBA::SystemException)) { result = @@ -51,9 +50,6 @@ TAO_FTEC_ProxyPushSupplier::activate ( void TAO_FTEC_ProxyPushSupplier::connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS &qos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecEventChannelAdmin::AlreadyConnected, - RtecEventChannelAdmin::TypeError)) { if (Request_Context_Repository().is_executed_request()) return; @@ -81,7 +77,6 @@ void TAO_FTEC_ProxyPushSupplier::connect_push_consumer ( void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (Request_Context_Repository().is_executed_request()) return; @@ -100,7 +95,6 @@ void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (void) void TAO_FTEC_ProxyPushSupplier::suspend_connection (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (Request_Context_Repository().is_executed_request()) return; @@ -126,7 +120,6 @@ void TAO_FTEC_ProxyPushSupplier::suspend_connection (void) } void TAO_FTEC_ProxyPushSupplier::resume_connection (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (Request_Context_Repository().is_executed_request()) return; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h index 90ad86d0101..976deb54b82 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h @@ -35,21 +35,14 @@ public: int validate_connection); /// Activate in the POA virtual void activate ( - RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy) - ACE_THROW_SPEC ((CORBA::SystemException)); + RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy); // = The RtecEventChannelAdmin::ProxyPushSupplier methods... virtual void connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, - const RtecEventChannelAdmin::ConsumerQOS &qos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecEventChannelAdmin::AlreadyConnected, - RtecEventChannelAdmin::TypeError)); - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void suspend_connection (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void resume_connection (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + const RtecEventChannelAdmin::ConsumerQOS &qos); + virtual void disconnect_push_supplier (void); + virtual void suspend_connection (void); + virtual void resume_connection (void); const FtRtecEventChannelAdmin::ObjectId& id() const; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp index 7b1d6ff5b5a..cbf09a94882 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp @@ -28,7 +28,6 @@ TAO_FTEC_SupplierAdmin::~TAO_FTEC_SupplierAdmin() RtecEventChannelAdmin::ProxyPushConsumer_ptr TAO_FTEC_SupplierAdmin::obtain_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return obtain_proxy(); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h index cd1e66b26ac..4498166f2c6 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h @@ -67,8 +67,7 @@ public: // = The RtecEventChannelAdmin::SupplierAdmin methods... virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_push_consumer (void); void disconnect(RtecEventChannelAdmin::ProxyPushConsumer_ptr obj); }; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp index 1109d4a424b..cc29293f026 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp @@ -73,19 +73,15 @@ ForwardCtrlServerInterceptor::~ForwardCtrlServerInterceptor() } char * ForwardCtrlServerInterceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup("ForwardCtrlServerInterceptor"); } void ForwardCtrlServerInterceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ForwardCtrlServerInterceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { try{ IOP::ServiceContext_var service_context = @@ -107,8 +103,6 @@ void ForwardCtrlServerInterceptor::receive_request (PortableInterceptor::ServerR void ForwardCtrlServerInterceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } @@ -135,7 +129,6 @@ FT::ObjectGroupRefVersion get_ft_group_version(IOP::ServiceContext_var service_c void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { IOP::ServiceContext_var service_context; FT::ObjectGroupRefVersion version=0; @@ -207,14 +200,10 @@ void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerReques } void ForwardCtrlServerInterceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void ForwardCtrlServerInterceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h index 533fd02215c..3bbced4d4f6 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h @@ -28,31 +28,20 @@ public: ForwardCtrlServerInterceptor(); ~ForwardCtrlServerInterceptor(); - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index 4d05f000f95..a863cef8ebb 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -185,30 +185,24 @@ FtEventServiceInterceptor::instance() char * FtEventServiceInterceptor::name (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("FtEventServiceInterceptor"); } void FtEventServiceInterceptor::destroy (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { } void FtEventServiceInterceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var operation = ri->operation (); if (ACE_OS::strcmp(operation.in(), "push") == 0) { @@ -257,7 +251,6 @@ FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestIn void FtEventServiceInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { FT::FTRequestServiceContext ft_request_service_context; IOP::ServiceContext_var service_context; @@ -279,15 +272,11 @@ FtEventServiceInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_pt void FtEventServiceInterceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void FtEventServiceInterceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h index 4e7d566c74c..c362d5f67c9 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h @@ -54,31 +54,20 @@ public: ~FtEventServiceInterceptor(); static FtEventServiceInterceptor* instance(); - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr); void get_state(FtRtecEventChannelAdmin::CachedOptionResults& state); void set_state(const FtRtecEventChannelAdmin::CachedOptionResults& state); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp index 37a69cd8ceb..4ca242fd20a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp @@ -12,7 +12,6 @@ ObjectGroupManagerHandler::ObjectGroupManagerHandler( void ObjectGroupManagerHandler::start (CORBA::Boolean ami_return_val, const FTRT::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG(ami_return_val); ACE_UNUSED_ARG(the_location); @@ -20,25 +19,21 @@ ObjectGroupManagerHandler::start (CORBA::Boolean ami_return_val, void ObjectGroupManagerHandler::start_excep (::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ObjectGroupManagerHandler::create_group (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ObjectGroupManagerHandler::create_group_excep (::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ObjectGroupManagerHandler::add_member (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (--num_backups_ ==0) evt_.signal(); @@ -46,20 +41,17 @@ ObjectGroupManagerHandler::add_member (void) void ObjectGroupManagerHandler::add_member_excep (::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->add_member(); } void ObjectGroupManagerHandler::set_state (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ObjectGroupManagerHandler::set_state_excep (::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h index 252d0df335d..d1938c74516 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h @@ -23,29 +23,21 @@ class ObjectGroupManagerHandler public: ObjectGroupManagerHandler(ACE_Auto_Event& evt, int num_backups); virtual void start (CORBA::Boolean ami_return_val, - const FTRT::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException)); + const FTRT::Location & the_location); - virtual void start_excep (::Messaging::ExceptionHolder * excep_holder) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void start_excep (::Messaging::ExceptionHolder * excep_holder); - virtual void create_group (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void create_group (void); - virtual void create_group_excep (::Messaging::ExceptionHolder * excep_holder) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void create_group_excep (::Messaging::ExceptionHolder * excep_holder); - virtual void add_member (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void add_member (void); - virtual void add_member_excep (::Messaging::ExceptionHolder * excep_holder) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void add_member_excep (::Messaging::ExceptionHolder * excep_holder); - virtual void set_state (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void set_state (void); - virtual void set_state_excep (::Messaging::ExceptionHolder * excep_holder) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void set_state_excep (::Messaging::ExceptionHolder * excep_holder); private: ACE_Auto_Event& evt_; ACE_Atomic_Op< ACE_SYNCH_MUTEX, int > num_backups_; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp index 9434df42bf9..93c0c646e52 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp @@ -22,21 +22,18 @@ TAO_Set_Update_Interceptor::~TAO_Set_Update_Interceptor (void) char * TAO_Set_Update_Interceptor::name (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void TAO_Set_Update_Interceptor::destroy (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO_Set_Update_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Do Nothing } @@ -44,8 +41,6 @@ TAO_Set_Update_Interceptor::send_poll ( void TAO_Set_Update_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var operation = ri->operation (); @@ -134,23 +129,18 @@ TAO_Set_Update_Interceptor::send_request ( void TAO_Set_Update_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO_Set_Update_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void TAO_Set_Update_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h index e8f28530c9d..5823e871dab 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h @@ -47,30 +47,20 @@ public: virtual ~TAO_Set_Update_Interceptor (); // dtor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); private: const char *myname_; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp index 5806ef940fd..826664b8a8e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp @@ -62,9 +62,6 @@ void UpdateableHandler::dispatch(UpdateableHandler::Handler handler) void UpdateableHandler::set_update ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ACE_DEBUG((LM_DEBUG,"Received reply from ")); dispatch(&Update_Manager::handle_reply); @@ -72,9 +69,6 @@ void UpdateableHandler::set_update ( void UpdateableHandler::set_update_excep ( ::Messaging::ExceptionHolder * excep_holder ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ACE_DEBUG((LM_DEBUG, "Received Exception from")); try{ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h index 14bb614b20d..65e04ce4026 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h @@ -37,16 +37,10 @@ public: void dispatch(Handler handler) ; virtual void set_update ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void set_update_excep ( ::Messaging::ExceptionHolder * excep_holder - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); private: AMI_Primary_Replication_Strategy* strategy_; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp index f36a3765d6c..ab7250abb9d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp @@ -24,8 +24,7 @@ public: ~FTEC_Gateway_ConsumerAdmin(); // = The RtecEventChannelAdmin::ConsumerAdmin methods... virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_push_supplier (void); FTEC_Gateway_Impl* impl_; }; @@ -37,8 +36,7 @@ public: ~FTEC_Gateway_SupplierAdmin(); // = The RtecEventChannelAdmin::SupplierAdmin methods... virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_push_consumer (void); FTEC_Gateway_Impl* impl_; }; @@ -51,16 +49,10 @@ public: // = The RtecEventChannelAdmin::ProxyPushSupplier methods... virtual void connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, - const RtecEventChannelAdmin::ConsumerQOS &qos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecEventChannelAdmin::AlreadyConnected, - RtecEventChannelAdmin::TypeError)); - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void suspend_connection (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void resume_connection (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + const RtecEventChannelAdmin::ConsumerQOS &qos); + virtual void disconnect_push_supplier (void); + virtual void suspend_connection (void); + virtual void resume_connection (void); FTEC_Gateway_Impl* impl_; }; @@ -71,16 +63,12 @@ public: FTEC_Gateway_ProxyPushConsumer(FTEC_Gateway_Impl* impl); ~FTEC_Gateway_ProxyPushConsumer(); - virtual void push (const RtecEventComm::EventSet & data) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet & data); // = The RtecEventChannelAdmin::ProxyPushConsumer methods... virtual void connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, - const RtecEventChannelAdmin::SupplierQOS& qos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecEventChannelAdmin::AlreadyConnected)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + const RtecEventChannelAdmin::SupplierQOS& qos); + virtual void disconnect_push_consumer (void); FTEC_Gateway_Impl* impl_; }; @@ -90,11 +78,9 @@ class PushConsumerHandler : public POA_FtRtecEventComm::AMI_PushConsumerHandler public: PushConsumerHandler(); ~PushConsumerHandler(); - virtual void push (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (void); - virtual void push_excep (::Messaging::ExceptionHolder * excep_holder) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push_excep (::Messaging::ExceptionHolder * excep_holder); }; /** @@ -228,40 +214,29 @@ FTEC_Gateway::activate(PortableServer::POA_ptr root_poa) //= The RtecEventChannelAdmin::EventChannel methods RtecEventChannelAdmin::ConsumerAdmin_ptr FTEC_Gateway::for_consumers (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { return RtecEventChannelAdmin::ConsumerAdmin::_duplicate(impl_->consumer_admin.in()); } RtecEventChannelAdmin::SupplierAdmin_ptr FTEC_Gateway::for_suppliers (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG((LM_DEBUG, "FTEC_Gateway::for_suppliers\n")); return RtecEventChannelAdmin::SupplierAdmin::_duplicate(impl_->supplier_admin.in()); } void FTEC_Gateway::destroy (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { impl_->ftec->destroy(); } RtecEventChannelAdmin::Observer_Handle FTEC_Gateway::append_observer (RtecEventChannelAdmin::Observer_ptr observer) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)) { return impl_->ftec->append_observer(observer); } void FTEC_Gateway::remove_observer (RtecEventChannelAdmin::Observer_Handle handle) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)) { impl_->ftec->remove_observer(handle); } @@ -291,7 +266,6 @@ FTEC_Gateway_ConsumerAdmin::~FTEC_Gateway_ConsumerAdmin() RtecEventChannelAdmin::ProxyPushSupplier_ptr FTEC_Gateway_ConsumerAdmin::obtain_push_supplier (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { FtRtecEventComm::ObjectId** remote_proxy_oid_ptr; @@ -322,7 +296,6 @@ FTEC_Gateway_SupplierAdmin::~FTEC_Gateway_SupplierAdmin() // = The RtecEventChannelAdmin::SupplierAdmin methods... RtecEventChannelAdmin::ProxyPushConsumer_ptr FTEC_Gateway_SupplierAdmin::obtain_push_consumer (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { FtRtecEventComm::ObjectId** remote_proxy_oid_ptr; ACE_NEW_THROW_EX(remote_proxy_oid_ptr, FtRtecEventComm::ObjectId*, CORBA::NO_MEMORY()); @@ -370,9 +343,6 @@ FTEC_Gateway_ProxyPushSupplier::~FTEC_Gateway_ProxyPushSupplier() void FTEC_Gateway_ProxyPushSupplier::connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS &qos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecEventChannelAdmin::AlreadyConnected, - RtecEventChannelAdmin::TypeError)) { FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in()); @@ -381,7 +351,6 @@ void FTEC_Gateway_ProxyPushSupplier::connect_push_consumer ( } void FTEC_Gateway_ProxyPushSupplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in()); impl_->ftec->disconnect_push_supplier(**oid_ptr); @@ -390,14 +359,12 @@ void FTEC_Gateway_ProxyPushSupplier::disconnect_push_supplier (void) } void FTEC_Gateway_ProxyPushSupplier::suspend_connection (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in()); impl_->ftec->suspend_push_supplier(**oid_ptr); } void FTEC_Gateway_ProxyPushSupplier::resume_connection (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in()); impl_->ftec->resume_push_supplier(**oid_ptr); @@ -418,7 +385,6 @@ FTEC_Gateway_ProxyPushConsumer::~FTEC_Gateway_ProxyPushConsumer() // = The RtecEventChannelAdmin::ProxyPushConsumer methods... void FTEC_Gateway_ProxyPushConsumer::push (const RtecEventComm::EventSet & data) - ACE_THROW_SPEC ((CORBA::SystemException)) { FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in()); @@ -437,15 +403,12 @@ void FTEC_Gateway_ProxyPushConsumer::push (const RtecEventComm::EventSet & data) void FTEC_Gateway_ProxyPushConsumer::connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS& qos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecEventChannelAdmin::AlreadyConnected)) { FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in()); *oid_ptr = impl_->ftec->connect_push_supplier(push_supplier, qos); } void FTEC_Gateway_ProxyPushConsumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in()); impl_->ftec->disconnect_push_consumer(**oid_ptr); @@ -462,12 +425,10 @@ PushConsumerHandler::~PushConsumerHandler() } void PushConsumerHandler::push (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void PushConsumerHandler::push_excep (::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h index 61dc86eaec3..b5c8a4673dc 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h @@ -38,15 +38,12 @@ namespace TAO_FTRTEC //= The RtecEventChannelAdmin::EventChannel methods virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (void) - ACE_THROW_SPEC((CORBA::SystemException)); + for_consumers (void); virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (void) - ACE_THROW_SPEC((CORBA::SystemException)); + for_suppliers (void); - virtual void destroy (void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void destroy (void); virtual RtecEventChannelAdmin::Observer_Handle append_observer diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp index b41499fce78..96ff901bb8b 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp @@ -10,7 +10,7 @@ #include "tao/debug.h" #include "tao/ORB_Core.h" #include "tao/Client_Strategy_Factory.h" -#include "tao/Environment.h" +#include "tao/SystemException.h" #include "tao/Base_Transport_Property.h" #include "tao/Transport_Cache_Manager.h" #include "tao/Connect_Strategy.h" diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp index 03d827bba4c..e2af033bd2a 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp @@ -7,7 +7,7 @@ #include "ace/os_include/os_netdb.h" #include "tao/CDR.h" -#include "tao/Environment.h" +#include "tao/SystemException.h" #include "tao/ORB.h" #include "tao/ORB_Core.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp index 1dc902aea56..5dd94dbdbb0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp @@ -26,14 +26,12 @@ TAO_AbstractInterfaceDef_i::~TAO_AbstractInterfaceDef_i (void) CORBA::DefinitionKind TAO_AbstractInterfaceDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_AbstractInterface; } CORBA::Boolean TAO_AbstractInterfaceDef_i::is_a (const char *interface_id) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -44,7 +42,6 @@ TAO_AbstractInterfaceDef_i::is_a (const char *interface_id) CORBA::Boolean TAO_AbstractInterfaceDef_i::is_a_i (const char *interface_id) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/AbstractBase:1.0") == 0) { diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h index 6d63cbf1b50..ba0740d3bfe 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h @@ -52,19 +52,16 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Return our definition kind. virtual CORBA::Boolean is_a ( const char *interface_id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::Boolean is_a_i ( const char *interface_id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp index 0bc48826570..ca9da20fd00 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp @@ -27,14 +27,12 @@ TAO_AliasDef_i::~TAO_AliasDef_i (void) CORBA::DefinitionKind TAO_AliasDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Alias; } CORBA::TypeCode_ptr TAO_AliasDef_i::type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -45,7 +43,6 @@ TAO_AliasDef_i::type (void) CORBA::TypeCode_ptr TAO_AliasDef_i::type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -79,7 +76,6 @@ TAO_AliasDef_i::type_i (void) CORBA::IDLType_ptr TAO_AliasDef_i::original_type_def (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -90,7 +86,6 @@ TAO_AliasDef_i::original_type_def (void) CORBA::IDLType_ptr TAO_AliasDef_i::original_type_def_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString original_type; this->repo_->config ()->get_string_value (this->section_key_, @@ -106,7 +101,6 @@ TAO_AliasDef_i::original_type_def_i (void) void TAO_AliasDef_i::original_type_def (CORBA::IDLType_ptr original_type_def) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -117,7 +111,6 @@ TAO_AliasDef_i::original_type_def (CORBA::IDLType_ptr original_type_def) void TAO_AliasDef_i::original_type_def_i (CORBA::IDLType_ptr original_type_def) - ACE_THROW_SPEC ((CORBA::SystemException)) { char *original_type = TAO_IFR_Service_Utils::reference_to_path (original_type_def); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h index c49b2b306c1..ec8a9930010 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h @@ -52,37 +52,30 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Return our definition kind. virtual CORBA::TypeCode_ptr type () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From IDLType_i's pure virtual function. virtual CORBA::IDLType_ptr original_type_def () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; CORBA::IDLType_ptr original_type_def_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual void original_type_def ( CORBA::IDLType_ptr original_type_def) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; void original_type_def_i ( CORBA::IDLType_ptr original_type_def) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp index 1ca4f010a9b..9cf86a4e01e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp @@ -25,14 +25,12 @@ TAO_ArrayDef_i::~TAO_ArrayDef_i (void) CORBA::DefinitionKind TAO_ArrayDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Array; } void TAO_ArrayDef_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -43,7 +41,6 @@ TAO_ArrayDef_i::destroy (void) void TAO_ArrayDef_i::destroy_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Only if it is (w)string, fixed, array or sequence. this->destroy_element_type (); @@ -60,7 +57,6 @@ TAO_ArrayDef_i::destroy_i (void) CORBA::TypeCode_ptr TAO_ArrayDef_i::type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -71,7 +67,6 @@ TAO_ArrayDef_i::type (void) CORBA::TypeCode_ptr TAO_ArrayDef_i::type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::TypeCode_var element_typecode = this->element_type_i (); @@ -86,7 +81,6 @@ TAO_ArrayDef_i::type_i (void) CORBA::ULong TAO_ArrayDef_i::length (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -97,7 +91,6 @@ TAO_ArrayDef_i::length (void) CORBA::ULong TAO_ArrayDef_i::length_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { u_int length = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -109,7 +102,6 @@ TAO_ArrayDef_i::length_i (void) void TAO_ArrayDef_i::length (CORBA::ULong length) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -120,7 +112,6 @@ TAO_ArrayDef_i::length (CORBA::ULong length) void TAO_ArrayDef_i::length_i (CORBA::ULong length) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_integer_value (this->section_key_, "length", @@ -129,7 +120,6 @@ TAO_ArrayDef_i::length_i (CORBA::ULong length) CORBA::TypeCode_ptr TAO_ArrayDef_i::element_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -140,7 +130,6 @@ TAO_ArrayDef_i::element_type (void) CORBA::TypeCode_ptr TAO_ArrayDef_i::element_type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString element_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -155,7 +144,6 @@ TAO_ArrayDef_i::element_type_i (void) CORBA::IDLType_ptr TAO_ArrayDef_i::element_type_def (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -166,7 +154,6 @@ TAO_ArrayDef_i::element_type_def (void) CORBA::IDLType_ptr TAO_ArrayDef_i::element_type_def_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString element_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -182,7 +169,6 @@ TAO_ArrayDef_i::element_type_def_i (void) void TAO_ArrayDef_i::element_type_def (CORBA::IDLType_ptr element_type_def) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -193,7 +179,6 @@ TAO_ArrayDef_i::element_type_def (CORBA::IDLType_ptr element_type_def) void TAO_ArrayDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->destroy_element_type (); @@ -208,7 +193,6 @@ TAO_ArrayDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def) void TAO_ArrayDef_i::destroy_element_type ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString element_path; this->repo_->config ()->get_string_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h index 34242a7312c..405dbc2f3c6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h @@ -51,75 +51,59 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Return our definition kind. virtual void destroy () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Remove the repository entry. virtual void destroy_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual CORBA::TypeCode_ptr type () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual CORBA::TypeCode_ptr type_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual CORBA::ULong length () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; CORBA::ULong length_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual void length ( CORBA::ULong length) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; void length_i ( CORBA::ULong length) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual CORBA::TypeCode_ptr element_type () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; CORBA::TypeCode_ptr element_type_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual CORBA::IDLType_ptr element_type_def () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; CORBA::IDLType_ptr element_type_def_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual void element_type_def ( CORBA::IDLType_ptr element_type_def) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; void element_type_def_i ( CORBA::IDLType_ptr element_type_def) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; private: void destroy_element_type () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Destroys an anonymous non-primitive element type. }; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp index 2c6b43db85d..f8be90a495a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp @@ -29,14 +29,12 @@ TAO_AttributeDef_i::~TAO_AttributeDef_i (void) CORBA::DefinitionKind TAO_AttributeDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Attribute; } CORBA::Contained::Description * TAO_AttributeDef_i::describe (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -47,7 +45,6 @@ TAO_AttributeDef_i::describe (void) CORBA::Contained::Description * TAO_AttributeDef_i::describe_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, @@ -71,7 +68,6 @@ TAO_AttributeDef_i::describe_i (void) CORBA::TypeCode_ptr TAO_AttributeDef_i::type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -82,7 +78,6 @@ TAO_AttributeDef_i::type (void) CORBA::TypeCode_ptr TAO_AttributeDef_i::type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString type_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -98,7 +93,6 @@ TAO_AttributeDef_i::type_i (void) CORBA::IDLType_ptr TAO_AttributeDef_i::type_def (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -109,7 +103,6 @@ TAO_AttributeDef_i::type_def (void) CORBA::IDLType_ptr TAO_AttributeDef_i::type_def_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString type_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -127,7 +120,6 @@ TAO_AttributeDef_i::type_def_i (void) void TAO_AttributeDef_i::type_def (CORBA::IDLType_ptr type_def) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -138,7 +130,6 @@ TAO_AttributeDef_i::type_def (CORBA::IDLType_ptr type_def) void TAO_AttributeDef_i::type_def_i (CORBA::IDLType_ptr type_def) - ACE_THROW_SPEC ((CORBA::SystemException)) { char *type_path = TAO_IFR_Service_Utils::reference_to_path (type_def); @@ -150,7 +141,6 @@ TAO_AttributeDef_i::type_def_i (CORBA::IDLType_ptr type_def) CORBA::AttributeMode TAO_AttributeDef_i::mode (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::ATTR_NORMAL); @@ -161,7 +151,6 @@ TAO_AttributeDef_i::mode (void) CORBA::AttributeMode TAO_AttributeDef_i::mode_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { u_int mode = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -173,7 +162,6 @@ TAO_AttributeDef_i::mode_i (void) void TAO_AttributeDef_i::mode (CORBA::AttributeMode mode) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -184,7 +172,6 @@ TAO_AttributeDef_i::mode (CORBA::AttributeMode mode) void TAO_AttributeDef_i::mode_i (CORBA::AttributeMode mode) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_integer_value (this->section_key_, "mode", @@ -195,7 +182,6 @@ void TAO_AttributeDef_i::make_description ( CORBA::AttributeDescription &ad ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ad.name = this->name_i (); @@ -217,7 +203,6 @@ TAO_AttributeDef_i::make_description ( CORBA::ExceptionDefSeq * TAO_AttributeDef_i::get_exceptions (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue<ACE_TString> path_queue; int index = 0; @@ -289,7 +274,6 @@ TAO_AttributeDef_i::get_exceptions (void) CORBA::ExceptionDefSeq * TAO_AttributeDef_i::put_exceptions (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue<ACE_TString> path_queue; int index = 0; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h index 6f222d8947f..ca48eb0ac52 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h @@ -52,79 +52,63 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Return our definition kind. virtual CORBA::Contained::Description *describe ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From Contained_i's pure virtual function. virtual CORBA::Contained::Description *describe_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::TypeCode_ptr type_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::IDLType_ptr type_def ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::IDLType_ptr type_def_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void type_def ( CORBA::IDLType_ptr type_def - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void type_def_i ( CORBA::IDLType_ptr type_def - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::AttributeMode mode ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::AttributeMode mode_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void mode ( CORBA::AttributeMode mode - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void mode_i ( CORBA::AttributeMode mode - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void make_description ( CORBA::AttributeDescription &ad - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Common code for InterfaceDef to call in // making its own description. // These two are called by Contained::move(). CORBA::ExceptionDefSeq *get_exceptions ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ExceptionDefSeq *put_exceptions ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp index 7c600bfc838..666af7b030e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp @@ -35,7 +35,6 @@ TAO_ComponentContainer_i::create_component ( CORBA::ComponentIR::ComponentDef_ptr base_component, const CORBA::InterfaceDefSeq &supports_interfaces ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::ComponentDef::_nil ()); @@ -56,7 +55,6 @@ TAO_ComponentContainer_i::create_component_i ( CORBA::ComponentIR::ComponentDef_ptr base_component, const CORBA::InterfaceDefSeq &supports_interfaces ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ComponentContainer_i::tmp_name_holder_ = name; ACE_Configuration_Section_Key new_key; @@ -153,7 +151,6 @@ TAO_ComponentContainer_i::create_home ( const CORBA::InterfaceDefSeq &supports_interfaces, CORBA::ValueDef_ptr primary_key ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::HomeDef::_nil ()); @@ -178,7 +175,6 @@ TAO_ComponentContainer_i::create_home_i ( const CORBA::InterfaceDefSeq &supports_interfaces, CORBA::ValueDef_ptr primary_key ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ComponentContainer_i::tmp_name_holder_ = name; ACE_Configuration_Section_Key new_key; @@ -276,7 +272,6 @@ TAO_ComponentContainer_i::create_event ( const CORBA::InterfaceDefSeq &supported_interfaces, const CORBA::ExtInitializerSeq &initializers ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::EventDef::_nil ()); @@ -307,7 +302,6 @@ TAO_ComponentContainer_i::create_event_i ( const CORBA::InterfaceDefSeq &supported_interfaces, const CORBA::ExtInitializerSeq &initializers ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ComponentContainer_i::tmp_name_holder_ = name; ACE_Configuration_Section_Key new_key; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h index b12a80ada92..76ae6cb6edd 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h @@ -59,8 +59,7 @@ public: const char *version, CORBA::ComponentIR::ComponentDef_ptr base_component, const CORBA::InterfaceDefSeq &supports_interfaces - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ComponentIR::ComponentDef_ptr create_component_i ( const char *id, @@ -68,8 +67,7 @@ public: const char *version, CORBA::ComponentIR::ComponentDef_ptr base_component, const CORBA::InterfaceDefSeq &supports_interfaces - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ComponentIR::HomeDef_ptr create_home ( const char *id, @@ -79,8 +77,7 @@ public: CORBA::ComponentIR::ComponentDef_ptr managed_component, const CORBA::InterfaceDefSeq &supports_interfaces, CORBA::ValueDef_ptr primary_key - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ComponentIR::HomeDef_ptr create_home_i ( const char *id, @@ -90,8 +87,7 @@ public: CORBA::ComponentIR::ComponentDef_ptr managed_component, const CORBA::InterfaceDefSeq &supports_interfaces, CORBA::ValueDef_ptr primary_key - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ComponentIR::EventDef_ptr create_event ( const char *id, @@ -104,8 +100,7 @@ public: const CORBA::ValueDefSeq &abstract_base_values, const CORBA::InterfaceDefSeq &supported_interfaces, const CORBA::ExtInitializerSeq &initializers - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ComponentIR::EventDef_ptr create_event_i ( const char *id, @@ -118,8 +113,7 @@ public: const CORBA::ValueDefSeq &abstract_base_values, const CORBA::InterfaceDefSeq &supported_interfaces, const CORBA::ExtInitializerSeq &initializers - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); static int same_as_tmp_name (const char *name); // Called from TAO_IFR_Service_Utils::name_exisits. diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp index a521c6767df..0638a787613 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp @@ -84,14 +84,12 @@ TAO_ComponentDef_i::~TAO_ComponentDef_i (void) CORBA::DefinitionKind TAO_ComponentDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Component; } void TAO_ComponentDef_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -102,7 +100,6 @@ TAO_ComponentDef_i::destroy (void) void TAO_ComponentDef_i::destroy_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our special subsections first, then call destroy_i // on our base class. @@ -142,7 +139,6 @@ TAO_ComponentDef_i::destroy_i (void) CORBA::Contained::Description * TAO_ComponentDef_i::describe (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -153,7 +149,6 @@ TAO_ComponentDef_i::describe (void) CORBA::Contained::Description * TAO_ComponentDef_i::describe_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ComponentIR::ComponentDescription cd; TAO_IFR_Desc_Utils<CORBA::ComponentIR::ComponentDescription, @@ -278,7 +273,6 @@ TAO_ComponentDef_i::describe_i (void) CORBA::TypeCode_ptr TAO_ComponentDef_i::type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -289,7 +283,6 @@ TAO_ComponentDef_i::type (void) CORBA::TypeCode_ptr TAO_ComponentDef_i::type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -309,7 +302,6 @@ TAO_ComponentDef_i::type_i (void) CORBA::InterfaceDefSeq * TAO_ComponentDef_i::supported_interfaces (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -320,7 +312,6 @@ TAO_ComponentDef_i::supported_interfaces (void) CORBA::InterfaceDefSeq * TAO_ComponentDef_i::supported_interfaces_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::InterfaceDefSeq *seq = 0; ACE_NEW_RETURN (seq, @@ -368,7 +359,6 @@ void TAO_ComponentDef_i::supported_interfaces ( const CORBA::InterfaceDefSeq &supported_interfaces ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -381,7 +371,6 @@ void TAO_ComponentDef_i::supported_interfaces_i ( const CORBA::InterfaceDefSeq &supported_interfaces ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Remove the old supported interfaces. this->repo_->config ()->remove_section (this->section_key_, @@ -427,7 +416,6 @@ TAO_ComponentDef_i::supported_interfaces_i ( CORBA::ComponentIR::ComponentDef_ptr TAO_ComponentDef_i::base_component (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::ComponentDef::_nil ()); @@ -438,7 +426,6 @@ TAO_ComponentDef_i::base_component (void) CORBA::ComponentIR::ComponentDef_ptr TAO_ComponentDef_i::base_component_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString base_id; int status = @@ -460,7 +447,6 @@ void TAO_ComponentDef_i::base_component ( CORBA::ComponentIR::ComponentDef_ptr base_component ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -473,7 +459,6 @@ void TAO_ComponentDef_i::base_component_i ( CORBA::ComponentIR::ComponentDef_ptr base_component ) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (base_component)) { @@ -513,7 +498,6 @@ TAO_ComponentDef_i::create_provides ( const char *version, CORBA::InterfaceDef_ptr interface_type ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::ProvidesDef::_nil ()); @@ -532,7 +516,6 @@ TAO_ComponentDef_i::create_provides_i ( const char *version, CORBA::InterfaceDef_ptr interface_type ) - ACE_THROW_SPEC ((CORBA::SystemException)) { return TAO_Port_Utils< @@ -554,7 +537,6 @@ TAO_ComponentDef_i::create_uses (const char *id, const char *version, CORBA::InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::UsesDef::_nil ()); @@ -573,7 +555,6 @@ TAO_ComponentDef_i::create_uses_i (const char *id, const char *version, CORBA::InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple) - ACE_THROW_SPEC ((CORBA::SystemException)) { return TAO_Port_Utils< @@ -594,7 +575,6 @@ TAO_ComponentDef_i::create_emits (const char *id, const char *name, const char *version, CORBA::ValueDef_ptr value) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::EmitsDef::_nil ()); @@ -611,7 +591,6 @@ TAO_ComponentDef_i::create_emits_i (const char *id, const char *name, const char *version, CORBA::ValueDef_ptr value) - ACE_THROW_SPEC ((CORBA::SystemException)) { return TAO_Port_Utils< @@ -632,7 +611,6 @@ TAO_ComponentDef_i::create_publishes (const char *id, const char *name, const char *version, CORBA::ValueDef_ptr value) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::PublishesDef::_nil ()); @@ -649,7 +627,6 @@ TAO_ComponentDef_i::create_publishes_i (const char *id, const char *name, const char *version, CORBA::ValueDef_ptr value) - ACE_THROW_SPEC ((CORBA::SystemException)) { return TAO_Port_Utils< @@ -670,7 +647,6 @@ TAO_ComponentDef_i::create_consumes (const char *id, const char *name, const char *version, CORBA::ValueDef_ptr value) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::ConsumesDef::_nil ()); @@ -687,7 +663,6 @@ TAO_ComponentDef_i::create_consumes_i (const char *id, const char *name, const char *version, CORBA::ValueDef_ptr value) - ACE_THROW_SPEC ((CORBA::SystemException)) { return TAO_Port_Utils< diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h index 86d789c6842..24bf9c837d0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h @@ -55,91 +55,74 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Return our definition kind. virtual void destroy ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Remove the repository entry. void destroy_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Remove the repository entry. virtual CORBA::Contained::Description *describe ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From Contained_i's pure virtual function. CORBA::Contained::Description *describe_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From IDLType_i's pure virtual function. CORBA::TypeCode_ptr type_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From IDLType_i's pure virtual function. virtual CORBA::InterfaceDefSeq *supported_interfaces ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::InterfaceDefSeq *supported_interfaces_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void supported_interfaces ( const CORBA::InterfaceDefSeq &supported_interfaces - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void supported_interfaces_i ( const CORBA::InterfaceDefSeq &supported_interfaces - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ComponentIR::ComponentDef_ptr base_component ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ComponentIR::ComponentDef_ptr base_component_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void base_component ( CORBA::ComponentIR::ComponentDef_ptr base_component - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void base_component_i ( CORBA::ComponentIR::ComponentDef_ptr base_component - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ComponentIR::ProvidesDef_ptr create_provides ( const char *id, const char *name, const char *version, CORBA::InterfaceDef_ptr interface_type - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ComponentIR::ProvidesDef_ptr create_provides_i ( const char *id, const char *name, const char *version, CORBA::InterfaceDef_ptr interface_type - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ComponentIR::UsesDef_ptr create_uses ( const char *id, @@ -147,8 +130,7 @@ public: const char *version, CORBA::InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ComponentIR::UsesDef_ptr create_uses_i ( const char *id, @@ -156,56 +138,49 @@ public: const char *version, CORBA::InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ComponentIR::EmitsDef_ptr create_emits ( const char *id, const char *name, const char *version, CORBA::ValueDef_ptr value - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ComponentIR::EmitsDef_ptr create_emits_i ( const char *id, const char *name, const char *version, CORBA::ValueDef_ptr value - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ComponentIR::PublishesDef_ptr create_publishes ( const char *id, const char *name, const char *version, CORBA::ValueDef_ptr value - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ComponentIR::PublishesDef_ptr create_publishes_i ( const char *id, const char *name, const char *version, CORBA::ValueDef_ptr value - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ComponentIR::ConsumesDef_ptr create_consumes ( const char *id, const char *name, const char *version, CORBA::ValueDef_ptr value - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ComponentIR::ConsumesDef_ptr create_consumes_i ( const char *id, const char *name, const char *version, CORBA::ValueDef_ptr value - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); static int name_clash (const char *name); // Called from TAO_IFR_Service_Utils::name_exists() when we diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp index f8b9a707618..d9948085b90 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp @@ -32,14 +32,12 @@ TAO_ConstantDef_i::~TAO_ConstantDef_i (void) CORBA::DefinitionKind TAO_ConstantDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Constant; } CORBA::Contained::Description * TAO_ConstantDef_i::describe (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -50,7 +48,6 @@ TAO_ConstantDef_i::describe (void) CORBA::Contained::Description * TAO_ConstantDef_i::describe_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, @@ -87,7 +84,6 @@ TAO_ConstantDef_i::describe_i (void) CORBA::TypeCode_ptr TAO_ConstantDef_i::type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -98,7 +94,6 @@ TAO_ConstantDef_i::type (void) CORBA::TypeCode_ptr TAO_ConstantDef_i::type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString type_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -113,7 +108,6 @@ TAO_ConstantDef_i::type_i (void) CORBA::IDLType_ptr TAO_ConstantDef_i::type_def (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -124,7 +118,6 @@ TAO_ConstantDef_i::type_def (void) CORBA::IDLType_ptr TAO_ConstantDef_i::type_def_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString type_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -140,7 +133,6 @@ TAO_ConstantDef_i::type_def_i (void) void TAO_ConstantDef_i::type_def (CORBA::IDLType_ptr type_def) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -151,7 +143,6 @@ TAO_ConstantDef_i::type_def (CORBA::IDLType_ptr type_def) void TAO_ConstantDef_i::type_def_i (CORBA::IDLType_ptr type_def) - ACE_THROW_SPEC ((CORBA::SystemException)) { char *type_path = TAO_IFR_Service_Utils::reference_to_path (type_def); @@ -162,7 +153,6 @@ TAO_ConstantDef_i::type_def_i (CORBA::IDLType_ptr type_def) CORBA::Any * TAO_ConstantDef_i::value (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -173,7 +163,6 @@ TAO_ConstantDef_i::value (void) CORBA::Any * TAO_ConstantDef_i::value_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::TypeCode_var tc = this->type_i (); @@ -213,7 +202,6 @@ TAO_ConstantDef_i::value_i (void) void TAO_ConstantDef_i::value (const CORBA::Any &value) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -224,7 +212,6 @@ TAO_ConstantDef_i::value (const CORBA::Any &value) void TAO_ConstantDef_i::value_i (const CORBA::Any &value) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::TypeCode_var my_tc = this->type_i (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h index d19c6294980..8c67822b50d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h @@ -51,63 +51,50 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Return our definition kind. virtual CORBA::Contained::Description *describe () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From Contained_i's pure virtual function. virtual CORBA::Contained::Description *describe_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr type () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; CORBA::TypeCode_ptr type_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual CORBA::IDLType_ptr type_def () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; CORBA::IDLType_ptr type_def_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual void type_def ( CORBA::IDLType_ptr type_def) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; void type_def_i ( CORBA::IDLType_ptr type_def) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual CORBA::Any *value () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; CORBA::Any *value_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual void value ( const CORBA::Any &value) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; void value_i ( const CORBA::Any &value) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp index ce389958510..17844ebd678 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp @@ -26,7 +26,6 @@ TAO_ConsumesDef_i::~TAO_ConsumesDef_i (void) CORBA::DefinitionKind TAO_ConsumesDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Consumes; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h index 748a33e4a26..d0e7ced65bf 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h @@ -53,8 +53,7 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Return our definition kind. }; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp index 5f2d8d419e5..b378fe7f12a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp @@ -29,7 +29,6 @@ TAO_Contained_i::~TAO_Contained_i (void) void TAO_Contained_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -40,7 +39,6 @@ TAO_Contained_i::destroy (void) void TAO_Contained_i::destroy_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -96,7 +94,6 @@ TAO_Contained_i::destroy_i (void) char * TAO_Contained_i::id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -107,7 +104,6 @@ TAO_Contained_i::id (void) char * TAO_Contained_i::id_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString retval; this->repo_->config ()->get_string_value (this->section_key_, @@ -119,7 +115,6 @@ TAO_Contained_i::id_i (void) void TAO_Contained_i::id (const char *id) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -130,7 +125,6 @@ TAO_Contained_i::id (const char *id) void TAO_Contained_i::id_i (const char *id) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString tmp; if (this->repo_->config ()->get_string_value ( @@ -174,7 +168,6 @@ TAO_Contained_i::id_i (const char *id) char * TAO_Contained_i::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -185,7 +178,6 @@ TAO_Contained_i::name (void) char * TAO_Contained_i::name_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString retval; this->repo_->config ()->get_string_value (this->section_key_, @@ -197,7 +189,6 @@ TAO_Contained_i::name_i (void) char * TAO_Contained_i::version (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -208,7 +199,6 @@ TAO_Contained_i::version (void) char * TAO_Contained_i::version_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString retval; this->repo_->config ()->get_string_value (this->section_key_, @@ -220,7 +210,6 @@ TAO_Contained_i::version_i (void) void TAO_Contained_i::name (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -231,7 +220,6 @@ TAO_Contained_i::name (const char *name) void TAO_Contained_i::name_i (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Check if name already exists in this container. CORBA::Boolean exists = this->name_exists (name); @@ -265,7 +253,6 @@ TAO_Contained_i::name_i (const char *name) void TAO_Contained_i::version (const char *version) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -276,7 +263,6 @@ TAO_Contained_i::version (const char *version) void TAO_Contained_i::version_i (const char *version) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_string_value (this->section_key_, "version", @@ -285,7 +271,6 @@ TAO_Contained_i::version_i (const char *version) CORBA::Container_ptr TAO_Contained_i::defined_in (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::Container::_nil ()); @@ -296,7 +281,6 @@ TAO_Contained_i::defined_in (void) CORBA::Container_ptr TAO_Contained_i::defined_in_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString container_id; this->repo_->config ()->get_string_value (this->section_key_, @@ -325,7 +309,6 @@ TAO_Contained_i::defined_in_i (void) char * TAO_Contained_i::absolute_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -336,7 +319,6 @@ TAO_Contained_i::absolute_name (void) char * TAO_Contained_i::absolute_name_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString absolute_name; this->repo_->config ()->get_string_value (this->section_key_, @@ -348,7 +330,6 @@ TAO_Contained_i::absolute_name_i (void) CORBA::Repository_ptr TAO_Contained_i::containing_repository (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->repo_->repo_objref (); } @@ -356,7 +337,6 @@ TAO_Contained_i::containing_repository (void) CORBA::Contained::Description * TAO_Contained_i::describe ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // This will always be overridden by derived classes. return 0; @@ -365,7 +345,6 @@ TAO_Contained_i::describe ( CORBA::Contained::Description * TAO_Contained_i::describe_i ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // This will always be overridden by derived classes. return 0; @@ -375,7 +354,6 @@ void TAO_Contained_i::move (CORBA::Container_ptr new_container, const char *new_name, const char *new_version) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -389,7 +367,6 @@ TAO_Contained_i::move (CORBA::Container_ptr new_container, CORBA::Boolean TAO_Contained_i::name_exists (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString container_id; this->repo_->config ()->get_string_value (this->section_key_, @@ -506,7 +483,6 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container, const char *new_name, const char *new_version, CORBA::Boolean cleanup) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Repository_var my_repo = this->repo_->repo_objref (); @@ -954,7 +930,6 @@ void TAO_Contained_i::move_pre_process (CORBA::Container_ptr container, const char *contained_path, const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)) { char *container_path = TAO_IFR_Service_Utils::reference_to_path (container); @@ -1008,7 +983,6 @@ TAO_Contained_i::move_pre_process (CORBA::Container_ptr container, void TAO_Contained_i::move_contents (CORBA::Container_ptr new_container) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString name; ACE_TString version; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h index 3abe7761641..c66f8289a98 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h @@ -52,101 +52,79 @@ public: // Destructor. virtual void destroy ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Remove the repository entry. virtual void destroy_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual char *id ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); char *id_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void id ( const char *id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void id_i ( const char *id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual char *name ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); char *name_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void name ( const char *name - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void name_i ( const char *name - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual char *version ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); char *version_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void version ( const char *version - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void version_i ( const char *version - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::Container_ptr defined_in_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual char *absolute_name ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); char *absolute_name_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::Contained::Description *describe ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); - virtual CORBA::Contained::Description *describe_i () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Contained::Description *describe_i (); virtual void move ( CORBA::Container_ptr new_container, const char *new_name, const char *new_version - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); static int same_as_tmp_name (const char *name); // Called from TAO_IFR_Service_Utils::name_exists. @@ -157,8 +135,7 @@ protected: const char *new_name, const char *new_version, CORBA::Boolean cleanup - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Engine for move() with an extra 'cleanup' // parameter. Since a section removal can be // recursive, this need be done only at the top @@ -167,8 +144,7 @@ protected: private: CORBA::Boolean name_exists ( const char *name - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Check if <name> already exists in our container void contents_name_update ( @@ -181,8 +157,7 @@ private: CORBA::Container_ptr container, const char *contained_path, const char *name - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Mangle the names of references that are also // defined in the scope, so a name clash will // not occur when create_* is called. Create_* @@ -190,8 +165,7 @@ private: void move_contents ( CORBA::Container_ptr new_container - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Recursively calls move_i for definitions, // as well as operations and attributes if // applicable. diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp index b5e7f852ea0..627160a2184 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp @@ -36,7 +36,6 @@ TAO_Container_i::~TAO_Container_i (void) void TAO_Container_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -47,7 +46,6 @@ TAO_Container_i::destroy (void) void TAO_Container_i::destroy_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { int index = 0; int status; @@ -174,7 +172,6 @@ TAO_Container_i::destroy_i (void) CORBA::Contained_ptr TAO_Container_i::lookup (const char *search_name) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -185,7 +182,6 @@ TAO_Container_i::lookup (const char *search_name) CORBA::Contained_ptr TAO_Container_i::lookup_i (const char *search_name) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Configuration_Section_Key iter_key; ACE_Configuration_Section_Key work_key; @@ -397,7 +393,6 @@ TAO_Container_i::lookup_i (const char *search_name) CORBA::ContainedSeq * TAO_Container_i::contents (CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -410,7 +405,6 @@ TAO_Container_i::contents (CORBA::DefinitionKind limit_type, CORBA::ContainedSeq * TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ContainedSeq *contents = 0; ACE_NEW_THROW_EX (contents, @@ -539,7 +533,6 @@ TAO_Container_i::lookup_name (const char *search_name, CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -556,7 +549,6 @@ TAO_Container_i::lookup_name_i (const char *search_name, CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue; ACE_Unbounded_Queue<ACE_TString> path_queue; @@ -604,7 +596,6 @@ CORBA::Container::DescriptionSeq * TAO_Container_i::describe_contents (CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -619,7 +610,6 @@ CORBA::Container::DescriptionSeq * TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ContainedSeq_var contents = this->contents_i (limit_type, exclude_inherited); @@ -675,7 +665,6 @@ CORBA::ModuleDef_ptr TAO_Container_i::create_module (const char *id, const char *name, const char *version) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ModuleDef::_nil ()); @@ -690,7 +679,6 @@ CORBA::ModuleDef_ptr TAO_Container_i::create_module_i (const char *id, const char *name, const char *version) - ACE_THROW_SPEC ((CORBA::SystemException)) { // new_key is not needed when creating a module, but it is needed // by most of the other creation methods, so a blank one gets passed in. @@ -723,7 +711,6 @@ TAO_Container_i::create_constant (const char *id, const char *version, CORBA::IDLType_ptr type, const CORBA::Any &value) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ConstantDef::_nil ()); @@ -742,7 +729,6 @@ TAO_Container_i::create_constant_i (const char *id, const char *version, CORBA::IDLType_ptr type, const CORBA::Any &value) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Container_i::tmp_name_holder_ = name; ACE_Configuration_Section_Key new_key; @@ -826,7 +812,6 @@ TAO_Container_i::create_struct (const char *id, const char *name, const char *version, const CORBA::StructMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::StructDef::_nil ()); @@ -843,7 +828,6 @@ TAO_Container_i::create_struct_i (const char *id, const char *name, const char *version, const CORBA::StructMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Container_i::tmp_name_holder_ = name; ACE_Configuration_Section_Key new_key; @@ -921,7 +905,6 @@ TAO_Container_i::create_union (const char *id, const char *version, CORBA::IDLType_ptr discriminator_type, const CORBA::UnionMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::UnionDef::_nil ()); @@ -940,7 +923,6 @@ TAO_Container_i::create_union_i (const char *id, const char *version, CORBA::IDLType_ptr discriminator_type, const CORBA::UnionMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Container_i::tmp_name_holder_ = name; ACE_Configuration_Section_Key new_key; @@ -1029,7 +1011,6 @@ TAO_Container_i::create_enum (const char *id, const char *name, const char *version, const CORBA::EnumMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::EnumDef::_nil ()); @@ -1046,7 +1027,6 @@ TAO_Container_i::create_enum_i (const char *id, const char *name, const char *version, const CORBA::EnumMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Container_i::tmp_name_holder_ = name; ACE_Configuration_Section_Key new_key; @@ -1109,7 +1089,6 @@ TAO_Container_i::create_alias (const char *id, const char *name, const char *version, CORBA::IDLType_ptr original_type) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::AliasDef::_nil ()); @@ -1126,7 +1105,6 @@ TAO_Container_i::create_alias_i (const char *id, const char *name, const char *version, CORBA::IDLType_ptr original_type) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Container_i::tmp_name_holder_ = name; ACE_Configuration_Section_Key new_key; @@ -1164,7 +1142,6 @@ TAO_Container_i::create_interface (const char *id, const char *name, const char *version, const CORBA::InterfaceDefSeq &base_interfaces) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::InterfaceDef::_nil ()); @@ -1181,7 +1158,6 @@ TAO_Container_i::create_interface_i (const char *id, const char *name, const char *version, const CORBA::InterfaceDefSeq &base_interfaces) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Container_i::tmp_name_holder_ = name; ACE_Configuration_Section_Key new_key; @@ -1245,7 +1221,6 @@ TAO_Container_i::create_value ( const CORBA::InterfaceDefSeq &supported_interfaces, const CORBA::InitializerSeq &initializers ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ValueDef::_nil ()); @@ -1276,7 +1251,6 @@ TAO_Container_i::create_value_i ( const CORBA::InterfaceDefSeq &supported_interfaces, const CORBA::InitializerSeq &initializers ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Configuration_Section_Key new_key; ACE_TString path = @@ -1313,7 +1287,6 @@ TAO_Container_i::create_value_box (const char *id, const char *name, const char *version, CORBA::IDLType_ptr original_type_def) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ValueBoxDef::_nil ()); @@ -1331,7 +1304,6 @@ TAO_Container_i::create_value_box_i (const char *id, const char *version, CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Container_i::tmp_name_holder_ = name; ACE_Configuration_Section_Key new_key; @@ -1369,7 +1341,6 @@ TAO_Container_i::create_exception (const char *id, const char *name, const char *version, const CORBA::StructMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ExceptionDef::_nil ()); @@ -1386,7 +1357,6 @@ TAO_Container_i::create_exception_i (const char *id, const char *name, const char *version, const CORBA::StructMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Container_i::tmp_name_holder_ = name; ACE_Configuration_Section_Key new_key; @@ -1450,7 +1420,6 @@ CORBA::NativeDef_ptr TAO_Container_i::create_native (const char *id, const char *name, const char *version) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::NativeDef::_nil ()); @@ -1465,7 +1434,6 @@ CORBA::NativeDef_ptr TAO_Container_i::create_native_i (const char *id, const char *name, const char *version) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Container_i::tmp_name_holder_ = name; ACE_Configuration_Section_Key new_key; @@ -1497,7 +1465,6 @@ TAO_Container_i::create_abstract_interface ( const char *version, const CORBA::AbstractInterfaceDefSeq &base_interfaces ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::AbstractInterfaceDef::_nil ()); @@ -1516,7 +1483,6 @@ TAO_Container_i::create_abstract_interface_i ( const char *version, const CORBA::AbstractInterfaceDefSeq &base_interfaces ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Container_i::tmp_name_holder_ = name; ACE_Configuration_Section_Key new_key; @@ -1574,7 +1540,6 @@ TAO_Container_i::create_local_interface ( const char *version, const CORBA::InterfaceDefSeq &base_interfaces ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::LocalInterfaceDef::_nil ()); @@ -1593,7 +1558,6 @@ TAO_Container_i::create_local_interface_i ( const char *version, const CORBA::InterfaceDefSeq &base_interfaces ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Container_i::tmp_name_holder_ = name; ACE_Configuration_Section_Key new_key; @@ -1657,7 +1621,6 @@ TAO_Container_i::create_ext_value ( const CORBA::InterfaceDefSeq &supported_interfaces, const CORBA::ExtInitializerSeq &initializers ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ExtValueDef::_nil ()); @@ -1688,7 +1651,6 @@ TAO_Container_i::create_ext_value_i ( const CORBA::InterfaceDefSeq &supported_interfaces, const CORBA::ExtInitializerSeq &initializers ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Configuration_Section_Key new_key; ACE_TString path = @@ -2082,7 +2044,6 @@ TAO_Container_i::lookup_op ( void TAO_Container_i::store_label (ACE_Configuration_Section_Key key, const CORBA::Any &value) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::TypeCode_var tc = value.type (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h index 8ca8e62b07c..88af779574a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h @@ -58,79 +58,67 @@ public: // Destructor. virtual void destroy ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Remove our contents. virtual void destroy_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::Contained_ptr lookup ( const char *search_name - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::Contained_ptr lookup_i ( const char *search_name - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ContainedSeq *contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ContainedSeq *contents_i ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ContainedSeq *lookup_name ( const char *search_name, CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ContainedSeq *lookup_name_i ( const char *search_name, CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::Container::DescriptionSeq *describe_contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::Container::DescriptionSeq *describe_contents_i ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ModuleDef_ptr create_module ( const char *id, const char *name, const char *version - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ModuleDef_ptr create_module_i ( const char *id, const char *name, const char *version - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ConstantDef_ptr create_constant ( const char *id, @@ -138,8 +126,7 @@ public: const char *version, CORBA::IDLType_ptr type, const CORBA::Any & value - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ConstantDef_ptr create_constant_i ( const char *id, @@ -147,24 +134,21 @@ public: const char *version, CORBA::IDLType_ptr type, const CORBA::Any & value - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::StructDef_ptr create_struct ( const char *id, const char *name, const char *version, const CORBA::StructMemberSeq &members - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::StructDef_ptr create_struct_i ( const char *id, const char *name, const char *version, const CORBA::StructMemberSeq &members - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::UnionDef_ptr create_union ( const char *id, @@ -172,8 +156,7 @@ public: const char *version, CORBA::IDLType_ptr discriminator_type, const CORBA::UnionMemberSeq &members - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::UnionDef_ptr create_union_i ( const char *id, @@ -181,56 +164,49 @@ public: const char *version, CORBA::IDLType_ptr discriminator_type, const CORBA::UnionMemberSeq &members - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::EnumDef_ptr create_enum ( const char *id, const char *name, const char *version, const CORBA::EnumMemberSeq &members - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::EnumDef_ptr create_enum_i ( const char *id, const char *name, const char *version, const CORBA::EnumMemberSeq &members - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::AliasDef_ptr create_alias ( const char *id, const char *name, const char *version, CORBA::IDLType_ptr original_type - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::AliasDef_ptr create_alias_i ( const char *id, const char *name, const char *version, CORBA::IDLType_ptr original_type - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::InterfaceDef_ptr create_interface ( const char *id, const char *name, const char *version, const CORBA::InterfaceDefSeq &base_interfaces - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::InterfaceDef_ptr create_interface_i ( const char *id, const char *name, const char *version, const CORBA::InterfaceDefSeq &base_interfaces - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ValueDef_ptr create_value ( const char *id, @@ -243,8 +219,7 @@ public: const CORBA::ValueDefSeq &abstract_base_values, const CORBA::InterfaceDefSeq & supported_interfaces, const CORBA::InitializerSeq &initializers - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ValueDef_ptr create_value_i ( const char *id, @@ -257,86 +232,75 @@ public: const CORBA::ValueDefSeq &abstract_base_values, const CORBA::InterfaceDefSeq & supported_interfaces, const CORBA::InitializerSeq &initializers - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ValueBoxDef_ptr create_value_box ( const char *id, const char *name, const char *version, CORBA::IDLType_ptr original_type_def - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ValueBoxDef_ptr create_value_box_i ( const char *id, const char *name, const char *version, CORBA::IDLType_ptr original_type_def - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ExceptionDef_ptr create_exception ( const char *id, const char *name, const char *version, const CORBA::StructMemberSeq &members - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ExceptionDef_ptr create_exception_i ( const char *id, const char *name, const char *version, const CORBA::StructMemberSeq &members - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::NativeDef_ptr create_native ( const char *id, const char *name, const char *version - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::NativeDef_ptr create_native_i ( const char *id, const char *name, const char *version - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::AbstractInterfaceDef_ptr create_abstract_interface ( const char *id, const char *name, const char *version, const CORBA::AbstractInterfaceDefSeq &base_interfaces - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::AbstractInterfaceDef_ptr create_abstract_interface_i ( const char *id, const char *name, const char *version, const CORBA::AbstractInterfaceDefSeq &base_interfaces - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::LocalInterfaceDef_ptr create_local_interface ( const char *id, const char *name, const char *version, const CORBA::InterfaceDefSeq &base_interfaces - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::LocalInterfaceDef_ptr create_local_interface_i ( const char *id, const char *name, const char *version, const CORBA::InterfaceDefSeq &base_interfaces - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual ::CORBA::ExtValueDef_ptr create_ext_value ( const char *id, @@ -349,8 +313,7 @@ public: const CORBA::ValueDefSeq &abstract_base_values, const CORBA::InterfaceDefSeq &supported_interfaces, const CORBA::ExtInitializerSeq &initializers - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ExtValueDef_ptr create_ext_value_i ( const char *id, @@ -363,8 +326,7 @@ public: const CORBA::ValueDefSeq &abstract_base_values, const CORBA::InterfaceDefSeq &supported_interfaces, const CORBA::ExtInitializerSeq &initializers - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); static int same_as_tmp_name (const char *name); // Called from TAO_IFR_Service_Utils::name_exisits. @@ -382,8 +344,7 @@ protected: void store_label ( ACE_Configuration_Section_Key key, const CORBA::Any &value - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Store a union member's label value. void lookup_attr ( diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp index c31ea85374a..9d3b9fed6f2 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp @@ -23,7 +23,6 @@ TAO_EmitsDef_i::~TAO_EmitsDef_i (void) CORBA::DefinitionKind TAO_EmitsDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Emits; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h index 518a12b290b..52e80177b89 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h @@ -53,8 +53,7 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Return our definition kind. }; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp index 90a70b66fdb..2b80c8608ea 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp @@ -27,14 +27,12 @@ TAO_EnumDef_i::~TAO_EnumDef_i (void) CORBA::DefinitionKind TAO_EnumDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Enum; } CORBA::TypeCode_ptr TAO_EnumDef_i::type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -45,7 +43,6 @@ TAO_EnumDef_i::type (void) CORBA::TypeCode_ptr TAO_EnumDef_i::type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -66,7 +63,6 @@ TAO_EnumDef_i::type_i (void) CORBA::EnumMemberSeq * TAO_EnumDef_i::members (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -77,7 +73,6 @@ TAO_EnumDef_i::members (void) CORBA::EnumMemberSeq * TAO_EnumDef_i::members_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { u_int count = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -113,7 +108,6 @@ TAO_EnumDef_i::members_i (void) void TAO_EnumDef_i::members (const CORBA::EnumMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -124,7 +118,6 @@ TAO_EnumDef_i::members (const CORBA::EnumMemberSeq &members) void TAO_EnumDef_i::members_i (const CORBA::EnumMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->remove_section (this->section_key_, "members", diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h index a9f901135bf..4d7830d187c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h @@ -52,37 +52,30 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Return our definition kind. virtual CORBA::TypeCode_ptr type () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From IDLType_i's pure virtual function. virtual CORBA::EnumMemberSeq *members () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; CORBA::EnumMemberSeq *members_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual void members ( const CORBA::EnumMemberSeq &members) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; void members_i ( const CORBA::EnumMemberSeq &members) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp index e682d651f52..5e96026a120 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp @@ -26,14 +26,12 @@ TAO_EventDef_i::~TAO_EventDef_i (void) CORBA::DefinitionKind TAO_EventDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Event; } void TAO_EventDef_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -44,7 +42,6 @@ TAO_EventDef_i::destroy (void) void TAO_EventDef_i::destroy_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // An event type is a restriction of a value type, not an extension. this->TAO_ExtValueDef_i::destroy_i (); @@ -52,7 +49,6 @@ TAO_EventDef_i::destroy_i (void) CORBA::Contained::Description * TAO_EventDef_i::describe (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -63,14 +59,12 @@ TAO_EventDef_i::describe (void) CORBA::Contained::Description * TAO_EventDef_i::describe_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->TAO_ValueDef_i::describe_i (); } CORBA::Boolean TAO_EventDef_i::is_a (const char *event_id) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -81,7 +75,6 @@ TAO_EventDef_i::is_a (const char *event_id) CORBA::Boolean TAO_EventDef_i::is_a_i (const char *event_id) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (ACE_OS::strcmp (event_id, "IDL:omg.org/CORBA/EventBase:1.0") == 0) { diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h index 9746d4289d7..404b59c12ab 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h @@ -52,38 +52,31 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Return our definition kind. virtual void destroy ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Remove the repository entry. virtual void destroy_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::Contained::Description *describe ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From Contained_i's pure virtual function. virtual CORBA::Contained::Description *describe_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From Contained_i's pure virtual function. virtual CORBA::Boolean is_a ( const char *event_id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::Boolean is_a_i ( const char *event_id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp index 71d487f0cdd..5b45b14ee9b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp @@ -28,7 +28,6 @@ TAO_EventPortDef_i::~TAO_EventPortDef_i (void) CORBA::ComponentIR::EventDef_ptr TAO_EventPortDef_i::event ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::EventDef::_nil ()); @@ -40,7 +39,6 @@ TAO_EventPortDef_i::event ( CORBA::ComponentIR::EventDef_ptr TAO_EventPortDef_i::event_i ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString holder; this->repo_->config ()->get_string_value (this->section_key_, @@ -55,7 +53,6 @@ void TAO_EventPortDef_i::event ( CORBA::ComponentIR::EventDef_ptr event ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -68,7 +65,6 @@ void TAO_EventPortDef_i::event_i ( CORBA::ComponentIR::EventDef_ptr event ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->remove_value (this->section_key_, "base_type"); @@ -101,7 +97,6 @@ CORBA::Boolean TAO_EventPortDef_i::is_a ( const char *event_id ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -114,7 +109,6 @@ CORBA::Boolean TAO_EventPortDef_i::is_a_i ( const char *event_id ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString holder; this->repo_->config ()->get_string_value (this->section_key_, @@ -135,7 +129,6 @@ TAO_EventPortDef_i::is_a_i ( CORBA::Contained::Description * TAO_EventPortDef_i::describe (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -146,7 +139,6 @@ TAO_EventPortDef_i::describe (void) CORBA::Contained::Description * TAO_EventPortDef_i::describe_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ComponentIR::EventPortDescription epd; TAO_IFR_Desc_Utils<CORBA::ComponentIR::EventPortDescription, @@ -174,7 +166,6 @@ TAO_EventPortDef_i::describe_i (void) CORBA::DefinitionKind TAO_EventPortDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_none; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h index 0c292797cbb..ee9f8ece331 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h @@ -55,50 +55,41 @@ public: /// Destructor virtual CORBA::ComponentIR::EventDef_ptr event ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ComponentIR::EventDef_ptr event_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void event ( CORBA::ComponentIR::EventDef_ptr event - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void event_i ( CORBA::ComponentIR::EventDef_ptr event - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::Boolean is_a ( const char *event_id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::Boolean is_a_i ( const char *event_id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /// This can be the same for the three derived classes, so it is /// implemented here. virtual CORBA::Contained::Description *describe ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From Contained_i's pure virtual function. virtual CORBA::Contained::Description *describe_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From Contained_i's pure virtual function. private: virtual CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Dummy method so we can consolidate derived class methods // in this 'abstract' base class. }; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp index 44fd01ab2f8..97a956d8bbb 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp @@ -28,14 +28,12 @@ TAO_ExceptionDef_i::~TAO_ExceptionDef_i (void) CORBA::DefinitionKind TAO_ExceptionDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Exception; } void TAO_ExceptionDef_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -46,7 +44,6 @@ TAO_ExceptionDef_i::destroy (void) void TAO_ExceptionDef_i::destroy_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our members. TAO_Container_i::destroy_i (); @@ -57,7 +54,6 @@ TAO_ExceptionDef_i::destroy_i (void) CORBA::Contained::Description * TAO_ExceptionDef_i::describe (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -68,7 +64,6 @@ TAO_ExceptionDef_i::describe (void) CORBA::Contained::Description * TAO_ExceptionDef_i::describe_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, @@ -104,7 +99,6 @@ TAO_ExceptionDef_i::describe_i (void) CORBA::TypeCode_ptr TAO_ExceptionDef_i::type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -115,7 +109,6 @@ TAO_ExceptionDef_i::type (void) CORBA::TypeCode_ptr TAO_ExceptionDef_i::type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -139,7 +132,6 @@ TAO_ExceptionDef_i::type_i (void) CORBA::StructMemberSeq * TAO_ExceptionDef_i::members (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -150,7 +142,6 @@ TAO_ExceptionDef_i::members (void) CORBA::StructMemberSeq * TAO_ExceptionDef_i::members_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue; ACE_Unbounded_Queue<ACE_TString> path_queue; @@ -261,7 +252,6 @@ TAO_ExceptionDef_i::members_i (void) void TAO_ExceptionDef_i::members (const CORBA::StructMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -272,7 +262,6 @@ TAO_ExceptionDef_i::members (const CORBA::StructMemberSeq &members) void TAO_ExceptionDef_i::members_i (const CORBA::StructMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our old members, both refs and defns. TAO_Container_i::destroy_i (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h index ae7c11bbc7f..0f3c0a150d4 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h @@ -53,55 +53,44 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Return our definition kind. virtual void destroy () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Remove the repository entry. virtual void destroy_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Remove the repository entry. virtual CORBA::Contained::Description *describe () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From Contained_i's pure virtual function. virtual CORBA::Contained::Description *describe_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr type () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; CORBA::TypeCode_ptr type_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual CORBA::StructMemberSeq *members () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; CORBA::StructMemberSeq *members_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual void members ( const CORBA::StructMemberSeq & members) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; void members_i ( const CORBA::StructMemberSeq & members) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp index 7daca75390d..75bff6fe02b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp @@ -30,7 +30,6 @@ TAO_ExtAbstractInterfaceDef_i::~TAO_ExtAbstractInterfaceDef_i (void) // disambiguate multiple inheritance. void TAO_ExtAbstractInterfaceDef_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h index 46b883aa6b0..cc55fdfd37f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h @@ -56,8 +56,7 @@ public: // Destructor virtual void destroy ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp index c71daebd1a3..96e511c2419 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp @@ -29,7 +29,6 @@ TAO_ExtAttributeDef_i::~TAO_ExtAttributeDef_i (void) CORBA::ExcDescriptionSeq * TAO_ExtAttributeDef_i::get_exceptions ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -41,7 +40,6 @@ TAO_ExtAttributeDef_i::get_exceptions ( CORBA::ExcDescriptionSeq * TAO_ExtAttributeDef_i::get_exceptions_i ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ExcDescriptionSeq *retval = 0; ACE_NEW_RETURN (retval, @@ -59,7 +57,6 @@ void TAO_ExtAttributeDef_i::get_exceptions ( const CORBA::ExcDescriptionSeq &get_exceptions ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -72,7 +69,6 @@ void TAO_ExtAttributeDef_i::get_exceptions_i ( const CORBA::ExcDescriptionSeq &get_exceptions ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->exceptions ("get_excepts", get_exceptions); @@ -81,7 +77,6 @@ TAO_ExtAttributeDef_i::get_exceptions_i ( CORBA::ExcDescriptionSeq * TAO_ExtAttributeDef_i::set_exceptions ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -93,7 +88,6 @@ TAO_ExtAttributeDef_i::set_exceptions ( CORBA::ExcDescriptionSeq * TAO_ExtAttributeDef_i::set_exceptions_i ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ExcDescriptionSeq *retval = 0; ACE_NEW_RETURN (retval, @@ -111,7 +105,6 @@ void TAO_ExtAttributeDef_i::set_exceptions ( const CORBA::ExcDescriptionSeq &set_exceptions ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -124,7 +117,6 @@ void TAO_ExtAttributeDef_i::set_exceptions_i ( const CORBA::ExcDescriptionSeq &set_exceptions ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->exceptions ("put_excepts", set_exceptions); @@ -133,7 +125,6 @@ TAO_ExtAttributeDef_i::set_exceptions_i ( CORBA::ExtAttributeDescription * TAO_ExtAttributeDef_i::describe_attribute ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -145,7 +136,6 @@ TAO_ExtAttributeDef_i::describe_attribute ( CORBA::ExtAttributeDescription * TAO_ExtAttributeDef_i::describe_attribute_i ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ExtAttributeDescription *retval = 0; ACE_NEW_RETURN (retval, @@ -162,7 +152,6 @@ void TAO_ExtAttributeDef_i::fill_description ( CORBA::ExtAttributeDescription &desc ) - ACE_THROW_SPEC ((CORBA::SystemException)) { desc.name = this->name_i (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h index 8fe264559e3..6d070f30f21 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h @@ -52,55 +52,44 @@ public: // Destructor virtual CORBA::ExcDescriptionSeq *get_exceptions ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ExcDescriptionSeq *get_exceptions_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void get_exceptions ( const CORBA::ExcDescriptionSeq &get_exceptions - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void get_exceptions_i ( const CORBA::ExcDescriptionSeq &get_exceptions - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ExcDescriptionSeq *set_exceptions ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ExcDescriptionSeq *set_exceptions_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void set_exceptions ( const CORBA::ExcDescriptionSeq &set_exceptions - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void set_exceptions_i ( const CORBA::ExcDescriptionSeq &set_exceptions - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ExtAttributeDescription *describe_attribute ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ExtAttributeDescription *describe_attribute_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Utility function that fills sequence elements for a // ComponentDescription. void fill_description ( CORBA::ExtAttributeDescription &desc - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); private: /// Common code for the set and get varieties. diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp index f857c37adb0..c15b0fc00ef 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp @@ -30,7 +30,6 @@ TAO_ExtLocalInterfaceDef_i::~TAO_ExtLocalInterfaceDef_i (void) // disambiguate multiple inheritance. void TAO_ExtLocalInterfaceDef_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h index fcf64d09eb7..a0e8f3ae022 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h @@ -55,8 +55,7 @@ public: // Destructor virtual void destroy ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp index 4fd5b7b99da..7e0a06bab6f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp @@ -31,7 +31,6 @@ TAO_ExtValueDef_i::~TAO_ExtValueDef_i (void) CORBA::ExtInitializerSeq * TAO_ExtValueDef_i::ext_initializers ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -43,7 +42,6 @@ TAO_ExtValueDef_i::ext_initializers ( CORBA::ExtInitializerSeq * TAO_ExtValueDef_i::ext_initializers_i ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ExtInitializerSeq *iseq = 0; ACE_NEW_RETURN (iseq, @@ -143,7 +141,6 @@ void TAO_ExtValueDef_i::ext_initializers ( const CORBA::ExtInitializerSeq &ext_initializers ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -156,7 +153,6 @@ void TAO_ExtValueDef_i::ext_initializers_i ( const CORBA::ExtInitializerSeq &ext_initializers ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Configuration *config = this->repo_->config (); config->remove_section (this->section_key_, @@ -200,7 +196,6 @@ TAO_ExtValueDef_i::ext_initializers_i ( CORBA::ExtValueDef::ExtFullValueDescription * TAO_ExtValueDef_i::describe_ext_value ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -212,7 +207,6 @@ TAO_ExtValueDef_i::describe_ext_value ( CORBA::ExtValueDef::ExtFullValueDescription * TAO_ExtValueDef_i::describe_ext_value_i ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ExtValueDef::ExtFullValueDescription *fv_desc = 0; ACE_NEW_RETURN (fv_desc, @@ -710,7 +704,6 @@ TAO_ExtValueDef_i::create_ext_attribute ( const CORBA::ExceptionDefSeq &get_exceptions, const CORBA::ExceptionDefSeq &set_exceptions ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ExtAttributeDef::_nil ()); @@ -735,7 +728,6 @@ TAO_ExtValueDef_i::create_ext_attribute_i ( const CORBA::ExceptionDefSeq &get_exceptions, const CORBA::ExceptionDefSeq &set_exceptions ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Container_i::tmp_name_holder_ = name; ACE_Configuration_Section_Key new_key; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h index b23c69a8c1a..0c2e06a00b9 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h @@ -52,30 +52,24 @@ public: // Destructor virtual CORBA::ExtInitializerSeq *ext_initializers ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ExtInitializerSeq *ext_initializers_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void ext_initializers ( const CORBA::ExtInitializerSeq &ext_initializers - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void ext_initializers_i ( const CORBA::ExtInitializerSeq &ext_initializers - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ExtValueDef::ExtFullValueDescription *describe_ext_value ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ExtValueDef::ExtFullValueDescription *describe_ext_value_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ExtAttributeDef_ptr create_ext_attribute ( const char *id, @@ -85,8 +79,7 @@ public: CORBA::AttributeMode mode, const CORBA::ExceptionDefSeq &get_exceptions, const CORBA::ExceptionDefSeq &set_exceptions - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ExtAttributeDef_ptr create_ext_attribute_i ( const char *id, @@ -96,8 +89,7 @@ public: CORBA::AttributeMode mode, const CORBA::ExceptionDefSeq &get_exceptions, const CORBA::ExceptionDefSeq &set_exceptions - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void exceptions (ACE_Configuration_Section_Key &key, const char *sub_section, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp index af181277e96..e5ca2a5d3ce 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp @@ -24,7 +24,6 @@ TAO_FactoryDef_i::~TAO_FactoryDef_i (void) CORBA::DefinitionKind TAO_FactoryDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Factory; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h index 0d4a5f59b5d..9fbbff065c0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h @@ -51,8 +51,7 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Return our definition kind. }; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp index 8cd8f91422f..ea69e2420e7 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp @@ -23,7 +23,6 @@ TAO_FinderDef_i::~TAO_FinderDef_i (void) CORBA::DefinitionKind TAO_FinderDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Finder; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h index 12784c9c11e..ad465d94ebd 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h @@ -52,8 +52,7 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Return our definition kind. }; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp index 002d747bd15..0a027ade496 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp @@ -21,14 +21,12 @@ TAO_FixedDef_i::~TAO_FixedDef_i (void) CORBA::DefinitionKind TAO_FixedDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Fixed; } void TAO_FixedDef_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -39,14 +37,12 @@ TAO_FixedDef_i::destroy (void) void TAO_FixedDef_i::destroy_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA::TypeCode_ptr TAO_FixedDef_i::type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -57,7 +53,6 @@ TAO_FixedDef_i::type (void) CORBA::TypeCode_ptr TAO_FixedDef_i::type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO return CORBA::TypeCode::_nil (); @@ -65,7 +60,6 @@ TAO_FixedDef_i::type_i (void) CORBA::UShort TAO_FixedDef_i::digits (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -76,7 +70,6 @@ TAO_FixedDef_i::digits (void) CORBA::UShort TAO_FixedDef_i::digits_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO return 0; @@ -84,7 +77,6 @@ TAO_FixedDef_i::digits_i (void) void TAO_FixedDef_i::digits (CORBA::UShort digits) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -96,14 +88,12 @@ TAO_FixedDef_i::digits (CORBA::UShort digits) void TAO_FixedDef_i::digits_i (CORBA::UShort /* digits */ ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA::Short TAO_FixedDef_i::scale (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -114,7 +104,6 @@ TAO_FixedDef_i::scale (void) CORBA::Short TAO_FixedDef_i::scale_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO return 0; @@ -122,7 +111,6 @@ TAO_FixedDef_i::scale_i (void) void TAO_FixedDef_i::scale (CORBA::Short scale) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -134,7 +122,6 @@ TAO_FixedDef_i::scale (CORBA::Short scale) void TAO_FixedDef_i::scale_i (CORBA::Short /* scale */ ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h index 9b65f9b02dc..20842ca7842 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h @@ -51,64 +51,51 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Return our definition kind. virtual void destroy ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Remove the repository entry. virtual void destroy_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From IDLType_i's pure virtual function. virtual CORBA::UShort digits ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::UShort digits_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void digits ( CORBA::UShort digits - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void digits_i ( CORBA::UShort digits - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::Short scale ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::Short scale_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void scale ( CORBA::Short scale - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void scale_i ( CORBA::Short scale - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp index f8ae5fb993e..7e8838fdee0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp @@ -37,14 +37,12 @@ TAO_HomeDef_i::~TAO_HomeDef_i (void) CORBA::DefinitionKind TAO_HomeDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Home; } void TAO_HomeDef_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -55,7 +53,6 @@ TAO_HomeDef_i::destroy (void) void TAO_HomeDef_i::destroy_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our special subsections first, then call destroy_i // on our base class. @@ -77,7 +74,6 @@ TAO_HomeDef_i::destroy_i (void) CORBA::Contained::Description * TAO_HomeDef_i::describe (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -88,7 +84,6 @@ TAO_HomeDef_i::describe (void) CORBA::Contained::Description * TAO_HomeDef_i::describe_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ComponentIR::HomeDescription home_desc; @@ -164,7 +159,6 @@ TAO_HomeDef_i::describe_i (void) CORBA::TypeCode_ptr TAO_HomeDef_i::type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -175,7 +169,6 @@ TAO_HomeDef_i::type (void) CORBA::TypeCode_ptr TAO_HomeDef_i::type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -193,7 +186,6 @@ TAO_HomeDef_i::type_i (void) CORBA::ComponentIR::HomeDef_ptr TAO_HomeDef_i::base_home (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::HomeDef::_nil ()); @@ -204,7 +196,6 @@ TAO_HomeDef_i::base_home (void) CORBA::ComponentIR::HomeDef_ptr TAO_HomeDef_i::base_home_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString path; int status = @@ -228,7 +219,6 @@ void TAO_HomeDef_i::base_home ( CORBA::ComponentIR::HomeDef_ptr base_home ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -241,7 +231,6 @@ void TAO_HomeDef_i::base_home_i ( CORBA::ComponentIR::HomeDef_ptr base_home ) - ACE_THROW_SPEC ((CORBA::SystemException)) { char *path = TAO_IFR_Service_Utils::reference_to_path (base_home); this->repo_->config ()->set_string_value (this->section_key_, @@ -252,7 +241,6 @@ TAO_HomeDef_i::base_home_i ( CORBA::InterfaceDefSeq * TAO_HomeDef_i::supported_interfaces ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -264,7 +252,6 @@ TAO_HomeDef_i::supported_interfaces ( CORBA::InterfaceDefSeq * TAO_HomeDef_i::supported_interfaces_i ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::InterfaceDefSeq *retval = 0; ACE_NEW_RETURN (retval, @@ -312,7 +299,6 @@ void TAO_HomeDef_i::supported_interfaces ( const CORBA::InterfaceDefSeq &supported_interfaces ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -325,7 +311,6 @@ void TAO_HomeDef_i::supported_interfaces_i ( const CORBA::InterfaceDefSeq &supported_interfaces ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->remove_section (this->section_key_, "supported", @@ -360,7 +345,6 @@ TAO_HomeDef_i::supported_interfaces_i ( CORBA::ComponentIR::ComponentDef_ptr TAO_HomeDef_i::managed_component (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::ComponentDef::_nil ()); @@ -371,7 +355,6 @@ TAO_HomeDef_i::managed_component (void) CORBA::ComponentIR::ComponentDef_ptr TAO_HomeDef_i::managed_component_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString path; this->repo_->config ()->get_string_value (this->section_key_, @@ -388,7 +371,6 @@ void TAO_HomeDef_i::managed_component ( CORBA::ComponentIR::ComponentDef_ptr managed_component ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -401,7 +383,6 @@ void TAO_HomeDef_i::managed_component_i ( CORBA::ComponentIR::ComponentDef_ptr managed_component ) - ACE_THROW_SPEC ((CORBA::SystemException)) { char *path = TAO_IFR_Service_Utils::reference_to_path (managed_component); this->repo_->config ()->set_string_value (this->section_key_, @@ -411,7 +392,6 @@ TAO_HomeDef_i::managed_component_i ( CORBA::ValueDef_ptr TAO_HomeDef_i::primary_key (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::ValueDef::_nil ()); @@ -422,7 +402,6 @@ TAO_HomeDef_i::primary_key (void) CORBA::ValueDef_ptr TAO_HomeDef_i::primary_key_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString path; int status = @@ -446,7 +425,6 @@ void TAO_HomeDef_i::primary_key ( CORBA::ValueDef_ptr primary_key ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -459,7 +437,6 @@ void TAO_HomeDef_i::primary_key_i ( CORBA::ValueDef_ptr primary_key ) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (primary_key)) { @@ -480,7 +457,6 @@ TAO_HomeDef_i::create_factory (const char *id, const char *version, const CORBA::ParDescriptionSeq ¶ms, const CORBA::ExceptionDefSeq &exceptions) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::FactoryDef::_nil ()); @@ -501,7 +477,6 @@ TAO_HomeDef_i::create_factory_i ( const CORBA::ParDescriptionSeq ¶ms, const CORBA::ExceptionDefSeq &exceptions ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var obj = this->create_common (CORBA::dk_Factory, id, @@ -520,7 +495,6 @@ TAO_HomeDef_i::create_finder (const char *id, const char *version, const CORBA::ParDescriptionSeq ¶ms, const CORBA::ExceptionDefSeq &exceptions) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::FinderDef::_nil ()); @@ -541,7 +515,6 @@ TAO_HomeDef_i::create_finder_i ( const CORBA::ParDescriptionSeq ¶ms, const CORBA::ExceptionDefSeq &exceptions ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var obj = this->create_common (CORBA::dk_Finder, id, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h index ed65ff0c98b..1f80552857a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h @@ -55,110 +55,87 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Return our definition kind. virtual void destroy ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Remove the repository entry. virtual void destroy_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::Contained::Description *describe ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From Contained_i's pure virtual function. virtual CORBA::Contained::Description *describe_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From IDLType_i's pure virtual function. virtual CORBA::ComponentIR::HomeDef_ptr base_home ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ComponentIR::HomeDef_ptr base_home_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void base_home ( CORBA::ComponentIR::HomeDef_ptr base_home - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void base_home_i ( CORBA::ComponentIR::HomeDef_ptr base_home - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::InterfaceDefSeq *supported_interfaces ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::InterfaceDefSeq *supported_interfaces_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void supported_interfaces ( const CORBA::InterfaceDefSeq &supported_interfaces - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void supported_interfaces_i ( const CORBA::InterfaceDefSeq &supported_interfaces - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ComponentIR::ComponentDef_ptr managed_component ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ComponentIR::ComponentDef_ptr managed_component_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void managed_component ( CORBA::ComponentIR::ComponentDef_ptr managed_component - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void managed_component_i ( CORBA::ComponentIR::ComponentDef_ptr managed_component - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ValueDef_ptr primary_key ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ValueDef_ptr primary_key_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void primary_key ( CORBA::ValueDef_ptr primary_key - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void primary_key_i ( CORBA::ValueDef_ptr primary_key - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ComponentIR::FactoryDef_ptr create_factory ( const char *id, @@ -166,8 +143,7 @@ public: const char *version, const CORBA::ParDescriptionSeq ¶ms, const CORBA::ExceptionDefSeq &exceptions - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ComponentIR::FactoryDef_ptr create_factory_i ( const char *id, @@ -175,8 +151,7 @@ public: const char *version, const CORBA::ParDescriptionSeq ¶ms, const CORBA::ExceptionDefSeq &exceptions - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ComponentIR::FinderDef_ptr create_finder ( const char *id, @@ -184,8 +159,7 @@ public: const char *version, const CORBA::ParDescriptionSeq ¶ms, const CORBA::ExceptionDefSeq &exceptions - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ComponentIR::FinderDef_ptr create_finder_i ( const char *id, @@ -193,8 +167,7 @@ public: const char *version, const CORBA::ParDescriptionSeq ¶ms, const CORBA::ExceptionDefSeq &exceptions - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); private: // Common code for create_factory_i and create_finder_i. diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h index edcd9b89dc9..0a1b713652c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h @@ -55,12 +55,12 @@ public: virtual CORBA::TypeCode_ptr type () - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; // Defined in concrete classes. virtual CORBA::TypeCode_ptr type_i () - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; // Defined in concrete classes. }; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h index 001a3580327..f218c80aa55 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h @@ -127,9 +127,7 @@ namespace POA_CORBA virtual ::CORBA::DefinitionKind def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_def_kind_skel ( TAO_ServerRequest & server_request, @@ -142,9 +140,7 @@ namespace POA_CORBA virtual void destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void destroy_skel ( TAO_ServerRequest & server_request, @@ -224,9 +220,7 @@ namespace POA_CORBA virtual char * id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_id_skel ( TAO_ServerRequest & server_request, @@ -240,9 +234,7 @@ namespace POA_CORBA virtual void id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_id_skel ( TAO_ServerRequest & server_request, @@ -255,9 +247,7 @@ namespace POA_CORBA virtual char * name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_name_skel ( TAO_ServerRequest & server_request, @@ -271,9 +261,7 @@ namespace POA_CORBA virtual void name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_name_skel ( TAO_ServerRequest & server_request, @@ -286,9 +274,7 @@ namespace POA_CORBA virtual char * version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_version_skel ( TAO_ServerRequest & server_request, @@ -302,9 +288,7 @@ namespace POA_CORBA virtual void version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_version_skel ( TAO_ServerRequest & server_request, @@ -317,9 +301,7 @@ namespace POA_CORBA virtual ::CORBA::Container_ptr defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_defined_in_skel ( TAO_ServerRequest & server_request, @@ -332,9 +314,7 @@ namespace POA_CORBA virtual char * absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_absolute_name_skel ( TAO_ServerRequest & server_request, @@ -347,9 +327,7 @@ namespace POA_CORBA virtual ::CORBA::Repository_ptr containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_containing_repository_skel ( TAO_ServerRequest & server_request, @@ -362,9 +340,7 @@ namespace POA_CORBA virtual ::CORBA::Contained::Description * describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void describe_skel ( TAO_ServerRequest & server_request, @@ -380,9 +356,7 @@ namespace POA_CORBA const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void move_skel ( TAO_ServerRequest & server_request, @@ -480,9 +454,7 @@ namespace POA_CORBA virtual ::CORBA::Contained_ptr lookup ( const char * search_name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void lookup_skel ( TAO_ServerRequest & server_request, @@ -497,9 +469,7 @@ namespace POA_CORBA ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void contents_skel ( TAO_ServerRequest & server_request, @@ -516,9 +486,7 @@ namespace POA_CORBA ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void lookup_name_skel ( TAO_ServerRequest & server_request, @@ -534,9 +502,7 @@ namespace POA_CORBA ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void describe_contents_skel ( TAO_ServerRequest & server_request, @@ -552,9 +518,7 @@ namespace POA_CORBA const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_module_skel ( TAO_ServerRequest & server_request, @@ -572,9 +536,7 @@ namespace POA_CORBA ::CORBA::IDLType_ptr type, const ::CORBA::Any & value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_constant_skel ( TAO_ServerRequest & server_request, @@ -591,9 +553,7 @@ namespace POA_CORBA const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_struct_skel ( TAO_ServerRequest & server_request, @@ -611,9 +571,7 @@ namespace POA_CORBA ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_union_skel ( TAO_ServerRequest & server_request, @@ -630,9 +588,7 @@ namespace POA_CORBA const char * version, const ::CORBA::EnumMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_enum_skel ( TAO_ServerRequest & server_request, @@ -649,9 +605,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr original_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_alias_skel ( TAO_ServerRequest & server_request, @@ -668,9 +622,7 @@ namespace POA_CORBA const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_interface_skel ( TAO_ServerRequest & server_request, @@ -693,9 +645,7 @@ namespace POA_CORBA const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_value_skel ( TAO_ServerRequest & server_request, @@ -712,9 +662,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_value_box_skel ( TAO_ServerRequest & server_request, @@ -731,9 +679,7 @@ namespace POA_CORBA const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_exception_skel ( TAO_ServerRequest & server_request, @@ -749,9 +695,7 @@ namespace POA_CORBA const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_native_skel ( TAO_ServerRequest & server_request, @@ -768,9 +712,7 @@ namespace POA_CORBA const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_abstract_interface_skel ( TAO_ServerRequest & server_request, @@ -787,9 +729,7 @@ namespace POA_CORBA const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_local_interface_skel ( TAO_ServerRequest & server_request, @@ -812,9 +752,7 @@ namespace POA_CORBA const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_ext_value_skel ( TAO_ServerRequest & server_request, @@ -911,9 +849,7 @@ namespace POA_CORBA virtual ::CORBA::TypeCode_ptr type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_type_skel ( TAO_ServerRequest & server_request, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h index 1ce7d87c23e..66412576968 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h @@ -86,19 +86,13 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -153,112 +147,76 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -267,10 +225,7 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -325,29 +280,20 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained_ptr lookup ( const char * search_name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -355,10 +301,7 @@ namespace POA_CORBA ::CORBA::ContainedSeq * contents ( ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -368,10 +311,7 @@ namespace POA_CORBA ::CORBA::Long levels_to_search, ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -380,10 +320,7 @@ namespace POA_CORBA ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -392,10 +329,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -406,10 +340,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, const ::CORBA::Any & value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -419,10 +350,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -433,10 +361,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -446,10 +371,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::EnumMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -459,10 +381,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -472,10 +391,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -491,10 +407,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -504,10 +417,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -517,10 +427,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -529,10 +436,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -542,10 +446,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -555,10 +456,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -574,10 +472,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -632,28 +527,19 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -708,112 +594,76 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -822,19 +672,13 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl index fccfd0f9853..3947d727aaf 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl @@ -129,9 +129,6 @@ POA_CORBA::IRObject_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::IRObject_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -143,9 +140,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::IRObject_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -250,9 +244,6 @@ POA_CORBA::Contained_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::Contained_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -264,9 +255,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::Contained_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -278,9 +266,6 @@ void POA_CORBA::Contained_tie<T>::destroy ( template <class T> ACE_INLINE char * POA_CORBA::Contained_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -293,9 +278,6 @@ template <class T> ACE_INLINE void POA_CORBA::Contained_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -308,9 +290,6 @@ void POA_CORBA::Contained_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::Contained_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -323,9 +302,6 @@ template <class T> ACE_INLINE void POA_CORBA::Contained_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -338,9 +314,6 @@ void POA_CORBA::Contained_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::Contained_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -353,9 +326,6 @@ template <class T> ACE_INLINE void POA_CORBA::Contained_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -368,9 +338,6 @@ void POA_CORBA::Contained_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::Contained_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -382,9 +349,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::Contained_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -396,9 +360,6 @@ char * POA_CORBA::Contained_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::Contained_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -410,9 +371,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::Contained_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -427,9 +385,6 @@ void POA_CORBA::Contained_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -537,9 +492,6 @@ POA_CORBA::Container_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::Container_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -551,9 +503,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::Container_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -566,9 +515,6 @@ template <class T> ACE_INLINE ::CORBA::Contained_ptr POA_CORBA::Container_tie<T>::lookup ( const char * search_name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup ( search_name @@ -583,9 +529,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->contents ( limit_type, @@ -603,9 +546,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup_name ( search_name, @@ -624,9 +564,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_contents ( limit_type, @@ -644,9 +581,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_module ( id, @@ -666,9 +600,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, const ::CORBA::Any & value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_constant ( id, @@ -689,9 +620,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_struct ( id, @@ -712,9 +640,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_union ( id, @@ -735,9 +660,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::EnumMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_enum ( id, @@ -757,9 +679,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_alias ( id, @@ -779,9 +698,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_interface ( id, @@ -807,9 +723,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value ( id, @@ -835,9 +748,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value_box ( id, @@ -857,9 +767,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_exception ( id, @@ -878,9 +785,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_native ( id, @@ -899,9 +803,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_abstract_interface ( id, @@ -921,9 +822,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_local_interface ( id, @@ -949,9 +847,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_value ( id, @@ -1066,9 +961,6 @@ POA_CORBA::IDLType_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::IDLType_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -1080,9 +972,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::IDLType_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -1094,9 +983,6 @@ void POA_CORBA::IDLType_tie<T>::destroy ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::IDLType_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -1201,9 +1087,6 @@ POA_CORBA::TypedefDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::TypedefDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -1215,9 +1098,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::TypedefDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -1229,9 +1109,6 @@ void POA_CORBA::TypedefDef_tie<T>::destroy ( template <class T> ACE_INLINE char * POA_CORBA::TypedefDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -1244,9 +1121,6 @@ template <class T> ACE_INLINE void POA_CORBA::TypedefDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -1259,9 +1133,6 @@ void POA_CORBA::TypedefDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::TypedefDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -1274,9 +1145,6 @@ template <class T> ACE_INLINE void POA_CORBA::TypedefDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -1289,9 +1157,6 @@ void POA_CORBA::TypedefDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::TypedefDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -1304,9 +1169,6 @@ template <class T> ACE_INLINE void POA_CORBA::TypedefDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -1319,9 +1181,6 @@ void POA_CORBA::TypedefDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::TypedefDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -1333,9 +1192,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::TypedefDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -1347,9 +1203,6 @@ char * POA_CORBA::TypedefDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::TypedefDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -1361,9 +1214,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::TypedefDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -1378,9 +1228,6 @@ void POA_CORBA::TypedefDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -1395,9 +1242,6 @@ void POA_CORBA::TypedefDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::TypedefDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h index a98ed5c6385..dd5d4df25fc 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h @@ -128,9 +128,7 @@ namespace POA_CORBA virtual ::CORBA::Contained_ptr lookup_id ( const char * search_id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void lookup_id_skel ( TAO_ServerRequest & server_request, @@ -144,9 +142,7 @@ namespace POA_CORBA virtual ::CORBA::TypeCode_ptr get_canonical_typecode ( ::CORBA::TypeCode_ptr tc ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void get_canonical_typecode_skel ( TAO_ServerRequest & server_request, @@ -160,9 +156,7 @@ namespace POA_CORBA virtual ::CORBA::PrimitiveDef_ptr get_primitive ( ::CORBA::PrimitiveKind kind ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void get_primitive_skel ( TAO_ServerRequest & server_request, @@ -176,9 +170,7 @@ namespace POA_CORBA virtual ::CORBA::StringDef_ptr create_string ( ::CORBA::ULong bound ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_string_skel ( TAO_ServerRequest & server_request, @@ -192,9 +184,7 @@ namespace POA_CORBA virtual ::CORBA::WstringDef_ptr create_wstring ( ::CORBA::ULong bound ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_wstring_skel ( TAO_ServerRequest & server_request, @@ -209,9 +199,7 @@ namespace POA_CORBA ::CORBA::ULong bound, ::CORBA::IDLType_ptr element_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_sequence_skel ( TAO_ServerRequest & server_request, @@ -226,9 +214,7 @@ namespace POA_CORBA ::CORBA::ULong length, ::CORBA::IDLType_ptr element_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_array_skel ( TAO_ServerRequest & server_request, @@ -243,9 +229,7 @@ namespace POA_CORBA ::CORBA::UShort digits, ::CORBA::Short scale ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_fixed_skel ( TAO_ServerRequest & server_request, @@ -870,9 +854,7 @@ namespace POA_CORBA virtual ::CORBA::TypeCode_ptr type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_type_skel ( TAO_ServerRequest & server_request, @@ -885,9 +867,7 @@ namespace POA_CORBA virtual ::CORBA::IDLType_ptr type_def ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_type_def_skel ( TAO_ServerRequest & server_request, @@ -901,9 +881,7 @@ namespace POA_CORBA virtual void type_def ( ::CORBA::IDLType_ptr type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_type_def_skel ( TAO_ServerRequest & server_request, @@ -916,9 +894,7 @@ namespace POA_CORBA virtual ::CORBA::Any * value ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_value_skel ( TAO_ServerRequest & server_request, @@ -932,9 +908,7 @@ namespace POA_CORBA virtual void value ( const ::CORBA::Any & value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_value_skel ( TAO_ServerRequest & server_request, @@ -1115,9 +1089,7 @@ namespace POA_CORBA virtual ::CORBA::StructMemberSeq * members ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_members_skel ( TAO_ServerRequest & server_request, @@ -1131,9 +1103,7 @@ namespace POA_CORBA virtual void members ( const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_members_skel ( TAO_ServerRequest & server_request, @@ -1501,9 +1471,7 @@ namespace POA_CORBA virtual ::CORBA::TypeCode_ptr discriminator_type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_discriminator_type_skel ( TAO_ServerRequest & server_request, @@ -1516,9 +1484,7 @@ namespace POA_CORBA virtual ::CORBA::IDLType_ptr discriminator_type_def ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_discriminator_type_def_skel ( TAO_ServerRequest & server_request, @@ -1532,9 +1498,7 @@ namespace POA_CORBA virtual void discriminator_type_def ( ::CORBA::IDLType_ptr discriminator_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_discriminator_type_def_skel ( TAO_ServerRequest & server_request, @@ -1547,9 +1511,7 @@ namespace POA_CORBA virtual ::CORBA::UnionMemberSeq * members ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_members_skel ( TAO_ServerRequest & server_request, @@ -1563,9 +1525,7 @@ namespace POA_CORBA virtual void members ( const ::CORBA::UnionMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_members_skel ( TAO_ServerRequest & server_request, @@ -1932,9 +1892,7 @@ namespace POA_CORBA virtual ::CORBA::EnumMemberSeq * members ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_members_skel ( TAO_ServerRequest & server_request, @@ -1948,9 +1906,7 @@ namespace POA_CORBA virtual void members ( const ::CORBA::EnumMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_members_skel ( TAO_ServerRequest & server_request, @@ -2137,9 +2093,7 @@ namespace POA_CORBA virtual ::CORBA::IDLType_ptr original_type_def ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_original_type_def_skel ( TAO_ServerRequest & server_request, @@ -2153,9 +2107,7 @@ namespace POA_CORBA virtual void original_type_def ( ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_original_type_def_skel ( TAO_ServerRequest & server_request, @@ -2516,9 +2468,7 @@ namespace POA_CORBA virtual ::CORBA::PrimitiveKind kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_kind_skel ( TAO_ServerRequest & server_request, @@ -2622,9 +2572,7 @@ namespace POA_CORBA virtual ::CORBA::ULong bound ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_bound_skel ( TAO_ServerRequest & server_request, @@ -2638,9 +2586,7 @@ namespace POA_CORBA virtual void bound ( ::CORBA::ULong bound ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_bound_skel ( TAO_ServerRequest & server_request, @@ -2744,9 +2690,7 @@ namespace POA_CORBA virtual ::CORBA::ULong bound ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_bound_skel ( TAO_ServerRequest & server_request, @@ -2760,9 +2704,7 @@ namespace POA_CORBA virtual void bound ( ::CORBA::ULong bound ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_bound_skel ( TAO_ServerRequest & server_request, @@ -2866,9 +2808,7 @@ namespace POA_CORBA virtual ::CORBA::ULong bound ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_bound_skel ( TAO_ServerRequest & server_request, @@ -2882,9 +2822,7 @@ namespace POA_CORBA virtual void bound ( ::CORBA::ULong bound ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_bound_skel ( TAO_ServerRequest & server_request, @@ -2897,9 +2835,7 @@ namespace POA_CORBA virtual ::CORBA::TypeCode_ptr element_type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_element_type_skel ( TAO_ServerRequest & server_request, @@ -2912,9 +2848,7 @@ namespace POA_CORBA virtual ::CORBA::IDLType_ptr element_type_def ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_element_type_def_skel ( TAO_ServerRequest & server_request, @@ -2928,9 +2862,7 @@ namespace POA_CORBA virtual void element_type_def ( ::CORBA::IDLType_ptr element_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_element_type_def_skel ( TAO_ServerRequest & server_request, @@ -3034,9 +2966,7 @@ namespace POA_CORBA virtual ::CORBA::ULong length ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_length_skel ( TAO_ServerRequest & server_request, @@ -3050,9 +2980,7 @@ namespace POA_CORBA virtual void length ( ::CORBA::ULong length ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_length_skel ( TAO_ServerRequest & server_request, @@ -3065,9 +2993,7 @@ namespace POA_CORBA virtual ::CORBA::TypeCode_ptr element_type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_element_type_skel ( TAO_ServerRequest & server_request, @@ -3080,9 +3006,7 @@ namespace POA_CORBA virtual ::CORBA::IDLType_ptr element_type_def ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_element_type_def_skel ( TAO_ServerRequest & server_request, @@ -3096,9 +3020,7 @@ namespace POA_CORBA virtual void element_type_def ( ::CORBA::IDLType_ptr element_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_element_type_def_skel ( TAO_ServerRequest & server_request, @@ -3203,9 +3125,7 @@ namespace POA_CORBA virtual ::CORBA::TypeCode_ptr type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_type_skel ( TAO_ServerRequest & server_request, @@ -3218,9 +3138,7 @@ namespace POA_CORBA virtual ::CORBA::StructMemberSeq * members ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_members_skel ( TAO_ServerRequest & server_request, @@ -3234,9 +3152,7 @@ namespace POA_CORBA virtual void members ( const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_members_skel ( TAO_ServerRequest & server_request, @@ -3596,9 +3512,7 @@ namespace POA_CORBA virtual ::CORBA::TypeCode_ptr type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_type_skel ( TAO_ServerRequest & server_request, @@ -3611,9 +3525,7 @@ namespace POA_CORBA virtual ::CORBA::IDLType_ptr type_def ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_type_def_skel ( TAO_ServerRequest & server_request, @@ -3627,9 +3539,7 @@ namespace POA_CORBA virtual void type_def ( ::CORBA::IDLType_ptr type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_type_def_skel ( TAO_ServerRequest & server_request, @@ -3642,9 +3552,7 @@ namespace POA_CORBA virtual ::CORBA::AttributeMode mode ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_mode_skel ( TAO_ServerRequest & server_request, @@ -3658,9 +3566,7 @@ namespace POA_CORBA virtual void mode ( ::CORBA::AttributeMode mode ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_mode_skel ( TAO_ServerRequest & server_request, @@ -3840,9 +3746,7 @@ namespace POA_CORBA virtual ::CORBA::ExcDescriptionSeq * get_exceptions ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_get_exceptions_skel ( TAO_ServerRequest & server_request, @@ -3856,9 +3760,7 @@ namespace POA_CORBA virtual void get_exceptions ( const ::CORBA::ExcDescriptionSeq & get_exceptions ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_get_exceptions_skel ( TAO_ServerRequest & server_request, @@ -3871,9 +3773,7 @@ namespace POA_CORBA virtual ::CORBA::ExcDescriptionSeq * set_exceptions ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_set_exceptions_skel ( TAO_ServerRequest & server_request, @@ -3887,9 +3787,7 @@ namespace POA_CORBA virtual void set_exceptions ( const ::CORBA::ExcDescriptionSeq & set_exceptions ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_set_exceptions_skel ( TAO_ServerRequest & server_request, @@ -3902,9 +3800,7 @@ namespace POA_CORBA virtual ::CORBA::ExtAttributeDescription * describe_attribute ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void describe_attribute_skel ( TAO_ServerRequest & server_request, @@ -4119,9 +4015,7 @@ namespace POA_CORBA virtual ::CORBA::TypeCode_ptr result ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_result_skel ( TAO_ServerRequest & server_request, @@ -4134,9 +4028,7 @@ namespace POA_CORBA virtual ::CORBA::IDLType_ptr result_def ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_result_def_skel ( TAO_ServerRequest & server_request, @@ -4150,9 +4042,7 @@ namespace POA_CORBA virtual void result_def ( ::CORBA::IDLType_ptr result_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_result_def_skel ( TAO_ServerRequest & server_request, @@ -4165,9 +4055,7 @@ namespace POA_CORBA virtual ::CORBA::ParDescriptionSeq * params ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_params_skel ( TAO_ServerRequest & server_request, @@ -4181,9 +4069,7 @@ namespace POA_CORBA virtual void params ( const ::CORBA::ParDescriptionSeq & params ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_params_skel ( TAO_ServerRequest & server_request, @@ -4196,9 +4082,7 @@ namespace POA_CORBA virtual ::CORBA::OperationMode mode ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_mode_skel ( TAO_ServerRequest & server_request, @@ -4212,9 +4096,7 @@ namespace POA_CORBA virtual void mode ( ::CORBA::OperationMode mode ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_mode_skel ( TAO_ServerRequest & server_request, @@ -4227,9 +4109,7 @@ namespace POA_CORBA virtual ::CORBA::ContextIdSeq * contexts ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_contexts_skel ( TAO_ServerRequest & server_request, @@ -4243,9 +4123,7 @@ namespace POA_CORBA virtual void contexts ( const ::CORBA::ContextIdSeq & contexts ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_contexts_skel ( TAO_ServerRequest & server_request, @@ -4258,9 +4136,7 @@ namespace POA_CORBA virtual ::CORBA::ExceptionDefSeq * exceptions ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_exceptions_skel ( TAO_ServerRequest & server_request, @@ -4274,9 +4150,7 @@ namespace POA_CORBA virtual void exceptions ( const ::CORBA::ExceptionDefSeq & exceptions ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_exceptions_skel ( TAO_ServerRequest & server_request, @@ -4458,9 +4332,7 @@ namespace POA_CORBA virtual ::CORBA::InterfaceDefSeq * base_interfaces ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_base_interfaces_skel ( TAO_ServerRequest & server_request, @@ -4474,9 +4346,7 @@ namespace POA_CORBA virtual void base_interfaces ( const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_base_interfaces_skel ( TAO_ServerRequest & server_request, @@ -4490,9 +4360,7 @@ namespace POA_CORBA virtual ::CORBA::Boolean is_a ( const char * interface_id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void is_a_skel ( TAO_ServerRequest & server_request, @@ -4505,9 +4373,7 @@ namespace POA_CORBA virtual ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void describe_interface_skel ( TAO_ServerRequest & server_request, @@ -4525,9 +4391,7 @@ namespace POA_CORBA ::CORBA::IDLType_ptr type, ::CORBA::AttributeMode mode ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_attribute_skel ( TAO_ServerRequest & server_request, @@ -4548,9 +4412,7 @@ namespace POA_CORBA const ::CORBA::ExceptionDefSeq & exceptions, const ::CORBA::ContextIdSeq & contexts ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_operation_skel ( TAO_ServerRequest & server_request, @@ -4917,9 +4779,7 @@ namespace POA_CORBA virtual ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void describe_ext_interface_skel ( TAO_ServerRequest & server_request, @@ -4939,9 +4799,7 @@ namespace POA_CORBA const ::CORBA::ExceptionDefSeq & get_exceptions, const ::CORBA::ExceptionDefSeq & set_exceptions ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_ext_attribute_skel ( TAO_ServerRequest & server_request, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h index f9dbb974fbf..6e34f9b7d94 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h @@ -86,29 +86,20 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained_ptr lookup ( const char * search_name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -116,10 +107,7 @@ namespace POA_CORBA ::CORBA::ContainedSeq * contents ( ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -129,10 +117,7 @@ namespace POA_CORBA ::CORBA::Long levels_to_search, ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -141,10 +126,7 @@ namespace POA_CORBA ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -153,10 +135,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -167,10 +146,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, const ::CORBA::Any & value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -180,10 +156,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -194,10 +167,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -207,10 +177,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::EnumMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -220,10 +187,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -233,10 +197,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -252,10 +213,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -265,10 +223,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -278,10 +233,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -290,10 +242,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -303,10 +252,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -316,10 +262,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -335,60 +278,42 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained_ptr lookup_id ( const char * search_id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr get_canonical_typecode ( ::CORBA::TypeCode_ptr tc - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::PrimitiveDef_ptr get_primitive ( ::CORBA::PrimitiveKind kind - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::StringDef_ptr create_string ( ::CORBA::ULong bound - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::WstringDef_ptr create_wstring ( ::CORBA::ULong bound - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -396,10 +321,7 @@ namespace POA_CORBA ::CORBA::SequenceDef_ptr create_sequence ( ::CORBA::ULong bound, ::CORBA::IDLType_ptr element_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -407,10 +329,7 @@ namespace POA_CORBA ::CORBA::ArrayDef_ptr create_array ( ::CORBA::ULong length, ::CORBA::IDLType_ptr element_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -418,10 +337,7 @@ namespace POA_CORBA ::CORBA::FixedDef_ptr create_fixed ( ::CORBA::UShort digits, ::CORBA::Short scale - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -476,29 +392,20 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained_ptr lookup ( const char * search_name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -506,10 +413,7 @@ namespace POA_CORBA ::CORBA::ContainedSeq * contents ( ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -519,10 +423,7 @@ namespace POA_CORBA ::CORBA::Long levels_to_search, ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -531,10 +432,7 @@ namespace POA_CORBA ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -543,10 +441,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -557,10 +452,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, const ::CORBA::Any & value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -570,10 +462,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -584,10 +473,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -597,10 +483,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::EnumMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -610,10 +493,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -623,10 +503,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -642,10 +519,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -655,10 +529,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -668,10 +539,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -680,10 +548,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -693,10 +558,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -706,10 +568,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -725,103 +584,70 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -830,10 +656,7 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -888,112 +711,76 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1002,57 +789,39 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::IDLType_ptr type_def ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void type_def ( ::CORBA::IDLType_ptr type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Any * value ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void value ( const ::CORBA::Any & value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -1107,112 +876,76 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1221,29 +954,20 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained_ptr lookup ( const char * search_name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1251,10 +975,7 @@ namespace POA_CORBA ::CORBA::ContainedSeq * contents ( ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1264,10 +985,7 @@ namespace POA_CORBA ::CORBA::Long levels_to_search, ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1276,10 +994,7 @@ namespace POA_CORBA ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1288,10 +1003,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1302,10 +1014,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, const ::CORBA::Any & value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1315,10 +1024,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1329,10 +1035,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1342,10 +1045,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::EnumMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1355,10 +1055,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1368,10 +1065,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1387,10 +1081,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1400,10 +1091,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1413,10 +1101,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1425,10 +1110,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1438,10 +1120,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1451,10 +1130,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1470,29 +1146,20 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::StructMemberSeq * members ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void members ( const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -1547,112 +1214,76 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1661,29 +1292,20 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained_ptr lookup ( const char * search_name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1691,10 +1313,7 @@ namespace POA_CORBA ::CORBA::ContainedSeq * contents ( ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1704,10 +1323,7 @@ namespace POA_CORBA ::CORBA::Long levels_to_search, ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1716,10 +1332,7 @@ namespace POA_CORBA ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1728,10 +1341,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1742,10 +1352,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, const ::CORBA::Any & value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1755,10 +1362,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1769,10 +1373,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1782,10 +1383,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::EnumMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1795,10 +1393,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1808,10 +1403,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1827,10 +1419,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1840,10 +1429,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1853,10 +1439,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1865,10 +1448,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1878,10 +1458,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1891,10 +1468,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1910,57 +1484,39 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr discriminator_type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::IDLType_ptr discriminator_type_def ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void discriminator_type_def ( ::CORBA::IDLType_ptr discriminator_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::UnionMemberSeq * members ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void members ( const ::CORBA::UnionMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -2015,112 +1571,76 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -2129,38 +1649,26 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::EnumMemberSeq * members ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void members ( const ::CORBA::EnumMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -2215,112 +1723,76 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -2329,38 +1801,26 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::IDLType_ptr original_type_def ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void original_type_def ( ::CORBA::IDLType_ptr original_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -2415,112 +1875,76 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -2529,19 +1953,13 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -2596,37 +2014,25 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::PrimitiveKind kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -2681,47 +2087,32 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ULong bound ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void bound ( ::CORBA::ULong bound - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -2776,47 +2167,32 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ULong bound ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void bound ( ::CORBA::ULong bound - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -2871,75 +2247,51 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ULong bound ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void bound ( ::CORBA::ULong bound - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr element_type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::IDLType_ptr element_type_def ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void element_type_def ( ::CORBA::IDLType_ptr element_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -2994,75 +2346,51 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ULong length ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void length ( ::CORBA::ULong length - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr element_type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::IDLType_ptr element_type_def ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void element_type_def ( ::CORBA::IDLType_ptr element_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -3117,112 +2445,76 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3231,20 +2523,14 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained_ptr lookup ( const char * search_name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3252,10 +2538,7 @@ namespace POA_CORBA ::CORBA::ContainedSeq * contents ( ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3265,10 +2548,7 @@ namespace POA_CORBA ::CORBA::Long levels_to_search, ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3277,10 +2557,7 @@ namespace POA_CORBA ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3289,10 +2566,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3303,10 +2577,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, const ::CORBA::Any & value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3316,10 +2587,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3330,10 +2598,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3343,10 +2608,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::EnumMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3356,10 +2618,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3369,10 +2628,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3388,10 +2644,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3401,10 +2654,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3414,10 +2664,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3426,10 +2673,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3439,10 +2683,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3452,10 +2693,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3471,38 +2709,26 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::StructMemberSeq * members ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void members ( const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -3557,112 +2783,76 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3671,57 +2861,39 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::IDLType_ptr type_def ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void type_def ( ::CORBA::IDLType_ptr type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::AttributeMode mode ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void mode ( ::CORBA::AttributeMode mode - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -3776,112 +2948,76 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3890,104 +3026,71 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::IDLType_ptr type_def ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void type_def ( ::CORBA::IDLType_ptr type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::AttributeMode mode ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void mode ( ::CORBA::AttributeMode mode - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ExcDescriptionSeq * get_exceptions ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void get_exceptions ( const ::CORBA::ExcDescriptionSeq & get_exceptions - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ExcDescriptionSeq * set_exceptions ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void set_exceptions ( const ::CORBA::ExcDescriptionSeq & set_exceptions - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ExtAttributeDescription * describe_attribute ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -4042,112 +3145,76 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4156,114 +3223,78 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr result ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::IDLType_ptr result_def ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void result_def ( ::CORBA::IDLType_ptr result_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ParDescriptionSeq * params ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void params ( const ::CORBA::ParDescriptionSeq & params - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::OperationMode mode ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void mode ( ::CORBA::OperationMode mode - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ContextIdSeq * contexts ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void contexts ( const ::CORBA::ContextIdSeq & contexts - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ExceptionDefSeq * exceptions ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void exceptions ( const ::CORBA::ExceptionDefSeq & exceptions - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -4318,29 +3349,20 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained_ptr lookup ( const char * search_name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4348,10 +3370,7 @@ namespace POA_CORBA ::CORBA::ContainedSeq * contents ( ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4361,10 +3380,7 @@ namespace POA_CORBA ::CORBA::Long levels_to_search, ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4373,10 +3389,7 @@ namespace POA_CORBA ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4385,10 +3398,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4399,10 +3409,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, const ::CORBA::Any & value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4412,10 +3419,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4426,10 +3430,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4439,10 +3440,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::EnumMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4452,10 +3450,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4465,10 +3460,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4484,10 +3476,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4497,10 +3486,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4510,10 +3496,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4522,10 +3505,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4535,10 +3515,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4548,10 +3525,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4567,103 +3541,70 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4672,57 +3613,39 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceDefSeq * base_interfaces ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void base_interfaces ( const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_a ( const char * interface_id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4733,10 +3656,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, ::CORBA::AttributeMode mode - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4750,10 +3670,7 @@ namespace POA_CORBA const ::CORBA::ParDescriptionSeq & params, const ::CORBA::ExceptionDefSeq & exceptions, const ::CORBA::ContextIdSeq & contexts - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -4808,10 +3725,7 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4824,10 +3738,7 @@ namespace POA_CORBA ::CORBA::AttributeMode mode, const ::CORBA::ExceptionDefSeq & get_exceptions, const ::CORBA::ExceptionDefSeq & set_exceptions - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -4882,29 +3793,20 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained_ptr lookup ( const char * search_name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4912,10 +3814,7 @@ namespace POA_CORBA ::CORBA::ContainedSeq * contents ( ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4925,10 +3824,7 @@ namespace POA_CORBA ::CORBA::Long levels_to_search, ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4937,10 +3833,7 @@ namespace POA_CORBA ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4949,10 +3842,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4963,10 +3853,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, const ::CORBA::Any & value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4976,10 +3863,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4990,10 +3874,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5003,10 +3884,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::EnumMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5016,10 +3894,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5029,10 +3904,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5048,10 +3920,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5061,10 +3930,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5074,10 +3940,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5086,10 +3949,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5099,10 +3959,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5112,10 +3969,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5131,103 +3985,70 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5236,57 +4057,39 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceDefSeq * base_interfaces ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void base_interfaces ( const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_a ( const char * interface_id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5297,10 +4100,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, ::CORBA::AttributeMode mode - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5314,19 +4114,13 @@ namespace POA_CORBA const ::CORBA::ParDescriptionSeq & params, const ::CORBA::ExceptionDefSeq & exceptions, const ::CORBA::ContextIdSeq & contexts - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5339,10 +4133,7 @@ namespace POA_CORBA ::CORBA::AttributeMode mode, const ::CORBA::ExceptionDefSeq & get_exceptions, const ::CORBA::ExceptionDefSeq & set_exceptions - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -5397,29 +4188,20 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained_ptr lookup ( const char * search_name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5427,10 +4209,7 @@ namespace POA_CORBA ::CORBA::ContainedSeq * contents ( ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5440,10 +4219,7 @@ namespace POA_CORBA ::CORBA::Long levels_to_search, ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5452,10 +4228,7 @@ namespace POA_CORBA ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5464,10 +4237,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5478,10 +4248,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, const ::CORBA::Any & value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5491,10 +4258,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5505,10 +4269,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5518,10 +4279,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::EnumMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5531,10 +4289,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5544,10 +4299,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5563,10 +4315,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5576,10 +4325,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5589,10 +4335,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5601,10 +4344,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5614,10 +4354,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5627,10 +4364,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5646,103 +4380,70 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5751,57 +4452,39 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceDefSeq * base_interfaces ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void base_interfaces ( const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_a ( const char * interface_id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5812,10 +4495,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, ::CORBA::AttributeMode mode - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5829,10 +4509,7 @@ namespace POA_CORBA const ::CORBA::ParDescriptionSeq & params, const ::CORBA::ExceptionDefSeq & exceptions, const ::CORBA::ContextIdSeq & contexts - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -5887,29 +4564,20 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained_ptr lookup ( const char * search_name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5917,10 +4585,7 @@ namespace POA_CORBA ::CORBA::ContainedSeq * contents ( ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5930,10 +4595,7 @@ namespace POA_CORBA ::CORBA::Long levels_to_search, ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5942,10 +4604,7 @@ namespace POA_CORBA ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5954,10 +4613,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5968,10 +4624,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, const ::CORBA::Any & value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5981,10 +4634,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -5995,10 +4645,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6008,10 +4655,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::EnumMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6021,10 +4665,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6034,10 +4675,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6053,10 +4691,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6066,10 +4701,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6079,10 +4711,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6091,10 +4720,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6104,10 +4730,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6117,10 +4740,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6136,103 +4756,70 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6241,57 +4828,39 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceDefSeq * base_interfaces ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void base_interfaces ( const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_a ( const char * interface_id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6302,10 +4871,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, ::CORBA::AttributeMode mode - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6319,19 +4885,13 @@ namespace POA_CORBA const ::CORBA::ParDescriptionSeq & params, const ::CORBA::ExceptionDefSeq & exceptions, const ::CORBA::ContextIdSeq & contexts - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6344,10 +4904,7 @@ namespace POA_CORBA ::CORBA::AttributeMode mode, const ::CORBA::ExceptionDefSeq & get_exceptions, const ::CORBA::ExceptionDefSeq & set_exceptions - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -6402,29 +4959,20 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained_ptr lookup ( const char * search_name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6432,10 +4980,7 @@ namespace POA_CORBA ::CORBA::ContainedSeq * contents ( ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6445,10 +4990,7 @@ namespace POA_CORBA ::CORBA::Long levels_to_search, ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6457,10 +4999,7 @@ namespace POA_CORBA ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6469,10 +5008,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6483,10 +5019,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, const ::CORBA::Any & value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6496,10 +5029,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6510,10 +5040,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6523,10 +5050,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::EnumMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6536,10 +5060,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6549,10 +5070,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6568,10 +5086,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6581,10 +5096,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6594,10 +5106,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6606,10 +5115,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6619,10 +5125,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6632,10 +5135,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6651,103 +5151,70 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6756,57 +5223,39 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceDefSeq * base_interfaces ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void base_interfaces ( const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_a ( const char * interface_id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6817,10 +5266,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, ::CORBA::AttributeMode mode - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6834,10 +5280,7 @@ namespace POA_CORBA const ::CORBA::ParDescriptionSeq & params, const ::CORBA::ExceptionDefSeq & exceptions, const ::CORBA::ContextIdSeq & contexts - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -6892,29 +5335,20 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained_ptr lookup ( const char * search_name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6922,10 +5356,7 @@ namespace POA_CORBA ::CORBA::ContainedSeq * contents ( ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6935,10 +5366,7 @@ namespace POA_CORBA ::CORBA::Long levels_to_search, ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6947,10 +5375,7 @@ namespace POA_CORBA ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6959,10 +5384,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6973,10 +5395,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, const ::CORBA::Any & value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -6986,10 +5405,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -7000,10 +5416,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -7013,10 +5426,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::EnumMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -7026,10 +5436,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -7039,10 +5446,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -7058,10 +5462,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -7071,10 +5472,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -7084,10 +5482,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -7096,10 +5491,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -7109,10 +5501,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -7122,10 +5511,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -7141,103 +5527,70 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -7246,57 +5599,39 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceDefSeq * base_interfaces ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void base_interfaces ( const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_a ( const char * interface_id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -7307,10 +5642,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, ::CORBA::AttributeMode mode - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -7324,19 +5656,13 @@ namespace POA_CORBA const ::CORBA::ParDescriptionSeq & params, const ::CORBA::ExceptionDefSeq & exceptions, const ::CORBA::ContextIdSeq & contexts - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -7349,10 +5675,7 @@ namespace POA_CORBA ::CORBA::AttributeMode mode, const ::CORBA::ExceptionDefSeq & get_exceptions, const ::CORBA::ExceptionDefSeq & set_exceptions - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl index 3e42dc06527..c587b7f3306 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl @@ -129,9 +129,6 @@ POA_CORBA::Repository_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::Repository_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -143,9 +140,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::Repository_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -158,9 +152,6 @@ template <class T> ACE_INLINE ::CORBA::Contained_ptr POA_CORBA::Repository_tie<T>::lookup ( const char * search_name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup ( search_name @@ -175,9 +166,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->contents ( limit_type, @@ -195,9 +183,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup_name ( search_name, @@ -216,9 +201,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_contents ( limit_type, @@ -236,9 +218,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_module ( id, @@ -258,9 +237,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, const ::CORBA::Any & value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_constant ( id, @@ -281,9 +257,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_struct ( id, @@ -304,9 +277,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_union ( id, @@ -327,9 +297,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::EnumMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_enum ( id, @@ -349,9 +316,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_alias ( id, @@ -371,9 +335,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_interface ( id, @@ -399,9 +360,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value ( id, @@ -427,9 +385,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value_box ( id, @@ -449,9 +404,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_exception ( id, @@ -470,9 +422,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_native ( id, @@ -491,9 +440,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_abstract_interface ( id, @@ -513,9 +459,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_local_interface ( id, @@ -541,9 +484,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_value ( id, @@ -566,9 +506,6 @@ template <class T> ACE_INLINE ::CORBA::Contained_ptr POA_CORBA::Repository_tie<T>::lookup_id ( const char * search_id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup_id ( search_id @@ -582,9 +519,6 @@ template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::Repository_tie<T>::get_canonical_typecode ( ::CORBA::TypeCode_ptr tc ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->get_canonical_typecode ( tc @@ -598,9 +532,6 @@ template <class T> ACE_INLINE ::CORBA::PrimitiveDef_ptr POA_CORBA::Repository_tie<T>::get_primitive ( ::CORBA::PrimitiveKind kind ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->get_primitive ( kind @@ -614,9 +545,6 @@ template <class T> ACE_INLINE ::CORBA::StringDef_ptr POA_CORBA::Repository_tie<T>::create_string ( ::CORBA::ULong bound ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_string ( bound @@ -630,9 +558,6 @@ template <class T> ACE_INLINE ::CORBA::WstringDef_ptr POA_CORBA::Repository_tie<T>::create_wstring ( ::CORBA::ULong bound ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_wstring ( bound @@ -647,9 +572,6 @@ template <class T> ACE_INLINE ::CORBA::ULong bound, ::CORBA::IDLType_ptr element_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_sequence ( bound, @@ -665,9 +587,6 @@ template <class T> ACE_INLINE ::CORBA::ULong length, ::CORBA::IDLType_ptr element_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_array ( length, @@ -683,9 +602,6 @@ template <class T> ACE_INLINE ::CORBA::UShort digits, ::CORBA::Short scale ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_fixed ( digits, @@ -792,9 +708,6 @@ POA_CORBA::ModuleDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ModuleDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -806,9 +719,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ModuleDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -821,9 +731,6 @@ template <class T> ACE_INLINE ::CORBA::Contained_ptr POA_CORBA::ModuleDef_tie<T>::lookup ( const char * search_name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup ( search_name @@ -838,9 +745,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->contents ( limit_type, @@ -858,9 +762,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup_name ( search_name, @@ -879,9 +780,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_contents ( limit_type, @@ -899,9 +797,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_module ( id, @@ -921,9 +816,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, const ::CORBA::Any & value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_constant ( id, @@ -944,9 +836,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_struct ( id, @@ -967,9 +856,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_union ( id, @@ -990,9 +876,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::EnumMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_enum ( id, @@ -1012,9 +895,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_alias ( id, @@ -1034,9 +914,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_interface ( id, @@ -1062,9 +939,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value ( id, @@ -1090,9 +964,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value_box ( id, @@ -1112,9 +983,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_exception ( id, @@ -1133,9 +1001,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_native ( id, @@ -1154,9 +1019,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_abstract_interface ( id, @@ -1176,9 +1038,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_local_interface ( id, @@ -1204,9 +1063,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_value ( id, @@ -1228,9 +1084,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ModuleDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -1243,9 +1096,6 @@ template <class T> ACE_INLINE void POA_CORBA::ModuleDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -1258,9 +1108,6 @@ void POA_CORBA::ModuleDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::ModuleDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -1273,9 +1120,6 @@ template <class T> ACE_INLINE void POA_CORBA::ModuleDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -1288,9 +1132,6 @@ void POA_CORBA::ModuleDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::ModuleDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -1303,9 +1144,6 @@ template <class T> ACE_INLINE void POA_CORBA::ModuleDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -1318,9 +1156,6 @@ void POA_CORBA::ModuleDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::ModuleDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -1332,9 +1167,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ModuleDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -1346,9 +1178,6 @@ char * POA_CORBA::ModuleDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::ModuleDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -1360,9 +1189,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::ModuleDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -1377,9 +1203,6 @@ void POA_CORBA::ModuleDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -1487,9 +1310,6 @@ POA_CORBA::ConstantDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ConstantDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -1501,9 +1321,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ConstantDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -1515,9 +1332,6 @@ void POA_CORBA::ConstantDef_tie<T>::destroy ( template <class T> ACE_INLINE char * POA_CORBA::ConstantDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -1530,9 +1344,6 @@ template <class T> ACE_INLINE void POA_CORBA::ConstantDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -1545,9 +1356,6 @@ void POA_CORBA::ConstantDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::ConstantDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -1560,9 +1368,6 @@ template <class T> ACE_INLINE void POA_CORBA::ConstantDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -1575,9 +1380,6 @@ void POA_CORBA::ConstantDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::ConstantDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -1590,9 +1392,6 @@ template <class T> ACE_INLINE void POA_CORBA::ConstantDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -1605,9 +1404,6 @@ void POA_CORBA::ConstantDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::ConstantDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -1619,9 +1415,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ConstantDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -1633,9 +1426,6 @@ char * POA_CORBA::ConstantDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::ConstantDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -1647,9 +1437,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::ConstantDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -1664,9 +1451,6 @@ void POA_CORBA::ConstantDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -1681,9 +1465,6 @@ void POA_CORBA::ConstantDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::ConstantDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -1695,9 +1476,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::IDLType_ptr POA_CORBA::ConstantDef_tie<T>::type_def ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type_def ( ); @@ -1710,9 +1488,6 @@ template <class T> ACE_INLINE void POA_CORBA::ConstantDef_tie<T>::type_def ( ::CORBA::IDLType_ptr type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->type_def ( type_def @@ -1725,9 +1500,6 @@ void POA_CORBA::ConstantDef_tie<T>::type_def ( template <class T> ACE_INLINE ::CORBA::Any * POA_CORBA::ConstantDef_tie<T>::value ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->value ( ); @@ -1740,9 +1512,6 @@ template <class T> ACE_INLINE void POA_CORBA::ConstantDef_tie<T>::value ( const ::CORBA::Any & value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->value ( value @@ -1848,9 +1617,6 @@ POA_CORBA::StructDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::StructDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -1862,9 +1628,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::StructDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -1876,9 +1639,6 @@ void POA_CORBA::StructDef_tie<T>::destroy ( template <class T> ACE_INLINE char * POA_CORBA::StructDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -1891,9 +1651,6 @@ template <class T> ACE_INLINE void POA_CORBA::StructDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -1906,9 +1663,6 @@ void POA_CORBA::StructDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::StructDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -1921,9 +1675,6 @@ template <class T> ACE_INLINE void POA_CORBA::StructDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -1936,9 +1687,6 @@ void POA_CORBA::StructDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::StructDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -1951,9 +1699,6 @@ template <class T> ACE_INLINE void POA_CORBA::StructDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -1966,9 +1711,6 @@ void POA_CORBA::StructDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::StructDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -1980,9 +1722,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::StructDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -1994,9 +1733,6 @@ char * POA_CORBA::StructDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::StructDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -2008,9 +1744,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::StructDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -2025,9 +1758,6 @@ void POA_CORBA::StructDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -2042,9 +1772,6 @@ void POA_CORBA::StructDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::StructDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -2057,9 +1784,6 @@ template <class T> ACE_INLINE ::CORBA::Contained_ptr POA_CORBA::StructDef_tie<T>::lookup ( const char * search_name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup ( search_name @@ -2074,9 +1798,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->contents ( limit_type, @@ -2094,9 +1815,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup_name ( search_name, @@ -2115,9 +1833,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_contents ( limit_type, @@ -2135,9 +1850,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_module ( id, @@ -2157,9 +1869,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, const ::CORBA::Any & value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_constant ( id, @@ -2180,9 +1889,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_struct ( id, @@ -2203,9 +1909,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_union ( id, @@ -2226,9 +1929,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::EnumMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_enum ( id, @@ -2248,9 +1948,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_alias ( id, @@ -2270,9 +1967,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_interface ( id, @@ -2298,9 +1992,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value ( id, @@ -2326,9 +2017,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value_box ( id, @@ -2348,9 +2036,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_exception ( id, @@ -2369,9 +2054,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_native ( id, @@ -2390,9 +2072,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_abstract_interface ( id, @@ -2412,9 +2091,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_local_interface ( id, @@ -2440,9 +2116,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_value ( id, @@ -2464,9 +2137,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::StructMemberSeq * POA_CORBA::StructDef_tie<T>::members ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->members ( ); @@ -2479,9 +2149,6 @@ template <class T> ACE_INLINE void POA_CORBA::StructDef_tie<T>::members ( const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->members ( members @@ -2587,9 +2254,6 @@ POA_CORBA::UnionDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::UnionDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -2601,9 +2265,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::UnionDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -2615,9 +2276,6 @@ void POA_CORBA::UnionDef_tie<T>::destroy ( template <class T> ACE_INLINE char * POA_CORBA::UnionDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -2630,9 +2288,6 @@ template <class T> ACE_INLINE void POA_CORBA::UnionDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -2645,9 +2300,6 @@ void POA_CORBA::UnionDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::UnionDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -2660,9 +2312,6 @@ template <class T> ACE_INLINE void POA_CORBA::UnionDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -2675,9 +2324,6 @@ void POA_CORBA::UnionDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::UnionDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -2690,9 +2336,6 @@ template <class T> ACE_INLINE void POA_CORBA::UnionDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -2705,9 +2348,6 @@ void POA_CORBA::UnionDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::UnionDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -2719,9 +2359,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::UnionDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -2733,9 +2370,6 @@ char * POA_CORBA::UnionDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::UnionDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -2747,9 +2381,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::UnionDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -2764,9 +2395,6 @@ void POA_CORBA::UnionDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -2781,9 +2409,6 @@ void POA_CORBA::UnionDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::UnionDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -2796,9 +2421,6 @@ template <class T> ACE_INLINE ::CORBA::Contained_ptr POA_CORBA::UnionDef_tie<T>::lookup ( const char * search_name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup ( search_name @@ -2813,9 +2435,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->contents ( limit_type, @@ -2833,9 +2452,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup_name ( search_name, @@ -2854,9 +2470,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_contents ( limit_type, @@ -2874,9 +2487,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_module ( id, @@ -2896,9 +2506,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, const ::CORBA::Any & value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_constant ( id, @@ -2919,9 +2526,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_struct ( id, @@ -2942,9 +2546,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_union ( id, @@ -2965,9 +2566,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::EnumMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_enum ( id, @@ -2987,9 +2585,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_alias ( id, @@ -3009,9 +2604,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_interface ( id, @@ -3037,9 +2629,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value ( id, @@ -3065,9 +2654,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value_box ( id, @@ -3087,9 +2673,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_exception ( id, @@ -3108,9 +2691,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_native ( id, @@ -3129,9 +2709,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_abstract_interface ( id, @@ -3151,9 +2728,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_local_interface ( id, @@ -3179,9 +2753,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_value ( id, @@ -3203,9 +2774,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::UnionDef_tie<T>::discriminator_type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->discriminator_type ( ); @@ -3217,9 +2785,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::IDLType_ptr POA_CORBA::UnionDef_tie<T>::discriminator_type_def ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->discriminator_type_def ( ); @@ -3232,9 +2797,6 @@ template <class T> ACE_INLINE void POA_CORBA::UnionDef_tie<T>::discriminator_type_def ( ::CORBA::IDLType_ptr discriminator_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->discriminator_type_def ( discriminator_type_def @@ -3247,9 +2809,6 @@ void POA_CORBA::UnionDef_tie<T>::discriminator_type_def ( template <class T> ACE_INLINE ::CORBA::UnionMemberSeq * POA_CORBA::UnionDef_tie<T>::members ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->members ( ); @@ -3262,9 +2821,6 @@ template <class T> ACE_INLINE void POA_CORBA::UnionDef_tie<T>::members ( const ::CORBA::UnionMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->members ( members @@ -3370,9 +2926,6 @@ POA_CORBA::EnumDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::EnumDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -3384,9 +2937,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::EnumDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -3398,9 +2948,6 @@ void POA_CORBA::EnumDef_tie<T>::destroy ( template <class T> ACE_INLINE char * POA_CORBA::EnumDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -3413,9 +2960,6 @@ template <class T> ACE_INLINE void POA_CORBA::EnumDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -3428,9 +2972,6 @@ void POA_CORBA::EnumDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::EnumDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -3443,9 +2984,6 @@ template <class T> ACE_INLINE void POA_CORBA::EnumDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -3458,9 +2996,6 @@ void POA_CORBA::EnumDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::EnumDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -3473,9 +3008,6 @@ template <class T> ACE_INLINE void POA_CORBA::EnumDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -3488,9 +3020,6 @@ void POA_CORBA::EnumDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::EnumDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -3502,9 +3031,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::EnumDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -3516,9 +3042,6 @@ char * POA_CORBA::EnumDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::EnumDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -3530,9 +3053,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::EnumDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -3547,9 +3067,6 @@ void POA_CORBA::EnumDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -3564,9 +3081,6 @@ void POA_CORBA::EnumDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::EnumDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -3578,9 +3092,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::EnumMemberSeq * POA_CORBA::EnumDef_tie<T>::members ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->members ( ); @@ -3593,9 +3104,6 @@ template <class T> ACE_INLINE void POA_CORBA::EnumDef_tie<T>::members ( const ::CORBA::EnumMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->members ( members @@ -3701,9 +3209,6 @@ POA_CORBA::AliasDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::AliasDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -3715,9 +3220,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::AliasDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -3729,9 +3231,6 @@ void POA_CORBA::AliasDef_tie<T>::destroy ( template <class T> ACE_INLINE char * POA_CORBA::AliasDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -3744,9 +3243,6 @@ template <class T> ACE_INLINE void POA_CORBA::AliasDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -3759,9 +3255,6 @@ void POA_CORBA::AliasDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::AliasDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -3774,9 +3267,6 @@ template <class T> ACE_INLINE void POA_CORBA::AliasDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -3789,9 +3279,6 @@ void POA_CORBA::AliasDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::AliasDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -3804,9 +3291,6 @@ template <class T> ACE_INLINE void POA_CORBA::AliasDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -3819,9 +3303,6 @@ void POA_CORBA::AliasDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::AliasDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -3833,9 +3314,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::AliasDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -3847,9 +3325,6 @@ char * POA_CORBA::AliasDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::AliasDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -3861,9 +3336,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::AliasDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -3878,9 +3350,6 @@ void POA_CORBA::AliasDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -3895,9 +3364,6 @@ void POA_CORBA::AliasDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::AliasDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -3909,9 +3375,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::IDLType_ptr POA_CORBA::AliasDef_tie<T>::original_type_def ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->original_type_def ( ); @@ -3924,9 +3387,6 @@ template <class T> ACE_INLINE void POA_CORBA::AliasDef_tie<T>::original_type_def ( ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->original_type_def ( original_type_def @@ -4032,9 +3492,6 @@ POA_CORBA::NativeDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::NativeDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -4046,9 +3503,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::NativeDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -4060,9 +3514,6 @@ void POA_CORBA::NativeDef_tie<T>::destroy ( template <class T> ACE_INLINE char * POA_CORBA::NativeDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -4075,9 +3526,6 @@ template <class T> ACE_INLINE void POA_CORBA::NativeDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -4090,9 +3538,6 @@ void POA_CORBA::NativeDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::NativeDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -4105,9 +3550,6 @@ template <class T> ACE_INLINE void POA_CORBA::NativeDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -4120,9 +3562,6 @@ void POA_CORBA::NativeDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::NativeDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -4135,9 +3574,6 @@ template <class T> ACE_INLINE void POA_CORBA::NativeDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -4150,9 +3586,6 @@ void POA_CORBA::NativeDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::NativeDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -4164,9 +3597,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::NativeDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -4178,9 +3608,6 @@ char * POA_CORBA::NativeDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::NativeDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -4192,9 +3619,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::NativeDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -4209,9 +3633,6 @@ void POA_CORBA::NativeDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -4226,9 +3647,6 @@ void POA_CORBA::NativeDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::NativeDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -4333,9 +3751,6 @@ POA_CORBA::PrimitiveDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::PrimitiveDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -4347,9 +3762,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::PrimitiveDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -4361,9 +3773,6 @@ void POA_CORBA::PrimitiveDef_tie<T>::destroy ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::PrimitiveDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -4375,9 +3784,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::PrimitiveKind POA_CORBA::PrimitiveDef_tie<T>::kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->kind ( ); @@ -4482,9 +3888,6 @@ POA_CORBA::StringDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::StringDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -4496,9 +3899,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::StringDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -4510,9 +3910,6 @@ void POA_CORBA::StringDef_tie<T>::destroy ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::StringDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -4524,9 +3921,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::ULong POA_CORBA::StringDef_tie<T>::bound ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->bound ( ); @@ -4539,9 +3933,6 @@ template <class T> ACE_INLINE void POA_CORBA::StringDef_tie<T>::bound ( ::CORBA::ULong bound ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->bound ( bound @@ -4647,9 +4038,6 @@ POA_CORBA::WstringDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::WstringDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -4661,9 +4049,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::WstringDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -4675,9 +4060,6 @@ void POA_CORBA::WstringDef_tie<T>::destroy ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::WstringDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -4689,9 +4071,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::ULong POA_CORBA::WstringDef_tie<T>::bound ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->bound ( ); @@ -4704,9 +4083,6 @@ template <class T> ACE_INLINE void POA_CORBA::WstringDef_tie<T>::bound ( ::CORBA::ULong bound ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->bound ( bound @@ -4812,9 +4188,6 @@ POA_CORBA::SequenceDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::SequenceDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -4826,9 +4199,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::SequenceDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -4840,9 +4210,6 @@ void POA_CORBA::SequenceDef_tie<T>::destroy ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::SequenceDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -4854,9 +4221,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::ULong POA_CORBA::SequenceDef_tie<T>::bound ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->bound ( ); @@ -4869,9 +4233,6 @@ template <class T> ACE_INLINE void POA_CORBA::SequenceDef_tie<T>::bound ( ::CORBA::ULong bound ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->bound ( bound @@ -4884,9 +4245,6 @@ void POA_CORBA::SequenceDef_tie<T>::bound ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::SequenceDef_tie<T>::element_type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->element_type ( ); @@ -4898,9 +4256,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::IDLType_ptr POA_CORBA::SequenceDef_tie<T>::element_type_def ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->element_type_def ( ); @@ -4913,9 +4268,6 @@ template <class T> ACE_INLINE void POA_CORBA::SequenceDef_tie<T>::element_type_def ( ::CORBA::IDLType_ptr element_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->element_type_def ( element_type_def @@ -5021,9 +4373,6 @@ POA_CORBA::ArrayDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ArrayDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -5035,9 +4384,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ArrayDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -5049,9 +4395,6 @@ void POA_CORBA::ArrayDef_tie<T>::destroy ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::ArrayDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -5063,9 +4406,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::ULong POA_CORBA::ArrayDef_tie<T>::length ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->length ( ); @@ -5078,9 +4418,6 @@ template <class T> ACE_INLINE void POA_CORBA::ArrayDef_tie<T>::length ( ::CORBA::ULong length ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->length ( length @@ -5093,9 +4430,6 @@ void POA_CORBA::ArrayDef_tie<T>::length ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::ArrayDef_tie<T>::element_type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->element_type ( ); @@ -5107,9 +4441,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::IDLType_ptr POA_CORBA::ArrayDef_tie<T>::element_type_def ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->element_type_def ( ); @@ -5122,9 +4453,6 @@ template <class T> ACE_INLINE void POA_CORBA::ArrayDef_tie<T>::element_type_def ( ::CORBA::IDLType_ptr element_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->element_type_def ( element_type_def @@ -5230,9 +4558,6 @@ POA_CORBA::ExceptionDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ExceptionDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -5244,9 +4569,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ExceptionDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -5258,9 +4580,6 @@ void POA_CORBA::ExceptionDef_tie<T>::destroy ( template <class T> ACE_INLINE char * POA_CORBA::ExceptionDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -5273,9 +4592,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExceptionDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -5288,9 +4604,6 @@ void POA_CORBA::ExceptionDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::ExceptionDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -5303,9 +4616,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExceptionDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -5318,9 +4628,6 @@ void POA_CORBA::ExceptionDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::ExceptionDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -5333,9 +4640,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExceptionDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -5348,9 +4652,6 @@ void POA_CORBA::ExceptionDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::ExceptionDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -5362,9 +4663,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ExceptionDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -5376,9 +4674,6 @@ char * POA_CORBA::ExceptionDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::ExceptionDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -5390,9 +4685,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::ExceptionDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -5407,9 +4699,6 @@ void POA_CORBA::ExceptionDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -5425,9 +4714,6 @@ template <class T> ACE_INLINE ::CORBA::Contained_ptr POA_CORBA::ExceptionDef_tie<T>::lookup ( const char * search_name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup ( search_name @@ -5442,9 +4728,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->contents ( limit_type, @@ -5462,9 +4745,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup_name ( search_name, @@ -5483,9 +4763,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_contents ( limit_type, @@ -5503,9 +4780,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_module ( id, @@ -5525,9 +4799,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, const ::CORBA::Any & value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_constant ( id, @@ -5548,9 +4819,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_struct ( id, @@ -5571,9 +4839,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_union ( id, @@ -5594,9 +4859,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::EnumMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_enum ( id, @@ -5616,9 +4878,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_alias ( id, @@ -5638,9 +4897,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_interface ( id, @@ -5666,9 +4922,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value ( id, @@ -5694,9 +4947,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value_box ( id, @@ -5716,9 +4966,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_exception ( id, @@ -5737,9 +4984,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_native ( id, @@ -5758,9 +5002,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_abstract_interface ( id, @@ -5780,9 +5021,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_local_interface ( id, @@ -5808,9 +5046,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_value ( id, @@ -5832,9 +5067,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::ExceptionDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -5846,9 +5078,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::StructMemberSeq * POA_CORBA::ExceptionDef_tie<T>::members ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->members ( ); @@ -5861,9 +5090,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExceptionDef_tie<T>::members ( const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->members ( members @@ -5969,9 +5195,6 @@ POA_CORBA::AttributeDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::AttributeDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -5983,9 +5206,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::AttributeDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -5997,9 +5217,6 @@ void POA_CORBA::AttributeDef_tie<T>::destroy ( template <class T> ACE_INLINE char * POA_CORBA::AttributeDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -6012,9 +5229,6 @@ template <class T> ACE_INLINE void POA_CORBA::AttributeDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -6027,9 +5241,6 @@ void POA_CORBA::AttributeDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::AttributeDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -6042,9 +5253,6 @@ template <class T> ACE_INLINE void POA_CORBA::AttributeDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -6057,9 +5265,6 @@ void POA_CORBA::AttributeDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::AttributeDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -6072,9 +5277,6 @@ template <class T> ACE_INLINE void POA_CORBA::AttributeDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -6087,9 +5289,6 @@ void POA_CORBA::AttributeDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::AttributeDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -6101,9 +5300,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::AttributeDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -6115,9 +5311,6 @@ char * POA_CORBA::AttributeDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::AttributeDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -6129,9 +5322,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::AttributeDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -6146,9 +5336,6 @@ void POA_CORBA::AttributeDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -6163,9 +5350,6 @@ void POA_CORBA::AttributeDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::AttributeDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -6177,9 +5361,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::IDLType_ptr POA_CORBA::AttributeDef_tie<T>::type_def ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type_def ( ); @@ -6192,9 +5373,6 @@ template <class T> ACE_INLINE void POA_CORBA::AttributeDef_tie<T>::type_def ( ::CORBA::IDLType_ptr type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->type_def ( type_def @@ -6207,9 +5385,6 @@ void POA_CORBA::AttributeDef_tie<T>::type_def ( template <class T> ACE_INLINE ::CORBA::AttributeMode POA_CORBA::AttributeDef_tie<T>::mode ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->mode ( ); @@ -6222,9 +5397,6 @@ template <class T> ACE_INLINE void POA_CORBA::AttributeDef_tie<T>::mode ( ::CORBA::AttributeMode mode ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->mode ( mode @@ -6330,9 +5502,6 @@ POA_CORBA::ExtAttributeDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ExtAttributeDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -6344,9 +5513,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ExtAttributeDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -6358,9 +5524,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::destroy ( template <class T> ACE_INLINE char * POA_CORBA::ExtAttributeDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -6373,9 +5536,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtAttributeDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -6388,9 +5548,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::ExtAttributeDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -6403,9 +5560,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtAttributeDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -6418,9 +5572,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::ExtAttributeDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -6433,9 +5584,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtAttributeDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -6448,9 +5596,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::ExtAttributeDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -6462,9 +5607,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ExtAttributeDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -6476,9 +5618,6 @@ char * POA_CORBA::ExtAttributeDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::ExtAttributeDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -6490,9 +5629,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::ExtAttributeDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -6507,9 +5643,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -6524,9 +5657,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::ExtAttributeDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -6538,9 +5668,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::IDLType_ptr POA_CORBA::ExtAttributeDef_tie<T>::type_def ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type_def ( ); @@ -6553,9 +5680,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtAttributeDef_tie<T>::type_def ( ::CORBA::IDLType_ptr type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->type_def ( type_def @@ -6568,9 +5692,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::type_def ( template <class T> ACE_INLINE ::CORBA::AttributeMode POA_CORBA::ExtAttributeDef_tie<T>::mode ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->mode ( ); @@ -6583,9 +5704,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtAttributeDef_tie<T>::mode ( ::CORBA::AttributeMode mode ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->mode ( mode @@ -6598,9 +5716,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::mode ( template <class T> ACE_INLINE ::CORBA::ExcDescriptionSeq * POA_CORBA::ExtAttributeDef_tie<T>::get_exceptions ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->get_exceptions ( ); @@ -6613,9 +5728,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtAttributeDef_tie<T>::get_exceptions ( const ::CORBA::ExcDescriptionSeq & get_exceptions ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->get_exceptions ( get_exceptions @@ -6628,9 +5740,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::get_exceptions ( template <class T> ACE_INLINE ::CORBA::ExcDescriptionSeq * POA_CORBA::ExtAttributeDef_tie<T>::set_exceptions ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->set_exceptions ( ); @@ -6643,9 +5752,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtAttributeDef_tie<T>::set_exceptions ( const ::CORBA::ExcDescriptionSeq & set_exceptions ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->set_exceptions ( set_exceptions @@ -6658,9 +5764,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::set_exceptions ( template <class T> ACE_INLINE ::CORBA::ExtAttributeDescription * POA_CORBA::ExtAttributeDef_tie<T>::describe_attribute ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_attribute ( ); @@ -6765,9 +5868,6 @@ POA_CORBA::OperationDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::OperationDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -6779,9 +5879,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::OperationDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -6793,9 +5890,6 @@ void POA_CORBA::OperationDef_tie<T>::destroy ( template <class T> ACE_INLINE char * POA_CORBA::OperationDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -6808,9 +5902,6 @@ template <class T> ACE_INLINE void POA_CORBA::OperationDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -6823,9 +5914,6 @@ void POA_CORBA::OperationDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::OperationDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -6838,9 +5926,6 @@ template <class T> ACE_INLINE void POA_CORBA::OperationDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -6853,9 +5938,6 @@ void POA_CORBA::OperationDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::OperationDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -6868,9 +5950,6 @@ template <class T> ACE_INLINE void POA_CORBA::OperationDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -6883,9 +5962,6 @@ void POA_CORBA::OperationDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::OperationDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -6897,9 +5973,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::OperationDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -6911,9 +5984,6 @@ char * POA_CORBA::OperationDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::OperationDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -6925,9 +5995,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::OperationDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -6942,9 +6009,6 @@ void POA_CORBA::OperationDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -6959,9 +6023,6 @@ void POA_CORBA::OperationDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::OperationDef_tie<T>::result ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->result ( ); @@ -6973,9 +6034,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::IDLType_ptr POA_CORBA::OperationDef_tie<T>::result_def ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->result_def ( ); @@ -6988,9 +6046,6 @@ template <class T> ACE_INLINE void POA_CORBA::OperationDef_tie<T>::result_def ( ::CORBA::IDLType_ptr result_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->result_def ( result_def @@ -7003,9 +6058,6 @@ void POA_CORBA::OperationDef_tie<T>::result_def ( template <class T> ACE_INLINE ::CORBA::ParDescriptionSeq * POA_CORBA::OperationDef_tie<T>::params ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->params ( ); @@ -7018,9 +6070,6 @@ template <class T> ACE_INLINE void POA_CORBA::OperationDef_tie<T>::params ( const ::CORBA::ParDescriptionSeq & params ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->params ( params @@ -7033,9 +6082,6 @@ void POA_CORBA::OperationDef_tie<T>::params ( template <class T> ACE_INLINE ::CORBA::OperationMode POA_CORBA::OperationDef_tie<T>::mode ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->mode ( ); @@ -7048,9 +6094,6 @@ template <class T> ACE_INLINE void POA_CORBA::OperationDef_tie<T>::mode ( ::CORBA::OperationMode mode ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->mode ( mode @@ -7063,9 +6106,6 @@ void POA_CORBA::OperationDef_tie<T>::mode ( template <class T> ACE_INLINE ::CORBA::ContextIdSeq * POA_CORBA::OperationDef_tie<T>::contexts ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->contexts ( ); @@ -7078,9 +6118,6 @@ template <class T> ACE_INLINE void POA_CORBA::OperationDef_tie<T>::contexts ( const ::CORBA::ContextIdSeq & contexts ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->contexts ( contexts @@ -7093,9 +6130,6 @@ void POA_CORBA::OperationDef_tie<T>::contexts ( template <class T> ACE_INLINE ::CORBA::ExceptionDefSeq * POA_CORBA::OperationDef_tie<T>::exceptions ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->exceptions ( ); @@ -7108,9 +6142,6 @@ template <class T> ACE_INLINE void POA_CORBA::OperationDef_tie<T>::exceptions ( const ::CORBA::ExceptionDefSeq & exceptions ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->exceptions ( exceptions @@ -7216,9 +6247,6 @@ POA_CORBA::InterfaceDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::InterfaceDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -7230,9 +6258,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::InterfaceDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -7245,9 +6270,6 @@ template <class T> ACE_INLINE ::CORBA::Contained_ptr POA_CORBA::InterfaceDef_tie<T>::lookup ( const char * search_name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup ( search_name @@ -7262,9 +6284,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->contents ( limit_type, @@ -7282,9 +6301,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup_name ( search_name, @@ -7303,9 +6319,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_contents ( limit_type, @@ -7323,9 +6336,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_module ( id, @@ -7345,9 +6355,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, const ::CORBA::Any & value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_constant ( id, @@ -7368,9 +6375,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_struct ( id, @@ -7391,9 +6395,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_union ( id, @@ -7414,9 +6415,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::EnumMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_enum ( id, @@ -7436,9 +6434,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_alias ( id, @@ -7458,9 +6453,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_interface ( id, @@ -7486,9 +6478,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value ( id, @@ -7514,9 +6503,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value_box ( id, @@ -7536,9 +6522,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_exception ( id, @@ -7557,9 +6540,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_native ( id, @@ -7578,9 +6558,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_abstract_interface ( id, @@ -7600,9 +6577,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_local_interface ( id, @@ -7628,9 +6602,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_value ( id, @@ -7652,9 +6623,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::InterfaceDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -7667,9 +6635,6 @@ template <class T> ACE_INLINE void POA_CORBA::InterfaceDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -7682,9 +6647,6 @@ void POA_CORBA::InterfaceDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::InterfaceDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -7697,9 +6659,6 @@ template <class T> ACE_INLINE void POA_CORBA::InterfaceDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -7712,9 +6671,6 @@ void POA_CORBA::InterfaceDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::InterfaceDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -7727,9 +6683,6 @@ template <class T> ACE_INLINE void POA_CORBA::InterfaceDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -7742,9 +6695,6 @@ void POA_CORBA::InterfaceDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::InterfaceDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -7756,9 +6706,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::InterfaceDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -7770,9 +6717,6 @@ char * POA_CORBA::InterfaceDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::InterfaceDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -7784,9 +6728,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::InterfaceDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -7801,9 +6742,6 @@ void POA_CORBA::InterfaceDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -7818,9 +6756,6 @@ void POA_CORBA::InterfaceDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::InterfaceDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -7832,9 +6767,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::InterfaceDefSeq * POA_CORBA::InterfaceDef_tie<T>::base_interfaces ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->base_interfaces ( ); @@ -7847,9 +6779,6 @@ template <class T> ACE_INLINE void POA_CORBA::InterfaceDef_tie<T>::base_interfaces ( const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->base_interfaces ( base_interfaces @@ -7863,9 +6792,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::InterfaceDef_tie<T>::is_a ( const char * interface_id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_a ( interface_id @@ -7878,9 +6804,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::InterfaceDef_tie<T>::describe_interface ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_interface ( ); @@ -7897,9 +6820,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, ::CORBA::AttributeMode mode ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_attribute ( id, @@ -7924,9 +6844,6 @@ template <class T> ACE_INLINE const ::CORBA::ExceptionDefSeq & exceptions, const ::CORBA::ContextIdSeq & contexts ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_operation ( id, @@ -8039,9 +6956,6 @@ POA_CORBA::InterfaceAttrExtension_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::InterfaceAttrExtension_tie<T>::describe_ext_interface ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_ext_interface ( ); @@ -8060,9 +6974,6 @@ template <class T> ACE_INLINE const ::CORBA::ExceptionDefSeq & get_exceptions, const ::CORBA::ExceptionDefSeq & set_exceptions ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_attribute ( id, @@ -8174,9 +7085,6 @@ POA_CORBA::ExtInterfaceDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ExtInterfaceDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -8188,9 +7096,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ExtInterfaceDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -8203,9 +7108,6 @@ template <class T> ACE_INLINE ::CORBA::Contained_ptr POA_CORBA::ExtInterfaceDef_tie<T>::lookup ( const char * search_name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup ( search_name @@ -8220,9 +7122,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->contents ( limit_type, @@ -8240,9 +7139,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup_name ( search_name, @@ -8261,9 +7157,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_contents ( limit_type, @@ -8281,9 +7174,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_module ( id, @@ -8303,9 +7193,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, const ::CORBA::Any & value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_constant ( id, @@ -8326,9 +7213,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_struct ( id, @@ -8349,9 +7233,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_union ( id, @@ -8372,9 +7253,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::EnumMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_enum ( id, @@ -8394,9 +7272,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_alias ( id, @@ -8416,9 +7291,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_interface ( id, @@ -8444,9 +7316,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value ( id, @@ -8472,9 +7341,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value_box ( id, @@ -8494,9 +7360,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_exception ( id, @@ -8515,9 +7378,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_native ( id, @@ -8536,9 +7396,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_abstract_interface ( id, @@ -8558,9 +7415,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_local_interface ( id, @@ -8586,9 +7440,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_value ( id, @@ -8610,9 +7461,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ExtInterfaceDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -8625,9 +7473,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtInterfaceDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -8640,9 +7485,6 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::ExtInterfaceDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -8655,9 +7497,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtInterfaceDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -8670,9 +7509,6 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::ExtInterfaceDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -8685,9 +7521,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtInterfaceDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -8700,9 +7533,6 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::ExtInterfaceDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -8714,9 +7544,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ExtInterfaceDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -8728,9 +7555,6 @@ char * POA_CORBA::ExtInterfaceDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::ExtInterfaceDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -8742,9 +7566,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::ExtInterfaceDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -8759,9 +7580,6 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -8776,9 +7594,6 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::ExtInterfaceDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -8790,9 +7605,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::InterfaceDefSeq * POA_CORBA::ExtInterfaceDef_tie<T>::base_interfaces ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->base_interfaces ( ); @@ -8805,9 +7617,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtInterfaceDef_tie<T>::base_interfaces ( const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->base_interfaces ( base_interfaces @@ -8821,9 +7630,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::ExtInterfaceDef_tie<T>::is_a ( const char * interface_id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_a ( interface_id @@ -8836,9 +7642,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ExtInterfaceDef_tie<T>::describe_interface ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_interface ( ); @@ -8855,9 +7658,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, ::CORBA::AttributeMode mode ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_attribute ( id, @@ -8882,9 +7682,6 @@ template <class T> ACE_INLINE const ::CORBA::ExceptionDefSeq & exceptions, const ::CORBA::ContextIdSeq & contexts ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_operation ( id, @@ -8904,9 +7701,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ExtInterfaceDef_tie<T>::describe_ext_interface ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_ext_interface ( ); @@ -8925,9 +7719,6 @@ template <class T> ACE_INLINE const ::CORBA::ExceptionDefSeq & get_exceptions, const ::CORBA::ExceptionDefSeq & set_exceptions ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_attribute ( id, @@ -9039,9 +7830,6 @@ POA_CORBA::AbstractInterfaceDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::AbstractInterfaceDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -9053,9 +7841,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::AbstractInterfaceDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -9068,9 +7853,6 @@ template <class T> ACE_INLINE ::CORBA::Contained_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::lookup ( const char * search_name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup ( search_name @@ -9085,9 +7867,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->contents ( limit_type, @@ -9105,9 +7884,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup_name ( search_name, @@ -9126,9 +7902,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_contents ( limit_type, @@ -9146,9 +7919,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_module ( id, @@ -9168,9 +7938,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, const ::CORBA::Any & value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_constant ( id, @@ -9191,9 +7958,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_struct ( id, @@ -9214,9 +7978,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_union ( id, @@ -9237,9 +7998,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::EnumMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_enum ( id, @@ -9259,9 +8017,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_alias ( id, @@ -9281,9 +8036,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_interface ( id, @@ -9309,9 +8061,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value ( id, @@ -9337,9 +8086,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value_box ( id, @@ -9359,9 +8105,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_exception ( id, @@ -9380,9 +8123,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_native ( id, @@ -9401,9 +8141,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_abstract_interface ( id, @@ -9423,9 +8160,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_local_interface ( id, @@ -9451,9 +8185,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_value ( id, @@ -9475,9 +8206,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::AbstractInterfaceDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -9490,9 +8218,6 @@ template <class T> ACE_INLINE void POA_CORBA::AbstractInterfaceDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -9505,9 +8230,6 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::AbstractInterfaceDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -9520,9 +8242,6 @@ template <class T> ACE_INLINE void POA_CORBA::AbstractInterfaceDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -9535,9 +8254,6 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::AbstractInterfaceDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -9550,9 +8266,6 @@ template <class T> ACE_INLINE void POA_CORBA::AbstractInterfaceDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -9565,9 +8278,6 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -9579,9 +8289,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::AbstractInterfaceDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -9593,9 +8300,6 @@ char * POA_CORBA::AbstractInterfaceDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -9607,9 +8311,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::AbstractInterfaceDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -9624,9 +8325,6 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -9641,9 +8339,6 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -9655,9 +8350,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::InterfaceDefSeq * POA_CORBA::AbstractInterfaceDef_tie<T>::base_interfaces ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->base_interfaces ( ); @@ -9670,9 +8362,6 @@ template <class T> ACE_INLINE void POA_CORBA::AbstractInterfaceDef_tie<T>::base_interfaces ( const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->base_interfaces ( base_interfaces @@ -9686,9 +8375,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::AbstractInterfaceDef_tie<T>::is_a ( const char * interface_id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_a ( interface_id @@ -9701,9 +8387,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::AbstractInterfaceDef_tie<T>::describe_interface ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_interface ( ); @@ -9720,9 +8403,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, ::CORBA::AttributeMode mode ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_attribute ( id, @@ -9747,9 +8427,6 @@ template <class T> ACE_INLINE const ::CORBA::ExceptionDefSeq & exceptions, const ::CORBA::ContextIdSeq & contexts ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_operation ( id, @@ -9862,9 +8539,6 @@ POA_CORBA::ExtAbstractInterfaceDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ExtAbstractInterfaceDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -9876,9 +8550,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -9891,9 +8562,6 @@ template <class T> ACE_INLINE ::CORBA::Contained_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::lookup ( const char * search_name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup ( search_name @@ -9908,9 +8576,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->contents ( limit_type, @@ -9928,9 +8593,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup_name ( search_name, @@ -9949,9 +8611,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_contents ( limit_type, @@ -9969,9 +8628,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_module ( id, @@ -9991,9 +8647,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, const ::CORBA::Any & value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_constant ( id, @@ -10014,9 +8667,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_struct ( id, @@ -10037,9 +8687,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_union ( id, @@ -10060,9 +8707,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::EnumMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_enum ( id, @@ -10082,9 +8726,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_alias ( id, @@ -10104,9 +8745,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_interface ( id, @@ -10132,9 +8770,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value ( id, @@ -10160,9 +8795,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value_box ( id, @@ -10182,9 +8814,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_exception ( id, @@ -10203,9 +8832,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_native ( id, @@ -10224,9 +8850,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_abstract_interface ( id, @@ -10246,9 +8869,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_local_interface ( id, @@ -10274,9 +8894,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_value ( id, @@ -10298,9 +8915,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -10313,9 +8927,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -10328,9 +8939,6 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -10343,9 +8951,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -10358,9 +8963,6 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -10373,9 +8975,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -10388,9 +8987,6 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -10402,9 +8998,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -10416,9 +9009,6 @@ char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -10430,9 +9020,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -10447,9 +9034,6 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -10464,9 +9048,6 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -10478,9 +9059,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::InterfaceDefSeq * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::base_interfaces ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->base_interfaces ( ); @@ -10493,9 +9071,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::base_interfaces ( const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->base_interfaces ( base_interfaces @@ -10509,9 +9084,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::ExtAbstractInterfaceDef_tie<T>::is_a ( const char * interface_id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_a ( interface_id @@ -10524,9 +9096,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::describe_interface ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_interface ( ); @@ -10543,9 +9112,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, ::CORBA::AttributeMode mode ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_attribute ( id, @@ -10570,9 +9136,6 @@ template <class T> ACE_INLINE const ::CORBA::ExceptionDefSeq & exceptions, const ::CORBA::ContextIdSeq & contexts ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_operation ( id, @@ -10592,9 +9155,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::describe_ext_interface ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_ext_interface ( ); @@ -10613,9 +9173,6 @@ template <class T> ACE_INLINE const ::CORBA::ExceptionDefSeq & get_exceptions, const ::CORBA::ExceptionDefSeq & set_exceptions ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_attribute ( id, @@ -10727,9 +9284,6 @@ POA_CORBA::LocalInterfaceDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::LocalInterfaceDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -10741,9 +9295,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::LocalInterfaceDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -10756,9 +9307,6 @@ template <class T> ACE_INLINE ::CORBA::Contained_ptr POA_CORBA::LocalInterfaceDef_tie<T>::lookup ( const char * search_name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup ( search_name @@ -10773,9 +9321,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->contents ( limit_type, @@ -10793,9 +9338,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup_name ( search_name, @@ -10814,9 +9356,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_contents ( limit_type, @@ -10834,9 +9373,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_module ( id, @@ -10856,9 +9392,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, const ::CORBA::Any & value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_constant ( id, @@ -10879,9 +9412,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_struct ( id, @@ -10902,9 +9432,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_union ( id, @@ -10925,9 +9452,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::EnumMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_enum ( id, @@ -10947,9 +9471,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_alias ( id, @@ -10969,9 +9490,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_interface ( id, @@ -10997,9 +9515,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value ( id, @@ -11025,9 +9540,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value_box ( id, @@ -11047,9 +9559,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_exception ( id, @@ -11068,9 +9577,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_native ( id, @@ -11089,9 +9595,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_abstract_interface ( id, @@ -11111,9 +9614,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_local_interface ( id, @@ -11139,9 +9639,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_value ( id, @@ -11163,9 +9660,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::LocalInterfaceDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -11178,9 +9672,6 @@ template <class T> ACE_INLINE void POA_CORBA::LocalInterfaceDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -11193,9 +9684,6 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::LocalInterfaceDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -11208,9 +9696,6 @@ template <class T> ACE_INLINE void POA_CORBA::LocalInterfaceDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -11223,9 +9708,6 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::LocalInterfaceDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -11238,9 +9720,6 @@ template <class T> ACE_INLINE void POA_CORBA::LocalInterfaceDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -11253,9 +9732,6 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::LocalInterfaceDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -11267,9 +9743,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::LocalInterfaceDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -11281,9 +9754,6 @@ char * POA_CORBA::LocalInterfaceDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::LocalInterfaceDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -11295,9 +9765,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::LocalInterfaceDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -11312,9 +9779,6 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -11329,9 +9793,6 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::LocalInterfaceDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -11343,9 +9804,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::InterfaceDefSeq * POA_CORBA::LocalInterfaceDef_tie<T>::base_interfaces ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->base_interfaces ( ); @@ -11358,9 +9816,6 @@ template <class T> ACE_INLINE void POA_CORBA::LocalInterfaceDef_tie<T>::base_interfaces ( const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->base_interfaces ( base_interfaces @@ -11374,9 +9829,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::LocalInterfaceDef_tie<T>::is_a ( const char * interface_id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_a ( interface_id @@ -11389,9 +9841,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::LocalInterfaceDef_tie<T>::describe_interface ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_interface ( ); @@ -11408,9 +9857,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, ::CORBA::AttributeMode mode ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_attribute ( id, @@ -11435,9 +9881,6 @@ template <class T> ACE_INLINE const ::CORBA::ExceptionDefSeq & exceptions, const ::CORBA::ContextIdSeq & contexts ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_operation ( id, @@ -11550,9 +9993,6 @@ POA_CORBA::ExtLocalInterfaceDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ExtLocalInterfaceDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -11564,9 +10004,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -11579,9 +10016,6 @@ template <class T> ACE_INLINE ::CORBA::Contained_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::lookup ( const char * search_name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup ( search_name @@ -11596,9 +10030,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->contents ( limit_type, @@ -11616,9 +10047,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup_name ( search_name, @@ -11637,9 +10065,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_contents ( limit_type, @@ -11657,9 +10082,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_module ( id, @@ -11679,9 +10101,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, const ::CORBA::Any & value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_constant ( id, @@ -11702,9 +10121,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_struct ( id, @@ -11725,9 +10141,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_union ( id, @@ -11748,9 +10161,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::EnumMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_enum ( id, @@ -11770,9 +10180,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_alias ( id, @@ -11792,9 +10199,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_interface ( id, @@ -11820,9 +10224,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value ( id, @@ -11848,9 +10249,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value_box ( id, @@ -11870,9 +10268,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_exception ( id, @@ -11891,9 +10286,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_native ( id, @@ -11912,9 +10304,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_abstract_interface ( id, @@ -11934,9 +10323,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_local_interface ( id, @@ -11962,9 +10348,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_value ( id, @@ -11986,9 +10369,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -12001,9 +10381,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -12016,9 +10393,6 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -12031,9 +10405,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -12046,9 +10417,6 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -12061,9 +10429,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -12076,9 +10441,6 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -12090,9 +10452,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -12104,9 +10463,6 @@ char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -12118,9 +10474,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::ExtLocalInterfaceDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -12135,9 +10488,6 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -12152,9 +10502,6 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -12166,9 +10513,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::InterfaceDefSeq * POA_CORBA::ExtLocalInterfaceDef_tie<T>::base_interfaces ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->base_interfaces ( ); @@ -12181,9 +10525,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtLocalInterfaceDef_tie<T>::base_interfaces ( const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->base_interfaces ( base_interfaces @@ -12197,9 +10538,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::ExtLocalInterfaceDef_tie<T>::is_a ( const char * interface_id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_a ( interface_id @@ -12212,9 +10550,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ExtLocalInterfaceDef_tie<T>::describe_interface ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_interface ( ); @@ -12231,9 +10566,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, ::CORBA::AttributeMode mode ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_attribute ( id, @@ -12258,9 +10590,6 @@ template <class T> ACE_INLINE const ::CORBA::ExceptionDefSeq & exceptions, const ::CORBA::ContextIdSeq & contexts ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_operation ( id, @@ -12280,9 +10609,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ExtLocalInterfaceDef_tie<T>::describe_ext_interface ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_ext_interface ( ); @@ -12301,9 +10627,6 @@ template <class T> ACE_INLINE const ::CORBA::ExceptionDefSeq & get_exceptions, const ::CORBA::ExceptionDefSeq & set_exceptions ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_attribute ( id, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h index a1ad147d576..6b55c6a178b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h @@ -674,9 +674,7 @@ namespace POA_CORBA ::CORBA::ComponentIR::ComponentDef_ptr base_component, const ::CORBA::InterfaceDefSeq & supports_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_component_skel ( TAO_ServerRequest & server_request, @@ -696,9 +694,7 @@ namespace POA_CORBA const ::CORBA::InterfaceDefSeq & supports_interfaces, ::CORBA::ValueDef_ptr primary_key ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_home_skel ( TAO_ServerRequest & server_request, @@ -721,9 +717,7 @@ namespace POA_CORBA const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_event_skel ( TAO_ServerRequest & server_request, @@ -1753,9 +1747,7 @@ namespace POA_CORBA virtual ::CORBA::InterfaceDef_ptr interface_type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_interface_type_skel ( TAO_ServerRequest & server_request, @@ -1769,9 +1761,7 @@ namespace POA_CORBA virtual void interface_type ( ::CORBA::InterfaceDef_ptr interface_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_interface_type_skel ( TAO_ServerRequest & server_request, @@ -1951,9 +1941,7 @@ namespace POA_CORBA virtual ::CORBA::InterfaceDef_ptr interface_type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_interface_type_skel ( TAO_ServerRequest & server_request, @@ -1967,9 +1955,7 @@ namespace POA_CORBA virtual void interface_type ( ::CORBA::InterfaceDef_ptr interface_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_interface_type_skel ( TAO_ServerRequest & server_request, @@ -1982,9 +1968,7 @@ namespace POA_CORBA virtual ::CORBA::Boolean is_multiple ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_is_multiple_skel ( TAO_ServerRequest & server_request, @@ -1998,9 +1982,7 @@ namespace POA_CORBA virtual void is_multiple ( ::CORBA::Boolean is_multiple ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_is_multiple_skel ( TAO_ServerRequest & server_request, @@ -2180,9 +2162,7 @@ namespace POA_CORBA virtual ::CORBA::ComponentIR::EventDef_ptr event ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_event_skel ( TAO_ServerRequest & server_request, @@ -2196,9 +2176,7 @@ namespace POA_CORBA virtual void event ( ::CORBA::ComponentIR::EventDef_ptr event ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_event_skel ( TAO_ServerRequest & server_request, @@ -2212,9 +2190,7 @@ namespace POA_CORBA virtual ::CORBA::Boolean is_a ( const char * event_id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void is_a_skel ( TAO_ServerRequest & server_request, @@ -2967,9 +2943,7 @@ namespace POA_CORBA virtual ::CORBA::ComponentIR::ComponentDef_ptr base_component ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_base_component_skel ( TAO_ServerRequest & server_request, @@ -2983,9 +2957,7 @@ namespace POA_CORBA virtual void base_component ( ::CORBA::ComponentIR::ComponentDef_ptr base_component ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_base_component_skel ( TAO_ServerRequest & server_request, @@ -2998,9 +2970,7 @@ namespace POA_CORBA virtual ::CORBA::InterfaceDefSeq * supported_interfaces ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_supported_interfaces_skel ( TAO_ServerRequest & server_request, @@ -3014,9 +2984,7 @@ namespace POA_CORBA virtual void supported_interfaces ( const ::CORBA::InterfaceDefSeq & supported_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_supported_interfaces_skel ( TAO_ServerRequest & server_request, @@ -3033,9 +3001,7 @@ namespace POA_CORBA const char * version, ::CORBA::InterfaceDef_ptr interface_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_provides_skel ( TAO_ServerRequest & server_request, @@ -3053,9 +3019,7 @@ namespace POA_CORBA ::CORBA::InterfaceDef_ptr interface_type, ::CORBA::Boolean is_multiple ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_uses_skel ( TAO_ServerRequest & server_request, @@ -3072,9 +3036,7 @@ namespace POA_CORBA const char * version, ::CORBA::ComponentIR::EventDef_ptr event ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_emits_skel ( TAO_ServerRequest & server_request, @@ -3091,9 +3053,7 @@ namespace POA_CORBA const char * version, ::CORBA::ComponentIR::EventDef_ptr event ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_publishes_skel ( TAO_ServerRequest & server_request, @@ -3110,9 +3070,7 @@ namespace POA_CORBA const char * version, ::CORBA::ComponentIR::EventDef_ptr event ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_consumes_skel ( TAO_ServerRequest & server_request, @@ -4041,9 +3999,7 @@ namespace POA_CORBA virtual ::CORBA::ComponentIR::HomeDef_ptr base_home ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_base_home_skel ( TAO_ServerRequest & server_request, @@ -4057,9 +4013,7 @@ namespace POA_CORBA virtual void base_home ( ::CORBA::ComponentIR::HomeDef_ptr base_home ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_base_home_skel ( TAO_ServerRequest & server_request, @@ -4072,9 +4026,7 @@ namespace POA_CORBA virtual ::CORBA::InterfaceDefSeq * supported_interfaces ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_supported_interfaces_skel ( TAO_ServerRequest & server_request, @@ -4088,9 +4040,7 @@ namespace POA_CORBA virtual void supported_interfaces ( const ::CORBA::InterfaceDefSeq & supported_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_supported_interfaces_skel ( TAO_ServerRequest & server_request, @@ -4103,9 +4053,7 @@ namespace POA_CORBA virtual ::CORBA::ComponentIR::ComponentDef_ptr managed_component ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_managed_component_skel ( TAO_ServerRequest & server_request, @@ -4119,9 +4067,7 @@ namespace POA_CORBA virtual void managed_component ( ::CORBA::ComponentIR::ComponentDef_ptr managed_component ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_managed_component_skel ( TAO_ServerRequest & server_request, @@ -4134,9 +4080,7 @@ namespace POA_CORBA virtual ::CORBA::ValueDef_ptr primary_key ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_primary_key_skel ( TAO_ServerRequest & server_request, @@ -4150,9 +4094,7 @@ namespace POA_CORBA virtual void primary_key ( ::CORBA::ValueDef_ptr primary_key ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_primary_key_skel ( TAO_ServerRequest & server_request, @@ -4170,9 +4112,7 @@ namespace POA_CORBA const ::CORBA::ParDescriptionSeq & params, const ::CORBA::ExceptionDefSeq & exceptions ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_factory_skel ( TAO_ServerRequest & server_request, @@ -4190,9 +4130,7 @@ namespace POA_CORBA const ::CORBA::ParDescriptionSeq & params, const ::CORBA::ExceptionDefSeq & exceptions ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_finder_skel ( TAO_ServerRequest & server_request, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h index cabe0a4db2b..9f894f6c912 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h @@ -92,29 +92,20 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained_ptr lookup ( const char * search_name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -122,10 +113,7 @@ namespace POA_CORBA ::CORBA::ContainedSeq * contents ( ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -135,10 +123,7 @@ namespace POA_CORBA ::CORBA::Long levels_to_search, ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -147,10 +132,7 @@ namespace POA_CORBA ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -159,10 +141,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -173,10 +152,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, const ::CORBA::Any & value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -186,10 +162,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -200,10 +173,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -213,10 +183,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::EnumMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -226,10 +193,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -239,10 +203,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -258,10 +219,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -271,10 +229,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -284,10 +239,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -296,10 +248,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -309,10 +258,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -322,10 +268,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -341,103 +284,70 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -446,171 +356,117 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceDefSeq * supported_interfaces ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void supported_interfaces ( const ::CORBA::InterfaceDefSeq & supported_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InitializerSeq * initializers ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void initializers ( const ::CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ValueDef_ptr base_value ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void base_value ( ::CORBA::ValueDef_ptr base_value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ValueDefSeq * abstract_base_values ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void abstract_base_values ( const ::CORBA::ValueDefSeq & abstract_base_values - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_abstract ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void is_abstract ( ::CORBA::Boolean is_abstract - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_custom ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void is_custom ( ::CORBA::Boolean is_custom - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_truncatable ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void is_truncatable ( ::CORBA::Boolean is_truncatable - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_a ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ValueDef::FullValueDescription * describe_value ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -621,10 +477,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, ::CORBA::Visibility access - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -635,10 +488,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, ::CORBA::AttributeMode mode - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -652,38 +502,26 @@ namespace POA_CORBA const ::CORBA::ParDescriptionSeq & params, const ::CORBA::ExceptionDefSeq & exceptions, const ::CORBA::ContextIdSeq & contexts - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ExtInitializerSeq * ext_initializers ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void ext_initializers ( const ::CORBA::ExtInitializerSeq & ext_initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ExtValueDef::ExtFullValueDescription * describe_ext_value ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -696,10 +534,7 @@ namespace POA_CORBA ::CORBA::AttributeMode mode, const ::CORBA::ExceptionDefSeq & get_exceptions, const ::CORBA::ExceptionDefSeq & set_exceptions - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -754,29 +589,20 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained_ptr lookup ( const char * search_name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -784,10 +610,7 @@ namespace POA_CORBA ::CORBA::ContainedSeq * contents ( ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -797,10 +620,7 @@ namespace POA_CORBA ::CORBA::Long levels_to_search, ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -809,10 +629,7 @@ namespace POA_CORBA ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -821,10 +638,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -835,10 +649,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, const ::CORBA::Any & value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -848,10 +659,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -862,10 +670,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -875,10 +680,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::EnumMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -888,10 +690,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -901,10 +700,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -920,10 +716,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -933,10 +726,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -946,10 +736,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -958,10 +745,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -971,10 +755,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -984,10 +765,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1003,10 +781,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1017,10 +792,7 @@ namespace POA_CORBA const char * version, ::CORBA::ComponentIR::ComponentDef_ptr base_component, const ::CORBA::InterfaceDefSeq & supports_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1033,10 +805,7 @@ namespace POA_CORBA ::CORBA::ComponentIR::ComponentDef_ptr managed_component, const ::CORBA::InterfaceDefSeq & supports_interfaces, ::CORBA::ValueDef_ptr primary_key - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1052,10 +821,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -1110,29 +876,20 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained_ptr lookup ( const char * search_name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1140,10 +897,7 @@ namespace POA_CORBA ::CORBA::ContainedSeq * contents ( ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1153,10 +907,7 @@ namespace POA_CORBA ::CORBA::Long levels_to_search, ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1165,10 +916,7 @@ namespace POA_CORBA ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1177,10 +925,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1191,10 +936,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, const ::CORBA::Any & value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1204,10 +946,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1218,10 +957,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1231,10 +967,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::EnumMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1244,10 +977,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1257,10 +987,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1276,10 +1003,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1289,10 +1013,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1302,10 +1023,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1314,10 +1032,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1327,10 +1042,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1340,10 +1052,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1359,103 +1068,70 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1464,10 +1140,7 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1478,10 +1151,7 @@ namespace POA_CORBA const char * version, ::CORBA::ComponentIR::ComponentDef_ptr base_component, const ::CORBA::InterfaceDefSeq & supports_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1494,10 +1164,7 @@ namespace POA_CORBA ::CORBA::ComponentIR::ComponentDef_ptr managed_component, const ::CORBA::InterfaceDefSeq & supports_interfaces, ::CORBA::ValueDef_ptr primary_key - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1513,10 +1180,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -1571,29 +1235,20 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained_ptr lookup ( const char * search_name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1601,10 +1256,7 @@ namespace POA_CORBA ::CORBA::ContainedSeq * contents ( ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1614,10 +1266,7 @@ namespace POA_CORBA ::CORBA::Long levels_to_search, ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1626,10 +1275,7 @@ namespace POA_CORBA ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1638,10 +1284,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1652,10 +1295,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, const ::CORBA::Any & value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1665,10 +1305,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1679,10 +1316,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1692,10 +1326,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::EnumMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1705,10 +1336,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1718,10 +1346,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1737,10 +1362,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1750,10 +1372,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1763,10 +1382,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1775,10 +1391,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1788,10 +1401,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1801,10 +1411,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1820,60 +1427,42 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained_ptr lookup_id ( const char * search_id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr get_canonical_typecode ( ::CORBA::TypeCode_ptr tc - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::PrimitiveDef_ptr get_primitive ( ::CORBA::PrimitiveKind kind - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::StringDef_ptr create_string ( ::CORBA::ULong bound - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::WstringDef_ptr create_wstring ( ::CORBA::ULong bound - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1881,10 +1470,7 @@ namespace POA_CORBA ::CORBA::SequenceDef_ptr create_sequence ( ::CORBA::ULong bound, ::CORBA::IDLType_ptr element_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1892,10 +1478,7 @@ namespace POA_CORBA ::CORBA::ArrayDef_ptr create_array ( ::CORBA::ULong length, ::CORBA::IDLType_ptr element_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1903,10 +1486,7 @@ namespace POA_CORBA ::CORBA::FixedDef_ptr create_fixed ( ::CORBA::UShort digits, ::CORBA::Short scale - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1917,10 +1497,7 @@ namespace POA_CORBA const char * version, ::CORBA::ComponentIR::ComponentDef_ptr base_component, const ::CORBA::InterfaceDefSeq & supports_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1933,10 +1510,7 @@ namespace POA_CORBA ::CORBA::ComponentIR::ComponentDef_ptr managed_component, const ::CORBA::InterfaceDefSeq & supports_interfaces, ::CORBA::ValueDef_ptr primary_key - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1952,10 +1526,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -2010,112 +1581,76 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -2124,29 +1659,20 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceDef_ptr interface_type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void interface_type ( ::CORBA::InterfaceDef_ptr interface_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -2201,112 +1727,76 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -2315,48 +1805,33 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceDef_ptr interface_type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void interface_type ( ::CORBA::InterfaceDef_ptr interface_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_multiple ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void is_multiple ( ::CORBA::Boolean is_multiple - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -2411,112 +1886,76 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -2525,39 +1964,27 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ComponentIR::EventDef_ptr event ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void event ( ::CORBA::ComponentIR::EventDef_ptr event - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_a ( const char * event_id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -2612,112 +2039,76 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -2726,39 +2117,27 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ComponentIR::EventDef_ptr event ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void event ( ::CORBA::ComponentIR::EventDef_ptr event - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_a ( const char * event_id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -2813,112 +2192,76 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -2927,39 +2270,27 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ComponentIR::EventDef_ptr event ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void event ( ::CORBA::ComponentIR::EventDef_ptr event - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_a ( const char * event_id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -3014,112 +2345,76 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3128,39 +2423,27 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ComponentIR::EventDef_ptr event ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void event ( ::CORBA::ComponentIR::EventDef_ptr event - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_a ( const char * event_id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -3215,29 +2498,20 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained_ptr lookup ( const char * search_name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3245,10 +2519,7 @@ namespace POA_CORBA ::CORBA::ContainedSeq * contents ( ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3258,10 +2529,7 @@ namespace POA_CORBA ::CORBA::Long levels_to_search, ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3270,10 +2538,7 @@ namespace POA_CORBA ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3282,10 +2547,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3296,10 +2558,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, const ::CORBA::Any & value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3309,10 +2568,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3323,10 +2579,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3336,10 +2589,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::EnumMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3349,10 +2599,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3362,10 +2609,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3381,10 +2625,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3394,10 +2635,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3407,10 +2645,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3419,10 +2654,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3432,10 +2664,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3445,10 +2674,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3464,103 +2690,70 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3569,57 +2762,39 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceDefSeq * base_interfaces ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void base_interfaces ( const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_a ( const char * interface_id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3630,10 +2805,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, ::CORBA::AttributeMode mode - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3647,19 +2819,13 @@ namespace POA_CORBA const ::CORBA::ParDescriptionSeq & params, const ::CORBA::ExceptionDefSeq & exceptions, const ::CORBA::ContextIdSeq & contexts - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3672,48 +2838,33 @@ namespace POA_CORBA ::CORBA::AttributeMode mode, const ::CORBA::ExceptionDefSeq & get_exceptions, const ::CORBA::ExceptionDefSeq & set_exceptions - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ComponentIR::ComponentDef_ptr base_component ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void base_component ( ::CORBA::ComponentIR::ComponentDef_ptr base_component - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceDefSeq * supported_interfaces ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void supported_interfaces ( const ::CORBA::InterfaceDefSeq & supported_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3723,10 +2874,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::InterfaceDef_ptr interface_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3737,10 +2885,7 @@ namespace POA_CORBA const char * version, ::CORBA::InterfaceDef_ptr interface_type, ::CORBA::Boolean is_multiple - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3750,10 +2895,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::ComponentIR::EventDef_ptr event - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3763,10 +2905,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::ComponentIR::EventDef_ptr event - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3776,10 +2915,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::ComponentIR::EventDef_ptr event - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -3834,112 +2970,76 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -3948,114 +3048,78 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr result ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::IDLType_ptr result_def ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void result_def ( ::CORBA::IDLType_ptr result_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ParDescriptionSeq * params ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void params ( const ::CORBA::ParDescriptionSeq & params - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::OperationMode mode ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void mode ( ::CORBA::OperationMode mode - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ContextIdSeq * contexts ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void contexts ( const ::CORBA::ContextIdSeq & contexts - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ExceptionDefSeq * exceptions ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void exceptions ( const ::CORBA::ExceptionDefSeq & exceptions - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -4110,112 +3174,76 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4224,114 +3252,78 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr result ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::IDLType_ptr result_def ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void result_def ( ::CORBA::IDLType_ptr result_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ParDescriptionSeq * params ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void params ( const ::CORBA::ParDescriptionSeq & params - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::OperationMode mode ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void mode ( ::CORBA::OperationMode mode - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ContextIdSeq * contexts ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void contexts ( const ::CORBA::ContextIdSeq & contexts - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ExceptionDefSeq * exceptions ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void exceptions ( const ::CORBA::ExceptionDefSeq & exceptions - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -4386,29 +3378,20 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained_ptr lookup ( const char * search_name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4416,10 +3399,7 @@ namespace POA_CORBA ::CORBA::ContainedSeq * contents ( ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4429,10 +3409,7 @@ namespace POA_CORBA ::CORBA::Long levels_to_search, ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4441,10 +3418,7 @@ namespace POA_CORBA ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4453,10 +3427,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4467,10 +3438,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, const ::CORBA::Any & value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4480,10 +3448,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4494,10 +3459,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4507,10 +3469,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::EnumMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4520,10 +3479,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4533,10 +3489,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4552,10 +3505,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4565,10 +3515,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4578,10 +3525,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4590,10 +3534,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4603,10 +3544,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4616,10 +3554,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4635,103 +3570,70 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4740,57 +3642,39 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceDefSeq * base_interfaces ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void base_interfaces ( const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_a ( const char * interface_id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4801,10 +3685,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, ::CORBA::AttributeMode mode - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4818,19 +3699,13 @@ namespace POA_CORBA const ::CORBA::ParDescriptionSeq & params, const ::CORBA::ExceptionDefSeq & exceptions, const ::CORBA::ContextIdSeq & contexts - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4843,86 +3718,59 @@ namespace POA_CORBA ::CORBA::AttributeMode mode, const ::CORBA::ExceptionDefSeq & get_exceptions, const ::CORBA::ExceptionDefSeq & set_exceptions - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ComponentIR::HomeDef_ptr base_home ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void base_home ( ::CORBA::ComponentIR::HomeDef_ptr base_home - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceDefSeq * supported_interfaces ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void supported_interfaces ( const ::CORBA::InterfaceDefSeq & supported_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ComponentIR::ComponentDef_ptr managed_component ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void managed_component ( ::CORBA::ComponentIR::ComponentDef_ptr managed_component - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ValueDef_ptr primary_key ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void primary_key ( ::CORBA::ValueDef_ptr primary_key - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4933,10 +3781,7 @@ namespace POA_CORBA const char * version, const ::CORBA::ParDescriptionSeq & params, const ::CORBA::ExceptionDefSeq & exceptions - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -4947,10 +3792,7 @@ namespace POA_CORBA const char * version, const ::CORBA::ParDescriptionSeq & params, const ::CORBA::ExceptionDefSeq & exceptions - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl index 677f509e0a4..263aacc5748 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl @@ -129,9 +129,6 @@ POA_CORBA::ComponentIR::EventDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ComponentIR::EventDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -143,9 +140,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ComponentIR::EventDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -158,9 +152,6 @@ template <class T> ACE_INLINE ::CORBA::Contained_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::lookup ( const char * search_name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup ( search_name @@ -175,9 +166,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->contents ( limit_type, @@ -195,9 +183,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup_name ( search_name, @@ -216,9 +201,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_contents ( limit_type, @@ -236,9 +218,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_module ( id, @@ -258,9 +237,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, const ::CORBA::Any & value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_constant ( id, @@ -281,9 +257,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_struct ( id, @@ -304,9 +277,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_union ( id, @@ -327,9 +297,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::EnumMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_enum ( id, @@ -349,9 +316,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_alias ( id, @@ -371,9 +335,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_interface ( id, @@ -399,9 +360,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value ( id, @@ -427,9 +385,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value_box ( id, @@ -449,9 +404,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_exception ( id, @@ -470,9 +422,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_native ( id, @@ -491,9 +440,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_abstract_interface ( id, @@ -513,9 +459,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_local_interface ( id, @@ -541,9 +484,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_value ( id, @@ -565,9 +505,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::EventDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -580,9 +517,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::EventDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -595,9 +529,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::EventDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -610,9 +541,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::EventDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -625,9 +553,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::EventDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -640,9 +565,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::EventDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -655,9 +577,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -669,9 +588,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::EventDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -683,9 +599,6 @@ char * POA_CORBA::ComponentIR::EventDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -697,9 +610,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::ComponentIR::EventDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -714,9 +624,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -731,9 +638,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -745,9 +649,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::supported_interfaces ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->supported_interfaces ( ); @@ -760,9 +661,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::EventDef_tie<T>::supported_interfaces ( const ::CORBA::InterfaceDefSeq & supported_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->supported_interfaces ( supported_interfaces @@ -775,9 +673,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::supported_interfaces ( template <class T> ACE_INLINE ::CORBA::InitializerSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::initializers ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->initializers ( ); @@ -790,9 +685,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::EventDef_tie<T>::initializers ( const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->initializers ( initializers @@ -805,9 +697,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::initializers ( template <class T> ACE_INLINE ::CORBA::ValueDef_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::base_value ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->base_value ( ); @@ -820,9 +709,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::EventDef_tie<T>::base_value ( ::CORBA::ValueDef_ptr base_value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->base_value ( base_value @@ -835,9 +721,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::base_value ( template <class T> ACE_INLINE ::CORBA::ValueDefSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::abstract_base_values ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->abstract_base_values ( ); @@ -850,9 +733,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::EventDef_tie<T>::abstract_base_values ( const ::CORBA::ValueDefSeq & abstract_base_values ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->abstract_base_values ( abstract_base_values @@ -865,9 +745,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::abstract_base_values ( template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::ComponentIR::EventDef_tie<T>::is_abstract ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_abstract ( ); @@ -880,9 +757,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::EventDef_tie<T>::is_abstract ( ::CORBA::Boolean is_abstract ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->is_abstract ( is_abstract @@ -895,9 +769,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::is_abstract ( template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::ComponentIR::EventDef_tie<T>::is_custom ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_custom ( ); @@ -910,9 +781,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::EventDef_tie<T>::is_custom ( ::CORBA::Boolean is_custom ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->is_custom ( is_custom @@ -925,9 +793,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::is_custom ( template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::ComponentIR::EventDef_tie<T>::is_truncatable ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_truncatable ( ); @@ -940,9 +805,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::EventDef_tie<T>::is_truncatable ( ::CORBA::Boolean is_truncatable ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->is_truncatable ( is_truncatable @@ -956,9 +818,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::ComponentIR::EventDef_tie<T>::is_a ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_a ( id @@ -971,9 +830,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::ValueDef::FullValueDescription * POA_CORBA::ComponentIR::EventDef_tie<T>::describe_value ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_value ( ); @@ -990,9 +846,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, ::CORBA::Visibility access ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value_member ( id, @@ -1014,9 +867,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, ::CORBA::AttributeMode mode ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_attribute ( id, @@ -1041,9 +891,6 @@ template <class T> ACE_INLINE const ::CORBA::ExceptionDefSeq & exceptions, const ::CORBA::ContextIdSeq & contexts ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_operation ( id, @@ -1063,9 +910,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::ExtInitializerSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::ext_initializers ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->ext_initializers ( ); @@ -1078,9 +922,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::EventDef_tie<T>::ext_initializers ( const ::CORBA::ExtInitializerSeq & ext_initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->ext_initializers ( ext_initializers @@ -1093,9 +934,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::ext_initializers ( template <class T> ACE_INLINE ::CORBA::ExtValueDef::ExtFullValueDescription * POA_CORBA::ComponentIR::EventDef_tie<T>::describe_ext_value ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_ext_value ( ); @@ -1114,9 +952,6 @@ template <class T> ACE_INLINE const ::CORBA::ExceptionDefSeq & get_exceptions, const ::CORBA::ExceptionDefSeq & set_exceptions ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_attribute ( id, @@ -1228,9 +1063,6 @@ POA_CORBA::ComponentIR::Container_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ComponentIR::Container_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -1242,9 +1074,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ComponentIR::Container_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -1257,9 +1086,6 @@ template <class T> ACE_INLINE ::CORBA::Contained_ptr POA_CORBA::ComponentIR::Container_tie<T>::lookup ( const char * search_name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup ( search_name @@ -1274,9 +1100,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->contents ( limit_type, @@ -1294,9 +1117,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup_name ( search_name, @@ -1315,9 +1135,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_contents ( limit_type, @@ -1335,9 +1152,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_module ( id, @@ -1357,9 +1171,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, const ::CORBA::Any & value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_constant ( id, @@ -1380,9 +1191,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_struct ( id, @@ -1403,9 +1211,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_union ( id, @@ -1426,9 +1231,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::EnumMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_enum ( id, @@ -1448,9 +1250,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_alias ( id, @@ -1470,9 +1269,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_interface ( id, @@ -1498,9 +1294,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value ( id, @@ -1526,9 +1319,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value_box ( id, @@ -1548,9 +1338,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_exception ( id, @@ -1569,9 +1356,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_native ( id, @@ -1590,9 +1374,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_abstract_interface ( id, @@ -1612,9 +1393,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_local_interface ( id, @@ -1640,9 +1418,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_value ( id, @@ -1669,9 +1444,6 @@ template <class T> ACE_INLINE ::CORBA::ComponentIR::ComponentDef_ptr base_component, const ::CORBA::InterfaceDefSeq & supports_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_component ( id, @@ -1695,9 +1467,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supports_interfaces, ::CORBA::ValueDef_ptr primary_key ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_home ( id, @@ -1726,9 +1495,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_event ( id, @@ -1843,9 +1609,6 @@ POA_CORBA::ComponentIR::ModuleDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ComponentIR::ModuleDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -1857,9 +1620,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -1872,9 +1632,6 @@ template <class T> ACE_INLINE ::CORBA::Contained_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::lookup ( const char * search_name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup ( search_name @@ -1889,9 +1646,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->contents ( limit_type, @@ -1909,9 +1663,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup_name ( search_name, @@ -1930,9 +1681,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_contents ( limit_type, @@ -1950,9 +1698,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_module ( id, @@ -1972,9 +1717,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, const ::CORBA::Any & value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_constant ( id, @@ -1995,9 +1737,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_struct ( id, @@ -2018,9 +1757,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_union ( id, @@ -2041,9 +1777,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::EnumMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_enum ( id, @@ -2063,9 +1796,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_alias ( id, @@ -2085,9 +1815,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_interface ( id, @@ -2113,9 +1840,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value ( id, @@ -2141,9 +1865,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value_box ( id, @@ -2163,9 +1884,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_exception ( id, @@ -2184,9 +1902,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_native ( id, @@ -2205,9 +1920,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_abstract_interface ( id, @@ -2227,9 +1939,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_local_interface ( id, @@ -2255,9 +1964,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_value ( id, @@ -2279,9 +1985,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -2294,9 +1997,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -2309,9 +2009,6 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -2324,9 +2021,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -2339,9 +2033,6 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -2354,9 +2045,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::ModuleDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -2369,9 +2057,6 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -2383,9 +2068,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -2397,9 +2079,6 @@ char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -2411,9 +2090,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::ComponentIR::ModuleDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -2428,9 +2104,6 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -2450,9 +2123,6 @@ template <class T> ACE_INLINE ::CORBA::ComponentIR::ComponentDef_ptr base_component, const ::CORBA::InterfaceDefSeq & supports_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_component ( id, @@ -2476,9 +2146,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supports_interfaces, ::CORBA::ValueDef_ptr primary_key ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_home ( id, @@ -2507,9 +2174,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_event ( id, @@ -2624,9 +2288,6 @@ POA_CORBA::ComponentIR::Repository_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ComponentIR::Repository_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -2638,9 +2299,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ComponentIR::Repository_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -2653,9 +2311,6 @@ template <class T> ACE_INLINE ::CORBA::Contained_ptr POA_CORBA::ComponentIR::Repository_tie<T>::lookup ( const char * search_name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup ( search_name @@ -2670,9 +2325,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->contents ( limit_type, @@ -2690,9 +2342,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup_name ( search_name, @@ -2711,9 +2360,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_contents ( limit_type, @@ -2731,9 +2377,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_module ( id, @@ -2753,9 +2396,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, const ::CORBA::Any & value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_constant ( id, @@ -2776,9 +2416,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_struct ( id, @@ -2799,9 +2436,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_union ( id, @@ -2822,9 +2456,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::EnumMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_enum ( id, @@ -2844,9 +2475,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_alias ( id, @@ -2866,9 +2494,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_interface ( id, @@ -2894,9 +2519,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value ( id, @@ -2922,9 +2544,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value_box ( id, @@ -2944,9 +2563,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_exception ( id, @@ -2965,9 +2581,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_native ( id, @@ -2986,9 +2599,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_abstract_interface ( id, @@ -3008,9 +2618,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_local_interface ( id, @@ -3036,9 +2643,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_value ( id, @@ -3061,9 +2665,6 @@ template <class T> ACE_INLINE ::CORBA::Contained_ptr POA_CORBA::ComponentIR::Repository_tie<T>::lookup_id ( const char * search_id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup_id ( search_id @@ -3077,9 +2678,6 @@ template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::ComponentIR::Repository_tie<T>::get_canonical_typecode ( ::CORBA::TypeCode_ptr tc ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->get_canonical_typecode ( tc @@ -3093,9 +2691,6 @@ template <class T> ACE_INLINE ::CORBA::PrimitiveDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::get_primitive ( ::CORBA::PrimitiveKind kind ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->get_primitive ( kind @@ -3109,9 +2704,6 @@ template <class T> ACE_INLINE ::CORBA::StringDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_string ( ::CORBA::ULong bound ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_string ( bound @@ -3125,9 +2717,6 @@ template <class T> ACE_INLINE ::CORBA::WstringDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_wstring ( ::CORBA::ULong bound ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_wstring ( bound @@ -3142,9 +2731,6 @@ template <class T> ACE_INLINE ::CORBA::ULong bound, ::CORBA::IDLType_ptr element_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_sequence ( bound, @@ -3160,9 +2746,6 @@ template <class T> ACE_INLINE ::CORBA::ULong length, ::CORBA::IDLType_ptr element_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_array ( length, @@ -3178,9 +2761,6 @@ template <class T> ACE_INLINE ::CORBA::UShort digits, ::CORBA::Short scale ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_fixed ( digits, @@ -3199,9 +2779,6 @@ template <class T> ACE_INLINE ::CORBA::ComponentIR::ComponentDef_ptr base_component, const ::CORBA::InterfaceDefSeq & supports_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_component ( id, @@ -3225,9 +2802,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supports_interfaces, ::CORBA::ValueDef_ptr primary_key ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_home ( id, @@ -3256,9 +2830,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_event ( id, @@ -3373,9 +2944,6 @@ POA_CORBA::ComponentIR::ProvidesDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ComponentIR::ProvidesDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -3387,9 +2955,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -3401,9 +2966,6 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::destroy ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -3416,9 +2978,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -3431,9 +2990,6 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -3446,9 +3002,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -3461,9 +3014,6 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -3476,9 +3026,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -3491,9 +3038,6 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::ComponentIR::ProvidesDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -3505,9 +3049,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -3519,9 +3060,6 @@ char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::ComponentIR::ProvidesDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -3533,9 +3071,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -3550,9 +3085,6 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -3567,9 +3099,6 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::InterfaceDef_ptr POA_CORBA::ComponentIR::ProvidesDef_tie<T>::interface_type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->interface_type ( ); @@ -3582,9 +3111,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::interface_type ( ::CORBA::InterfaceDef_ptr interface_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->interface_type ( interface_type @@ -3690,9 +3216,6 @@ POA_CORBA::ComponentIR::UsesDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ComponentIR::UsesDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -3704,9 +3227,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ComponentIR::UsesDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -3718,9 +3238,6 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::destroy ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::UsesDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -3733,9 +3250,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::UsesDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -3748,9 +3262,6 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::UsesDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -3763,9 +3274,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::UsesDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -3778,9 +3286,6 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::UsesDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -3793,9 +3298,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::UsesDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -3808,9 +3310,6 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::ComponentIR::UsesDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -3822,9 +3321,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::UsesDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -3836,9 +3332,6 @@ char * POA_CORBA::ComponentIR::UsesDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::ComponentIR::UsesDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -3850,9 +3343,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::ComponentIR::UsesDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -3867,9 +3357,6 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -3884,9 +3371,6 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::InterfaceDef_ptr POA_CORBA::ComponentIR::UsesDef_tie<T>::interface_type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->interface_type ( ); @@ -3899,9 +3383,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::UsesDef_tie<T>::interface_type ( ::CORBA::InterfaceDef_ptr interface_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->interface_type ( interface_type @@ -3914,9 +3395,6 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::interface_type ( template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::ComponentIR::UsesDef_tie<T>::is_multiple ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_multiple ( ); @@ -3929,9 +3407,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::UsesDef_tie<T>::is_multiple ( ::CORBA::Boolean is_multiple ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->is_multiple ( is_multiple @@ -4037,9 +3512,6 @@ POA_CORBA::ComponentIR::EventPortDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ComponentIR::EventPortDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -4051,9 +3523,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ComponentIR::EventPortDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -4065,9 +3534,6 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::destroy ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -4080,9 +3546,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::EventPortDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -4095,9 +3558,6 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -4110,9 +3570,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::EventPortDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -4125,9 +3582,6 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -4140,9 +3594,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::EventPortDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -4155,9 +3606,6 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::ComponentIR::EventPortDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -4169,9 +3617,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -4183,9 +3628,6 @@ char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::ComponentIR::EventPortDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -4197,9 +3639,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::ComponentIR::EventPortDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -4214,9 +3653,6 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -4231,9 +3667,6 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::ComponentIR::EventDef_ptr POA_CORBA::ComponentIR::EventPortDef_tie<T>::event ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->event ( ); @@ -4246,9 +3679,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::EventPortDef_tie<T>::event ( ::CORBA::ComponentIR::EventDef_ptr event ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->event ( event @@ -4262,9 +3692,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::ComponentIR::EventPortDef_tie<T>::is_a ( const char * event_id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_a ( event_id @@ -4370,9 +3797,6 @@ POA_CORBA::ComponentIR::EmitsDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ComponentIR::EmitsDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -4384,9 +3808,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ComponentIR::EmitsDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -4398,9 +3819,6 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::destroy ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -4413,9 +3831,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::EmitsDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -4428,9 +3843,6 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -4443,9 +3855,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::EmitsDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -4458,9 +3867,6 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -4473,9 +3879,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::EmitsDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -4488,9 +3891,6 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::ComponentIR::EmitsDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -4502,9 +3902,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -4516,9 +3913,6 @@ char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::ComponentIR::EmitsDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -4530,9 +3924,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::ComponentIR::EmitsDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -4547,9 +3938,6 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -4564,9 +3952,6 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::ComponentIR::EventDef_ptr POA_CORBA::ComponentIR::EmitsDef_tie<T>::event ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->event ( ); @@ -4579,9 +3964,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::EmitsDef_tie<T>::event ( ::CORBA::ComponentIR::EventDef_ptr event ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->event ( event @@ -4595,9 +3977,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::ComponentIR::EmitsDef_tie<T>::is_a ( const char * event_id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_a ( event_id @@ -4703,9 +4082,6 @@ POA_CORBA::ComponentIR::PublishesDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ComponentIR::PublishesDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -4717,9 +4093,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ComponentIR::PublishesDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -4731,9 +4104,6 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::destroy ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -4746,9 +4116,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::PublishesDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -4761,9 +4128,6 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -4776,9 +4140,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::PublishesDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -4791,9 +4152,6 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -4806,9 +4164,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::PublishesDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -4821,9 +4176,6 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::ComponentIR::PublishesDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -4835,9 +4187,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -4849,9 +4198,6 @@ char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::ComponentIR::PublishesDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -4863,9 +4209,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::ComponentIR::PublishesDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -4880,9 +4223,6 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -4897,9 +4237,6 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::ComponentIR::EventDef_ptr POA_CORBA::ComponentIR::PublishesDef_tie<T>::event ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->event ( ); @@ -4912,9 +4249,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::PublishesDef_tie<T>::event ( ::CORBA::ComponentIR::EventDef_ptr event ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->event ( event @@ -4928,9 +4262,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::ComponentIR::PublishesDef_tie<T>::is_a ( const char * event_id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_a ( event_id @@ -5036,9 +4367,6 @@ POA_CORBA::ComponentIR::ConsumesDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ComponentIR::ConsumesDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -5050,9 +4378,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -5064,9 +4389,6 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::destroy ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -5079,9 +4401,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -5094,9 +4413,6 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -5109,9 +4425,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -5124,9 +4437,6 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -5139,9 +4449,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -5154,9 +4461,6 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::ComponentIR::ConsumesDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -5168,9 +4472,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -5182,9 +4483,6 @@ char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::ComponentIR::ConsumesDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -5196,9 +4494,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -5213,9 +4508,6 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -5230,9 +4522,6 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::ComponentIR::EventDef_ptr POA_CORBA::ComponentIR::ConsumesDef_tie<T>::event ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->event ( ); @@ -5245,9 +4534,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::event ( ::CORBA::ComponentIR::EventDef_ptr event ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->event ( event @@ -5261,9 +4547,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::ComponentIR::ConsumesDef_tie<T>::is_a ( const char * event_id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_a ( event_id @@ -5369,9 +4652,6 @@ POA_CORBA::ComponentIR::ComponentDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ComponentIR::ComponentDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -5383,9 +4663,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -5398,9 +4675,6 @@ template <class T> ACE_INLINE ::CORBA::Contained_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::lookup ( const char * search_name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup ( search_name @@ -5415,9 +4689,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->contents ( limit_type, @@ -5435,9 +4706,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup_name ( search_name, @@ -5456,9 +4724,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_contents ( limit_type, @@ -5476,9 +4741,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_module ( id, @@ -5498,9 +4760,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, const ::CORBA::Any & value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_constant ( id, @@ -5521,9 +4780,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_struct ( id, @@ -5544,9 +4800,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_union ( id, @@ -5567,9 +4820,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::EnumMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_enum ( id, @@ -5589,9 +4839,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_alias ( id, @@ -5611,9 +4858,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_interface ( id, @@ -5639,9 +4883,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value ( id, @@ -5667,9 +4908,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value_box ( id, @@ -5689,9 +4927,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_exception ( id, @@ -5710,9 +4945,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_native ( id, @@ -5731,9 +4963,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_abstract_interface ( id, @@ -5753,9 +4982,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_local_interface ( id, @@ -5781,9 +5007,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_value ( id, @@ -5805,9 +5028,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -5820,9 +5040,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -5835,9 +5052,6 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -5850,9 +5064,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -5865,9 +5076,6 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -5880,9 +5088,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -5895,9 +5100,6 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -5909,9 +5111,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -5923,9 +5122,6 @@ char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -5937,9 +5133,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::ComponentIR::ComponentDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -5954,9 +5147,6 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -5971,9 +5161,6 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -5985,9 +5172,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_interfaces ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->base_interfaces ( ); @@ -6000,9 +5184,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_interfaces ( const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->base_interfaces ( base_interfaces @@ -6016,9 +5197,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::ComponentIR::ComponentDef_tie<T>::is_a ( const char * interface_id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_a ( interface_id @@ -6031,9 +5209,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ComponentIR::ComponentDef_tie<T>::describe_interface ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_interface ( ); @@ -6050,9 +5225,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, ::CORBA::AttributeMode mode ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_attribute ( id, @@ -6077,9 +5249,6 @@ template <class T> ACE_INLINE const ::CORBA::ExceptionDefSeq & exceptions, const ::CORBA::ContextIdSeq & contexts ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_operation ( id, @@ -6099,9 +5268,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ComponentIR::ComponentDef_tie<T>::describe_ext_interface ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_ext_interface ( ); @@ -6120,9 +5286,6 @@ template <class T> ACE_INLINE const ::CORBA::ExceptionDefSeq & get_exceptions, const ::CORBA::ExceptionDefSeq & set_exceptions ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_attribute ( id, @@ -6141,9 +5304,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::ComponentIR::ComponentDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_component ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->base_component ( ); @@ -6156,9 +5316,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_component ( ::CORBA::ComponentIR::ComponentDef_ptr base_component ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->base_component ( base_component @@ -6171,9 +5328,6 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_component ( template <class T> ACE_INLINE ::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::ComponentDef_tie<T>::supported_interfaces ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->supported_interfaces ( ); @@ -6186,9 +5340,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::ComponentDef_tie<T>::supported_interfaces ( const ::CORBA::InterfaceDefSeq & supported_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->supported_interfaces ( supported_interfaces @@ -6205,9 +5356,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::InterfaceDef_ptr interface_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_provides ( id, @@ -6228,9 +5376,6 @@ template <class T> ACE_INLINE ::CORBA::InterfaceDef_ptr interface_type, ::CORBA::Boolean is_multiple ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_uses ( id, @@ -6251,9 +5396,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::ComponentIR::EventDef_ptr event ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_emits ( id, @@ -6273,9 +5415,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::ComponentIR::EventDef_ptr event ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_publishes ( id, @@ -6295,9 +5434,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::ComponentIR::EventDef_ptr event ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_consumes ( id, @@ -6406,9 +5542,6 @@ POA_CORBA::ComponentIR::FactoryDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ComponentIR::FactoryDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -6420,9 +5553,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -6434,9 +5564,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::destroy ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -6449,9 +5576,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -6464,9 +5588,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -6479,9 +5600,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -6494,9 +5612,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -6509,9 +5624,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -6524,9 +5636,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::ComponentIR::FactoryDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -6538,9 +5647,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -6552,9 +5658,6 @@ char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::ComponentIR::FactoryDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -6566,9 +5669,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::ComponentIR::FactoryDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -6583,9 +5683,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -6600,9 +5697,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::ComponentIR::FactoryDef_tie<T>::result ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->result ( ); @@ -6614,9 +5708,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::IDLType_ptr POA_CORBA::ComponentIR::FactoryDef_tie<T>::result_def ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->result_def ( ); @@ -6629,9 +5720,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef_tie<T>::result_def ( ::CORBA::IDLType_ptr result_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->result_def ( result_def @@ -6644,9 +5732,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::result_def ( template <class T> ACE_INLINE ::CORBA::ParDescriptionSeq * POA_CORBA::ComponentIR::FactoryDef_tie<T>::params ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->params ( ); @@ -6659,9 +5744,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef_tie<T>::params ( const ::CORBA::ParDescriptionSeq & params ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->params ( params @@ -6674,9 +5756,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::params ( template <class T> ACE_INLINE ::CORBA::OperationMode POA_CORBA::ComponentIR::FactoryDef_tie<T>::mode ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->mode ( ); @@ -6689,9 +5768,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef_tie<T>::mode ( ::CORBA::OperationMode mode ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->mode ( mode @@ -6704,9 +5780,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::mode ( template <class T> ACE_INLINE ::CORBA::ContextIdSeq * POA_CORBA::ComponentIR::FactoryDef_tie<T>::contexts ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->contexts ( ); @@ -6719,9 +5792,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef_tie<T>::contexts ( const ::CORBA::ContextIdSeq & contexts ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->contexts ( contexts @@ -6734,9 +5804,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::contexts ( template <class T> ACE_INLINE ::CORBA::ExceptionDefSeq * POA_CORBA::ComponentIR::FactoryDef_tie<T>::exceptions ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->exceptions ( ); @@ -6749,9 +5816,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::FactoryDef_tie<T>::exceptions ( const ::CORBA::ExceptionDefSeq & exceptions ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->exceptions ( exceptions @@ -6857,9 +5921,6 @@ POA_CORBA::ComponentIR::FinderDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ComponentIR::FinderDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -6871,9 +5932,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ComponentIR::FinderDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -6885,9 +5943,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::destroy ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::FinderDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -6900,9 +5955,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::FinderDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -6915,9 +5967,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::FinderDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -6930,9 +5979,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::FinderDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -6945,9 +5991,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::FinderDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -6960,9 +6003,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::FinderDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -6975,9 +6015,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::ComponentIR::FinderDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -6989,9 +6026,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::FinderDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -7003,9 +6037,6 @@ char * POA_CORBA::ComponentIR::FinderDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::ComponentIR::FinderDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -7017,9 +6048,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::ComponentIR::FinderDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -7034,9 +6062,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -7051,9 +6076,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::ComponentIR::FinderDef_tie<T>::result ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->result ( ); @@ -7065,9 +6087,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::IDLType_ptr POA_CORBA::ComponentIR::FinderDef_tie<T>::result_def ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->result_def ( ); @@ -7080,9 +6099,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::FinderDef_tie<T>::result_def ( ::CORBA::IDLType_ptr result_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->result_def ( result_def @@ -7095,9 +6111,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::result_def ( template <class T> ACE_INLINE ::CORBA::ParDescriptionSeq * POA_CORBA::ComponentIR::FinderDef_tie<T>::params ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->params ( ); @@ -7110,9 +6123,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::FinderDef_tie<T>::params ( const ::CORBA::ParDescriptionSeq & params ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->params ( params @@ -7125,9 +6135,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::params ( template <class T> ACE_INLINE ::CORBA::OperationMode POA_CORBA::ComponentIR::FinderDef_tie<T>::mode ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->mode ( ); @@ -7140,9 +6147,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::FinderDef_tie<T>::mode ( ::CORBA::OperationMode mode ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->mode ( mode @@ -7155,9 +6159,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::mode ( template <class T> ACE_INLINE ::CORBA::ContextIdSeq * POA_CORBA::ComponentIR::FinderDef_tie<T>::contexts ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->contexts ( ); @@ -7170,9 +6171,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::FinderDef_tie<T>::contexts ( const ::CORBA::ContextIdSeq & contexts ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->contexts ( contexts @@ -7185,9 +6183,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::contexts ( template <class T> ACE_INLINE ::CORBA::ExceptionDefSeq * POA_CORBA::ComponentIR::FinderDef_tie<T>::exceptions ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->exceptions ( ); @@ -7200,9 +6195,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::FinderDef_tie<T>::exceptions ( const ::CORBA::ExceptionDefSeq & exceptions ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->exceptions ( exceptions @@ -7308,9 +6300,6 @@ POA_CORBA::ComponentIR::HomeDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ComponentIR::HomeDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -7322,9 +6311,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ComponentIR::HomeDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -7337,9 +6323,6 @@ template <class T> ACE_INLINE ::CORBA::Contained_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::lookup ( const char * search_name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup ( search_name @@ -7354,9 +6337,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->contents ( limit_type, @@ -7374,9 +6354,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup_name ( search_name, @@ -7395,9 +6372,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_contents ( limit_type, @@ -7415,9 +6389,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_module ( id, @@ -7437,9 +6408,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, const ::CORBA::Any & value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_constant ( id, @@ -7460,9 +6428,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_struct ( id, @@ -7483,9 +6448,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_union ( id, @@ -7506,9 +6468,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::EnumMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_enum ( id, @@ -7528,9 +6487,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_alias ( id, @@ -7550,9 +6506,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_interface ( id, @@ -7578,9 +6531,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value ( id, @@ -7606,9 +6556,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value_box ( id, @@ -7628,9 +6575,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_exception ( id, @@ -7649,9 +6593,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_native ( id, @@ -7670,9 +6611,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_abstract_interface ( id, @@ -7692,9 +6630,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_local_interface ( id, @@ -7720,9 +6655,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_value ( id, @@ -7744,9 +6676,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::HomeDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -7759,9 +6688,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::HomeDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -7774,9 +6700,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::HomeDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -7789,9 +6712,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::HomeDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -7804,9 +6724,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::HomeDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -7819,9 +6736,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::HomeDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -7834,9 +6748,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -7848,9 +6759,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ComponentIR::HomeDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -7862,9 +6770,6 @@ char * POA_CORBA::ComponentIR::HomeDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -7876,9 +6781,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::ComponentIR::HomeDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -7893,9 +6795,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -7910,9 +6809,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -7924,9 +6820,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::HomeDef_tie<T>::base_interfaces ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->base_interfaces ( ); @@ -7939,9 +6832,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::HomeDef_tie<T>::base_interfaces ( const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->base_interfaces ( base_interfaces @@ -7955,9 +6845,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::ComponentIR::HomeDef_tie<T>::is_a ( const char * interface_id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_a ( interface_id @@ -7970,9 +6857,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ComponentIR::HomeDef_tie<T>::describe_interface ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_interface ( ); @@ -7989,9 +6873,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, ::CORBA::AttributeMode mode ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_attribute ( id, @@ -8016,9 +6897,6 @@ template <class T> ACE_INLINE const ::CORBA::ExceptionDefSeq & exceptions, const ::CORBA::ContextIdSeq & contexts ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_operation ( id, @@ -8038,9 +6916,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ComponentIR::HomeDef_tie<T>::describe_ext_interface ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_ext_interface ( ); @@ -8059,9 +6934,6 @@ template <class T> ACE_INLINE const ::CORBA::ExceptionDefSeq & get_exceptions, const ::CORBA::ExceptionDefSeq & set_exceptions ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_attribute ( id, @@ -8080,9 +6952,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::ComponentIR::HomeDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::base_home ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->base_home ( ); @@ -8095,9 +6964,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::HomeDef_tie<T>::base_home ( ::CORBA::ComponentIR::HomeDef_ptr base_home ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->base_home ( base_home @@ -8110,9 +6976,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::base_home ( template <class T> ACE_INLINE ::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::HomeDef_tie<T>::supported_interfaces ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->supported_interfaces ( ); @@ -8125,9 +6988,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::HomeDef_tie<T>::supported_interfaces ( const ::CORBA::InterfaceDefSeq & supported_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->supported_interfaces ( supported_interfaces @@ -8140,9 +7000,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::supported_interfaces ( template <class T> ACE_INLINE ::CORBA::ComponentIR::ComponentDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::managed_component ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->managed_component ( ); @@ -8155,9 +7012,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::HomeDef_tie<T>::managed_component ( ::CORBA::ComponentIR::ComponentDef_ptr managed_component ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->managed_component ( managed_component @@ -8170,9 +7024,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::managed_component ( template <class T> ACE_INLINE ::CORBA::ValueDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::primary_key ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->primary_key ( ); @@ -8185,9 +7036,6 @@ template <class T> ACE_INLINE void POA_CORBA::ComponentIR::HomeDef_tie<T>::primary_key ( ::CORBA::ValueDef_ptr primary_key ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->primary_key ( primary_key @@ -8205,9 +7053,6 @@ template <class T> ACE_INLINE const ::CORBA::ParDescriptionSeq & params, const ::CORBA::ExceptionDefSeq & exceptions ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_factory ( id, @@ -8229,9 +7074,6 @@ template <class T> ACE_INLINE const ::CORBA::ParDescriptionSeq & params, const ::CORBA::ExceptionDefSeq & exceptions ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_finder ( id, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h index 0178b28a129..915efbc7b60 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h @@ -128,9 +128,7 @@ namespace POA_CORBA virtual ::CORBA::UShort digits ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_digits_skel ( TAO_ServerRequest & server_request, @@ -144,9 +142,7 @@ namespace POA_CORBA virtual void digits ( ::CORBA::UShort digits ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_digits_skel ( TAO_ServerRequest & server_request, @@ -159,9 +155,7 @@ namespace POA_CORBA virtual ::CORBA::Short scale ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_scale_skel ( TAO_ServerRequest & server_request, @@ -175,9 +169,7 @@ namespace POA_CORBA virtual void scale ( ::CORBA::Short scale ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_scale_skel ( TAO_ServerRequest & server_request, @@ -281,9 +273,7 @@ namespace POA_CORBA virtual ::CORBA::TypeCode_ptr type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_type_skel ( TAO_ServerRequest & server_request, @@ -296,9 +286,7 @@ namespace POA_CORBA virtual ::CORBA::IDLType_ptr type_def ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_type_def_skel ( TAO_ServerRequest & server_request, @@ -312,9 +300,7 @@ namespace POA_CORBA virtual void type_def ( ::CORBA::IDLType_ptr type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_type_def_skel ( TAO_ServerRequest & server_request, @@ -327,9 +313,7 @@ namespace POA_CORBA virtual ::CORBA::Visibility access ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_access_skel ( TAO_ServerRequest & server_request, @@ -343,9 +327,7 @@ namespace POA_CORBA virtual void access ( ::CORBA::Visibility access ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_access_skel ( TAO_ServerRequest & server_request, @@ -527,9 +509,7 @@ namespace POA_CORBA virtual ::CORBA::InterfaceDefSeq * supported_interfaces ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_supported_interfaces_skel ( TAO_ServerRequest & server_request, @@ -543,9 +523,7 @@ namespace POA_CORBA virtual void supported_interfaces ( const ::CORBA::InterfaceDefSeq & supported_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_supported_interfaces_skel ( TAO_ServerRequest & server_request, @@ -558,9 +536,7 @@ namespace POA_CORBA virtual ::CORBA::InitializerSeq * initializers ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_initializers_skel ( TAO_ServerRequest & server_request, @@ -574,9 +550,7 @@ namespace POA_CORBA virtual void initializers ( const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_initializers_skel ( TAO_ServerRequest & server_request, @@ -589,9 +563,7 @@ namespace POA_CORBA virtual ::CORBA::ValueDef_ptr base_value ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_base_value_skel ( TAO_ServerRequest & server_request, @@ -605,9 +577,7 @@ namespace POA_CORBA virtual void base_value ( ::CORBA::ValueDef_ptr base_value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_base_value_skel ( TAO_ServerRequest & server_request, @@ -620,9 +590,7 @@ namespace POA_CORBA virtual ::CORBA::ValueDefSeq * abstract_base_values ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_abstract_base_values_skel ( TAO_ServerRequest & server_request, @@ -636,9 +604,7 @@ namespace POA_CORBA virtual void abstract_base_values ( const ::CORBA::ValueDefSeq & abstract_base_values ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_abstract_base_values_skel ( TAO_ServerRequest & server_request, @@ -651,9 +617,7 @@ namespace POA_CORBA virtual ::CORBA::Boolean is_abstract ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_is_abstract_skel ( TAO_ServerRequest & server_request, @@ -667,9 +631,7 @@ namespace POA_CORBA virtual void is_abstract ( ::CORBA::Boolean is_abstract ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_is_abstract_skel ( TAO_ServerRequest & server_request, @@ -682,9 +644,7 @@ namespace POA_CORBA virtual ::CORBA::Boolean is_custom ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_is_custom_skel ( TAO_ServerRequest & server_request, @@ -698,9 +658,7 @@ namespace POA_CORBA virtual void is_custom ( ::CORBA::Boolean is_custom ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_is_custom_skel ( TAO_ServerRequest & server_request, @@ -713,9 +671,7 @@ namespace POA_CORBA virtual ::CORBA::Boolean is_truncatable ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_is_truncatable_skel ( TAO_ServerRequest & server_request, @@ -729,9 +685,7 @@ namespace POA_CORBA virtual void is_truncatable ( ::CORBA::Boolean is_truncatable ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_is_truncatable_skel ( TAO_ServerRequest & server_request, @@ -745,9 +699,7 @@ namespace POA_CORBA virtual ::CORBA::Boolean is_a ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void is_a_skel ( TAO_ServerRequest & server_request, @@ -760,9 +712,7 @@ namespace POA_CORBA virtual ::CORBA::ValueDef::FullValueDescription * describe_value ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void describe_value_skel ( TAO_ServerRequest & server_request, @@ -780,9 +730,7 @@ namespace POA_CORBA ::CORBA::IDLType_ptr type, ::CORBA::Visibility access ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_value_member_skel ( TAO_ServerRequest & server_request, @@ -800,9 +748,7 @@ namespace POA_CORBA ::CORBA::IDLType_ptr type, ::CORBA::AttributeMode mode ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_attribute_skel ( TAO_ServerRequest & server_request, @@ -823,9 +769,7 @@ namespace POA_CORBA const ::CORBA::ExceptionDefSeq & exceptions, const ::CORBA::ContextIdSeq & contexts ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_operation_skel ( TAO_ServerRequest & server_request, @@ -1192,9 +1136,7 @@ namespace POA_CORBA virtual ::CORBA::ExtInitializerSeq * ext_initializers ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_ext_initializers_skel ( TAO_ServerRequest & server_request, @@ -1208,9 +1150,7 @@ namespace POA_CORBA virtual void ext_initializers ( const ::CORBA::ExtInitializerSeq & ext_initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_ext_initializers_skel ( TAO_ServerRequest & server_request, @@ -1223,9 +1163,7 @@ namespace POA_CORBA virtual ::CORBA::ExtValueDef::ExtFullValueDescription * describe_ext_value ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void describe_ext_value_skel ( TAO_ServerRequest & server_request, @@ -1245,9 +1183,7 @@ namespace POA_CORBA const ::CORBA::ExceptionDefSeq & get_exceptions, const ::CORBA::ExceptionDefSeq & set_exceptions ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void create_ext_attribute_skel ( TAO_ServerRequest & server_request, @@ -1762,9 +1698,7 @@ namespace POA_CORBA virtual ::CORBA::IDLType_ptr original_type_def ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _get_original_type_def_skel ( TAO_ServerRequest & server_request, @@ -1778,9 +1712,7 @@ namespace POA_CORBA virtual void original_type_def ( ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + = 0; static void _set_original_type_def_skel ( TAO_ServerRequest & server_request, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h index 0878ffef071..1990efddc30 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h @@ -86,66 +86,45 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::UShort digits ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void digits ( ::CORBA::UShort digits - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Short scale ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void scale ( ::CORBA::Short scale - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -200,112 +179,76 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -314,57 +257,39 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::IDLType_ptr type_def ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void type_def ( ::CORBA::IDLType_ptr type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Visibility access ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void access ( ::CORBA::Visibility access - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -419,29 +344,20 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained_ptr lookup ( const char * search_name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -449,10 +365,7 @@ namespace POA_CORBA ::CORBA::ContainedSeq * contents ( ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -462,10 +375,7 @@ namespace POA_CORBA ::CORBA::Long levels_to_search, ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -474,10 +384,7 @@ namespace POA_CORBA ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -486,10 +393,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -500,10 +404,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, const ::CORBA::Any & value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -513,10 +414,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -527,10 +425,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -540,10 +435,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::EnumMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -553,10 +445,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -566,10 +455,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -585,10 +471,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -598,10 +481,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -611,10 +491,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -623,10 +500,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -636,10 +510,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -649,10 +520,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -668,103 +536,70 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -773,171 +608,117 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceDefSeq * supported_interfaces ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void supported_interfaces ( const ::CORBA::InterfaceDefSeq & supported_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InitializerSeq * initializers ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void initializers ( const ::CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ValueDef_ptr base_value ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void base_value ( ::CORBA::ValueDef_ptr base_value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ValueDefSeq * abstract_base_values ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void abstract_base_values ( const ::CORBA::ValueDefSeq & abstract_base_values - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_abstract ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void is_abstract ( ::CORBA::Boolean is_abstract - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_custom ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void is_custom ( ::CORBA::Boolean is_custom - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_truncatable ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void is_truncatable ( ::CORBA::Boolean is_truncatable - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_a ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ValueDef::FullValueDescription * describe_value ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -948,10 +729,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, ::CORBA::Visibility access - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -962,10 +740,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, ::CORBA::AttributeMode mode - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -979,10 +754,7 @@ namespace POA_CORBA const ::CORBA::ParDescriptionSeq & params, const ::CORBA::ExceptionDefSeq & exceptions, const ::CORBA::ContextIdSeq & contexts - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -1037,29 +809,20 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained_ptr lookup ( const char * search_name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1067,10 +830,7 @@ namespace POA_CORBA ::CORBA::ContainedSeq * contents ( ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1080,10 +840,7 @@ namespace POA_CORBA ::CORBA::Long levels_to_search, ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1092,10 +849,7 @@ namespace POA_CORBA ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1104,10 +858,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1118,10 +869,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, const ::CORBA::Any & value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1131,10 +879,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1145,10 +890,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1158,10 +900,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::EnumMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1171,10 +910,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1184,10 +920,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1203,10 +936,7 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1216,10 +946,7 @@ namespace POA_CORBA const char * name, const char * version, ::CORBA::IDLType_ptr original_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1229,10 +956,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::StructMemberSeq & members - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1241,10 +965,7 @@ namespace POA_CORBA const char * id, const char * name, const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1254,10 +975,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1267,10 +985,7 @@ namespace POA_CORBA const char * name, const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1286,103 +1001,70 @@ namespace POA_CORBA const ::CORBA::ValueDefSeq & abstract_base_values, const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1391,171 +1073,117 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InterfaceDefSeq * supported_interfaces ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void supported_interfaces ( const ::CORBA::InterfaceDefSeq & supported_interfaces - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::InitializerSeq * initializers ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void initializers ( const ::CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ValueDef_ptr base_value ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void base_value ( ::CORBA::ValueDef_ptr base_value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ValueDefSeq * abstract_base_values ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void abstract_base_values ( const ::CORBA::ValueDefSeq & abstract_base_values - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_abstract ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void is_abstract ( ::CORBA::Boolean is_abstract - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_custom ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void is_custom ( ::CORBA::Boolean is_custom - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_truncatable ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void is_truncatable ( ::CORBA::Boolean is_truncatable - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Boolean is_a ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ValueDef::FullValueDescription * describe_value ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1566,10 +1194,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, ::CORBA::Visibility access - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1580,10 +1205,7 @@ namespace POA_CORBA const char * version, ::CORBA::IDLType_ptr type, ::CORBA::AttributeMode mode - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1597,38 +1219,26 @@ namespace POA_CORBA const ::CORBA::ParDescriptionSeq & params, const ::CORBA::ExceptionDefSeq & exceptions, const ::CORBA::ContextIdSeq & contexts - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ExtInitializerSeq * ext_initializers ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void ext_initializers ( const ::CORBA::ExtInitializerSeq & ext_initializers - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::ExtValueDef::ExtFullValueDescription * describe_ext_value ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1641,10 +1251,7 @@ namespace POA_CORBA ::CORBA::AttributeMode mode, const ::CORBA::ExceptionDefSeq & get_exceptions, const ::CORBA::ExceptionDefSeq & set_exceptions - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; @@ -1699,112 +1306,76 @@ namespace POA_CORBA // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void destroy ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * id ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void id ( const char * id - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void name ( const char * name - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * version ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void version ( const char * version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Container_ptr defined_in ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 char * absolute_name ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Repository_ptr containing_repository ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::Contained::Description * describe ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 @@ -1813,38 +1384,26 @@ namespace POA_CORBA ::CORBA::Container_ptr new_container, const char * new_name, const char * new_version - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 ::CORBA::IDLType_ptr original_type_def ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); // TAO_IDL - Generated from // be\be_visitor_operation/tie_sh.cpp:60 void original_type_def ( ::CORBA::IDLType_ptr original_type_def - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: T *ptr_; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl index d8aa507ca47..e46bc4d4eaf 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl @@ -129,9 +129,6 @@ POA_CORBA::FixedDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::FixedDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -143,9 +140,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::FixedDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -157,9 +151,6 @@ void POA_CORBA::FixedDef_tie<T>::destroy ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::FixedDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -171,9 +162,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::UShort POA_CORBA::FixedDef_tie<T>::digits ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->digits ( ); @@ -186,9 +174,6 @@ template <class T> ACE_INLINE void POA_CORBA::FixedDef_tie<T>::digits ( ::CORBA::UShort digits ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->digits ( digits @@ -201,9 +186,6 @@ void POA_CORBA::FixedDef_tie<T>::digits ( template <class T> ACE_INLINE ::CORBA::Short POA_CORBA::FixedDef_tie<T>::scale ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->scale ( ); @@ -216,9 +198,6 @@ template <class T> ACE_INLINE void POA_CORBA::FixedDef_tie<T>::scale ( ::CORBA::Short scale ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->scale ( scale @@ -324,9 +303,6 @@ POA_CORBA::ValueMemberDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ValueMemberDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -338,9 +314,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ValueMemberDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -352,9 +325,6 @@ void POA_CORBA::ValueMemberDef_tie<T>::destroy ( template <class T> ACE_INLINE char * POA_CORBA::ValueMemberDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -367,9 +337,6 @@ template <class T> ACE_INLINE void POA_CORBA::ValueMemberDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -382,9 +349,6 @@ void POA_CORBA::ValueMemberDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::ValueMemberDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -397,9 +361,6 @@ template <class T> ACE_INLINE void POA_CORBA::ValueMemberDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -412,9 +373,6 @@ void POA_CORBA::ValueMemberDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::ValueMemberDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -427,9 +385,6 @@ template <class T> ACE_INLINE void POA_CORBA::ValueMemberDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -442,9 +397,6 @@ void POA_CORBA::ValueMemberDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::ValueMemberDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -456,9 +408,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ValueMemberDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -470,9 +419,6 @@ char * POA_CORBA::ValueMemberDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::ValueMemberDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -484,9 +430,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::ValueMemberDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -501,9 +444,6 @@ void POA_CORBA::ValueMemberDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -518,9 +458,6 @@ void POA_CORBA::ValueMemberDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::ValueMemberDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -532,9 +469,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::IDLType_ptr POA_CORBA::ValueMemberDef_tie<T>::type_def ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type_def ( ); @@ -547,9 +481,6 @@ template <class T> ACE_INLINE void POA_CORBA::ValueMemberDef_tie<T>::type_def ( ::CORBA::IDLType_ptr type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->type_def ( type_def @@ -562,9 +493,6 @@ void POA_CORBA::ValueMemberDef_tie<T>::type_def ( template <class T> ACE_INLINE ::CORBA::Visibility POA_CORBA::ValueMemberDef_tie<T>::access ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->access ( ); @@ -577,9 +505,6 @@ template <class T> ACE_INLINE void POA_CORBA::ValueMemberDef_tie<T>::access ( ::CORBA::Visibility access ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->access ( access @@ -685,9 +610,6 @@ POA_CORBA::ValueDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ValueDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -699,9 +621,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ValueDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -714,9 +633,6 @@ template <class T> ACE_INLINE ::CORBA::Contained_ptr POA_CORBA::ValueDef_tie<T>::lookup ( const char * search_name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup ( search_name @@ -731,9 +647,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->contents ( limit_type, @@ -751,9 +664,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup_name ( search_name, @@ -772,9 +682,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_contents ( limit_type, @@ -792,9 +699,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_module ( id, @@ -814,9 +718,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, const ::CORBA::Any & value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_constant ( id, @@ -837,9 +738,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_struct ( id, @@ -860,9 +758,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_union ( id, @@ -883,9 +778,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::EnumMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_enum ( id, @@ -905,9 +797,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_alias ( id, @@ -927,9 +816,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_interface ( id, @@ -955,9 +841,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value ( id, @@ -983,9 +866,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value_box ( id, @@ -1005,9 +885,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_exception ( id, @@ -1026,9 +903,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_native ( id, @@ -1047,9 +921,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_abstract_interface ( id, @@ -1069,9 +940,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_local_interface ( id, @@ -1097,9 +965,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_value ( id, @@ -1121,9 +986,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ValueDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -1136,9 +998,6 @@ template <class T> ACE_INLINE void POA_CORBA::ValueDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -1151,9 +1010,6 @@ void POA_CORBA::ValueDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::ValueDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -1166,9 +1022,6 @@ template <class T> ACE_INLINE void POA_CORBA::ValueDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -1181,9 +1034,6 @@ void POA_CORBA::ValueDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::ValueDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -1196,9 +1046,6 @@ template <class T> ACE_INLINE void POA_CORBA::ValueDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -1211,9 +1058,6 @@ void POA_CORBA::ValueDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::ValueDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -1225,9 +1069,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ValueDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -1239,9 +1080,6 @@ char * POA_CORBA::ValueDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::ValueDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -1253,9 +1091,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::ValueDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -1270,9 +1105,6 @@ void POA_CORBA::ValueDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -1287,9 +1119,6 @@ void POA_CORBA::ValueDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::ValueDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -1301,9 +1130,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::InterfaceDefSeq * POA_CORBA::ValueDef_tie<T>::supported_interfaces ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->supported_interfaces ( ); @@ -1316,9 +1142,6 @@ template <class T> ACE_INLINE void POA_CORBA::ValueDef_tie<T>::supported_interfaces ( const ::CORBA::InterfaceDefSeq & supported_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->supported_interfaces ( supported_interfaces @@ -1331,9 +1154,6 @@ void POA_CORBA::ValueDef_tie<T>::supported_interfaces ( template <class T> ACE_INLINE ::CORBA::InitializerSeq * POA_CORBA::ValueDef_tie<T>::initializers ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->initializers ( ); @@ -1346,9 +1166,6 @@ template <class T> ACE_INLINE void POA_CORBA::ValueDef_tie<T>::initializers ( const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->initializers ( initializers @@ -1361,9 +1178,6 @@ void POA_CORBA::ValueDef_tie<T>::initializers ( template <class T> ACE_INLINE ::CORBA::ValueDef_ptr POA_CORBA::ValueDef_tie<T>::base_value ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->base_value ( ); @@ -1376,9 +1190,6 @@ template <class T> ACE_INLINE void POA_CORBA::ValueDef_tie<T>::base_value ( ::CORBA::ValueDef_ptr base_value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->base_value ( base_value @@ -1391,9 +1202,6 @@ void POA_CORBA::ValueDef_tie<T>::base_value ( template <class T> ACE_INLINE ::CORBA::ValueDefSeq * POA_CORBA::ValueDef_tie<T>::abstract_base_values ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->abstract_base_values ( ); @@ -1406,9 +1214,6 @@ template <class T> ACE_INLINE void POA_CORBA::ValueDef_tie<T>::abstract_base_values ( const ::CORBA::ValueDefSeq & abstract_base_values ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->abstract_base_values ( abstract_base_values @@ -1421,9 +1226,6 @@ void POA_CORBA::ValueDef_tie<T>::abstract_base_values ( template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::ValueDef_tie<T>::is_abstract ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_abstract ( ); @@ -1436,9 +1238,6 @@ template <class T> ACE_INLINE void POA_CORBA::ValueDef_tie<T>::is_abstract ( ::CORBA::Boolean is_abstract ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->is_abstract ( is_abstract @@ -1451,9 +1250,6 @@ void POA_CORBA::ValueDef_tie<T>::is_abstract ( template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::ValueDef_tie<T>::is_custom ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_custom ( ); @@ -1466,9 +1262,6 @@ template <class T> ACE_INLINE void POA_CORBA::ValueDef_tie<T>::is_custom ( ::CORBA::Boolean is_custom ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->is_custom ( is_custom @@ -1481,9 +1274,6 @@ void POA_CORBA::ValueDef_tie<T>::is_custom ( template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::ValueDef_tie<T>::is_truncatable ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_truncatable ( ); @@ -1496,9 +1286,6 @@ template <class T> ACE_INLINE void POA_CORBA::ValueDef_tie<T>::is_truncatable ( ::CORBA::Boolean is_truncatable ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->is_truncatable ( is_truncatable @@ -1512,9 +1299,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::ValueDef_tie<T>::is_a ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_a ( id @@ -1527,9 +1311,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::ValueDef::FullValueDescription * POA_CORBA::ValueDef_tie<T>::describe_value ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_value ( ); @@ -1546,9 +1327,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, ::CORBA::Visibility access ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value_member ( id, @@ -1570,9 +1348,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, ::CORBA::AttributeMode mode ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_attribute ( id, @@ -1597,9 +1372,6 @@ template <class T> ACE_INLINE const ::CORBA::ExceptionDefSeq & exceptions, const ::CORBA::ContextIdSeq & contexts ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_operation ( id, @@ -1712,9 +1484,6 @@ POA_CORBA::ExtValueDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ExtValueDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -1726,9 +1495,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ExtValueDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -1741,9 +1507,6 @@ template <class T> ACE_INLINE ::CORBA::Contained_ptr POA_CORBA::ExtValueDef_tie<T>::lookup ( const char * search_name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup ( search_name @@ -1758,9 +1521,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->contents ( limit_type, @@ -1778,9 +1538,6 @@ template <class T> ACE_INLINE ::CORBA::DefinitionKind limit_type, ::CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->lookup_name ( search_name, @@ -1799,9 +1556,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean exclude_inherited, ::CORBA::Long max_returned_objs ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_contents ( limit_type, @@ -1819,9 +1573,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_module ( id, @@ -1841,9 +1592,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, const ::CORBA::Any & value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_constant ( id, @@ -1864,9 +1612,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_struct ( id, @@ -1887,9 +1632,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr discriminator_type, const ::CORBA::UnionMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_union ( id, @@ -1910,9 +1652,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::EnumMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_enum ( id, @@ -1932,9 +1671,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_alias ( id, @@ -1954,9 +1690,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_interface ( id, @@ -1982,9 +1715,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value ( id, @@ -2010,9 +1740,6 @@ template <class T> ACE_INLINE const char * version, ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value_box ( id, @@ -2032,9 +1759,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::StructMemberSeq & members ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_exception ( id, @@ -2053,9 +1777,6 @@ template <class T> ACE_INLINE const char * name, const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_native ( id, @@ -2074,9 +1795,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::AbstractInterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_abstract_interface ( id, @@ -2096,9 +1814,6 @@ template <class T> ACE_INLINE const char * version, const ::CORBA::InterfaceDefSeq & base_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_local_interface ( id, @@ -2124,9 +1839,6 @@ template <class T> ACE_INLINE const ::CORBA::InterfaceDefSeq & supported_interfaces, const ::CORBA::ExtInitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_value ( id, @@ -2148,9 +1860,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ExtValueDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -2163,9 +1872,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtValueDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -2178,9 +1884,6 @@ void POA_CORBA::ExtValueDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::ExtValueDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -2193,9 +1896,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtValueDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -2208,9 +1908,6 @@ void POA_CORBA::ExtValueDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::ExtValueDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -2223,9 +1920,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtValueDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -2238,9 +1932,6 @@ void POA_CORBA::ExtValueDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::ExtValueDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -2252,9 +1943,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ExtValueDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -2266,9 +1954,6 @@ char * POA_CORBA::ExtValueDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::ExtValueDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -2280,9 +1965,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::ExtValueDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -2297,9 +1979,6 @@ void POA_CORBA::ExtValueDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -2314,9 +1993,6 @@ void POA_CORBA::ExtValueDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::ExtValueDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -2328,9 +2004,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::InterfaceDefSeq * POA_CORBA::ExtValueDef_tie<T>::supported_interfaces ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->supported_interfaces ( ); @@ -2343,9 +2016,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtValueDef_tie<T>::supported_interfaces ( const ::CORBA::InterfaceDefSeq & supported_interfaces ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->supported_interfaces ( supported_interfaces @@ -2358,9 +2028,6 @@ void POA_CORBA::ExtValueDef_tie<T>::supported_interfaces ( template <class T> ACE_INLINE ::CORBA::InitializerSeq * POA_CORBA::ExtValueDef_tie<T>::initializers ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->initializers ( ); @@ -2373,9 +2040,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtValueDef_tie<T>::initializers ( const ::CORBA::InitializerSeq & initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->initializers ( initializers @@ -2388,9 +2052,6 @@ void POA_CORBA::ExtValueDef_tie<T>::initializers ( template <class T> ACE_INLINE ::CORBA::ValueDef_ptr POA_CORBA::ExtValueDef_tie<T>::base_value ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->base_value ( ); @@ -2403,9 +2064,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtValueDef_tie<T>::base_value ( ::CORBA::ValueDef_ptr base_value ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->base_value ( base_value @@ -2418,9 +2076,6 @@ void POA_CORBA::ExtValueDef_tie<T>::base_value ( template <class T> ACE_INLINE ::CORBA::ValueDefSeq * POA_CORBA::ExtValueDef_tie<T>::abstract_base_values ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->abstract_base_values ( ); @@ -2433,9 +2088,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtValueDef_tie<T>::abstract_base_values ( const ::CORBA::ValueDefSeq & abstract_base_values ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->abstract_base_values ( abstract_base_values @@ -2448,9 +2100,6 @@ void POA_CORBA::ExtValueDef_tie<T>::abstract_base_values ( template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::ExtValueDef_tie<T>::is_abstract ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_abstract ( ); @@ -2463,9 +2112,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtValueDef_tie<T>::is_abstract ( ::CORBA::Boolean is_abstract ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->is_abstract ( is_abstract @@ -2478,9 +2124,6 @@ void POA_CORBA::ExtValueDef_tie<T>::is_abstract ( template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::ExtValueDef_tie<T>::is_custom ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_custom ( ); @@ -2493,9 +2136,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtValueDef_tie<T>::is_custom ( ::CORBA::Boolean is_custom ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->is_custom ( is_custom @@ -2508,9 +2148,6 @@ void POA_CORBA::ExtValueDef_tie<T>::is_custom ( template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::ExtValueDef_tie<T>::is_truncatable ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_truncatable ( ); @@ -2523,9 +2160,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtValueDef_tie<T>::is_truncatable ( ::CORBA::Boolean is_truncatable ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->is_truncatable ( is_truncatable @@ -2539,9 +2173,6 @@ template <class T> ACE_INLINE ::CORBA::Boolean POA_CORBA::ExtValueDef_tie<T>::is_a ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->is_a ( id @@ -2554,9 +2185,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::ValueDef::FullValueDescription * POA_CORBA::ExtValueDef_tie<T>::describe_value ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_value ( ); @@ -2573,9 +2201,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, ::CORBA::Visibility access ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_value_member ( id, @@ -2597,9 +2222,6 @@ template <class T> ACE_INLINE ::CORBA::IDLType_ptr type, ::CORBA::AttributeMode mode ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_attribute ( id, @@ -2624,9 +2246,6 @@ template <class T> ACE_INLINE const ::CORBA::ExceptionDefSeq & exceptions, const ::CORBA::ContextIdSeq & contexts ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_operation ( id, @@ -2646,9 +2265,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::ExtInitializerSeq * POA_CORBA::ExtValueDef_tie<T>::ext_initializers ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->ext_initializers ( ); @@ -2661,9 +2277,6 @@ template <class T> ACE_INLINE void POA_CORBA::ExtValueDef_tie<T>::ext_initializers ( const ::CORBA::ExtInitializerSeq & ext_initializers ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->ext_initializers ( ext_initializers @@ -2676,9 +2289,6 @@ void POA_CORBA::ExtValueDef_tie<T>::ext_initializers ( template <class T> ACE_INLINE ::CORBA::ExtValueDef::ExtFullValueDescription * POA_CORBA::ExtValueDef_tie<T>::describe_ext_value ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe_ext_value ( ); @@ -2697,9 +2307,6 @@ template <class T> ACE_INLINE const ::CORBA::ExceptionDefSeq & get_exceptions, const ::CORBA::ExceptionDefSeq & set_exceptions ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->create_ext_attribute ( id, @@ -2811,9 +2418,6 @@ POA_CORBA::ValueBoxDef_tie<T>::_default_POA (void) template <class T> ACE_INLINE ::CORBA::DefinitionKind POA_CORBA::ValueBoxDef_tie<T>::def_kind ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->def_kind ( ); @@ -2825,9 +2429,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE void POA_CORBA::ValueBoxDef_tie<T>::destroy ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->destroy ( ); @@ -2839,9 +2440,6 @@ void POA_CORBA::ValueBoxDef_tie<T>::destroy ( template <class T> ACE_INLINE char * POA_CORBA::ValueBoxDef_tie<T>::id ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->id ( ); @@ -2854,9 +2452,6 @@ template <class T> ACE_INLINE void POA_CORBA::ValueBoxDef_tie<T>::id ( const char * id ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->id ( id @@ -2869,9 +2464,6 @@ void POA_CORBA::ValueBoxDef_tie<T>::id ( template <class T> ACE_INLINE char * POA_CORBA::ValueBoxDef_tie<T>::name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->name ( ); @@ -2884,9 +2476,6 @@ template <class T> ACE_INLINE void POA_CORBA::ValueBoxDef_tie<T>::name ( const char * name ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->name ( name @@ -2899,9 +2488,6 @@ void POA_CORBA::ValueBoxDef_tie<T>::name ( template <class T> ACE_INLINE char * POA_CORBA::ValueBoxDef_tie<T>::version ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->version ( ); @@ -2914,9 +2500,6 @@ template <class T> ACE_INLINE void POA_CORBA::ValueBoxDef_tie<T>::version ( const char * version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->version ( version @@ -2929,9 +2512,6 @@ void POA_CORBA::ValueBoxDef_tie<T>::version ( template <class T> ACE_INLINE ::CORBA::Container_ptr POA_CORBA::ValueBoxDef_tie<T>::defined_in ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->defined_in ( ); @@ -2943,9 +2523,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE char * POA_CORBA::ValueBoxDef_tie<T>::absolute_name ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->absolute_name ( ); @@ -2957,9 +2534,6 @@ char * POA_CORBA::ValueBoxDef_tie<T>::absolute_name ( template <class T> ACE_INLINE ::CORBA::Repository_ptr POA_CORBA::ValueBoxDef_tie<T>::containing_repository ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->containing_repository ( ); @@ -2971,9 +2545,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::Contained::Description * POA_CORBA::ValueBoxDef_tie<T>::describe ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->describe ( ); @@ -2988,9 +2559,6 @@ void POA_CORBA::ValueBoxDef_tie<T>::move ( const char * new_name, const char * new_version ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->move ( new_container, @@ -3005,9 +2573,6 @@ void POA_CORBA::ValueBoxDef_tie<T>::move ( template <class T> ACE_INLINE ::CORBA::TypeCode_ptr POA_CORBA::ValueBoxDef_tie<T>::type ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->type ( ); @@ -3019,9 +2584,6 @@ template <class T> ACE_INLINE template <class T> ACE_INLINE ::CORBA::IDLType_ptr POA_CORBA::ValueBoxDef_tie<T>::original_type_def ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return this->ptr_->original_type_def ( ); @@ -3034,9 +2596,6 @@ template <class T> ACE_INLINE void POA_CORBA::ValueBoxDef_tie<T>::original_type_def ( ::CORBA::IDLType_ptr original_type_def ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->ptr_->original_type_def ( original_type_def diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp index 6bd5cb998dc..152fd3098d1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp @@ -71,7 +71,6 @@ CORBA::Object_ptr TAO_IFR_Service_Loader::create_object (CORBA::ORB_ptr orb, int argc, ACE_TCHAR *argv[]) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Initializes the IFR_Service Service. Returns -1 // on an error. diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h index 9f5547c0e37..571bb11b518 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h @@ -51,8 +51,7 @@ public: // ORB and the command line parameters. virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, - ACE_TCHAR *argv[]) - ACE_THROW_SPEC ((CORBA::SystemException)); + ACE_TCHAR *argv[]); protected: diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp index c67e183cf86..8dac3e08ea1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp @@ -465,7 +465,6 @@ TAO_IFR_Service_Utils::valid_container ( CORBA::DefinitionKind container_kind, CORBA::DefinitionKind contained_kind ) - ACE_THROW_SPEC ((CORBA::SystemException)) { int error_flag = 0; @@ -550,7 +549,6 @@ TAO_IFR_Service_Utils::pre_exist ( void TAO_IFR_Service_Utils::id_exists (const char *id, TAO_Repository_i *repo) - ACE_THROW_SPEC ((CORBA::SystemException)) { // The repo id must not already exist. ACE_TString holder; @@ -570,7 +568,6 @@ TAO_IFR_Service_Utils::name_exists ( TAO_Repository_i *repo, CORBA::DefinitionKind kind ) - ACE_THROW_SPEC ((CORBA::SystemException)) { int status = 0; ACE_TString section_name; @@ -705,7 +702,6 @@ TAO_IFR_Service_Utils::check_subsection ( ACE_Configuration *config, ACE_Configuration_Section_Key &key ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Configuration_Section_Key sub_key; int status = diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h index 50fd7309417..74d8197b6ad 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h @@ -114,8 +114,7 @@ public: /// Checks for illegal member type in given container type. static void valid_container (CORBA::DefinitionKind container_kind, - CORBA::DefinitionKind contained_kind) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::DefinitionKind contained_kind); /// Wrapper for id_exists() and name_exists(). static void pre_exist (const char *id, @@ -126,23 +125,20 @@ public: /// Checks for a global repository id clash. static void id_exists (const char *id, - TAO_Repository_i *repo) - ACE_THROW_SPEC ((CORBA::SystemException)); + TAO_Repository_i *repo); /// Checks for a local name clash. static void name_exists (name_clash_checker checker, ACE_Configuration_Section_Key &key, TAO_Repository_i *repo, - CORBA::DefinitionKind kind) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::DefinitionKind kind); /// Used by interfaces and components to check for name clashes /// in the attributes, operations, or component ports subsections. static void check_subsection (name_clash_checker checker, const char *sub_section, ACE_Configuration *config, - ACE_Configuration_Section_Key &key) - ACE_THROW_SPEC ((CORBA::SystemException)); + ACE_Configuration_Section_Key &key); /// Top-level method which calls all the above error-checking methods. static void valid_creation (CORBA::DefinitionKind container_kind, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp index b2691b27c00..ff118ef9d25 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp @@ -30,7 +30,6 @@ TAO_IRObject_i::~TAO_IRObject_i (void) CORBA::DefinitionKind TAO_IRObject_i::def_kind ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Will always be overridden by concrete classes. return CORBA::dk_none; @@ -44,7 +43,6 @@ TAO_IRObject_i::section_key (ACE_Configuration_Section_Key &key) void TAO_IRObject_i::update_key (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Portable_Server::POA_Current_Impl *pc_impl = static_cast <TAO::Portable_Server::POA_Current_Impl *> diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h index fa19fb2d349..aeae3dd3dc4 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h @@ -58,25 +58,23 @@ public: // Destructor. virtual CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void destroy ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; // Pure virtual. virtual void destroy_i ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; // Pure virtual - the unlocked version called by the destroy() wrapper. void section_key (ACE_Configuration_Section_Key &key); // Plug in the section key. protected: - void update_key (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void update_key (void); // Set our key from the object ID via POACurrent. protected: diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp index c5497345cfe..6865c8e0262 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp @@ -34,7 +34,6 @@ TAO_InterfaceAttrExtension_i::~TAO_InterfaceAttrExtension_i (void) CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * TAO_InterfaceAttrExtension_i::describe_ext_interface ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -46,7 +45,6 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface ( CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * TAO_InterfaceAttrExtension_i::describe_ext_interface_i ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *fifd = 0; ACE_NEW_RETURN (fifd, @@ -244,7 +242,6 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute ( const CORBA::ExceptionDefSeq &get_exceptions, const CORBA::ExceptionDefSeq &set_exceptions ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ExtAttributeDef::_nil ()); @@ -269,7 +266,6 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute_i ( const CORBA::ExceptionDefSeq &get_exceptions, const CORBA::ExceptionDefSeq &set_exceptions ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Container_i::tmp_name_holder (name); ACE_Configuration_Section_Key new_key; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h index 152cabbc59a..1fae9bac715 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h @@ -53,13 +53,11 @@ public: virtual CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ExtAttributeDef_ptr create_ext_attribute ( const char *id, @@ -69,8 +67,7 @@ public: CORBA::AttributeMode mode, const CORBA::ExceptionDefSeq &get_exceptions, const CORBA::ExceptionDefSeq &set_exceptions - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ExtAttributeDef_ptr create_ext_attribute_i ( const char *id, @@ -80,8 +77,7 @@ public: CORBA::AttributeMode mode, const CORBA::ExceptionDefSeq &get_exceptions, const CORBA::ExceptionDefSeq &set_exceptions - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp index beaad06e7d6..f824d563205 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp @@ -32,14 +32,12 @@ TAO_InterfaceDef_i::~TAO_InterfaceDef_i (void) CORBA::DefinitionKind TAO_InterfaceDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Interface; } void TAO_InterfaceDef_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -50,7 +48,6 @@ TAO_InterfaceDef_i::destroy (void) void TAO_InterfaceDef_i::destroy_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our members. this->TAO_Container_i::destroy_i (); @@ -77,7 +74,6 @@ TAO_InterfaceDef_i::destroy_i (void) CORBA::Contained::Description * TAO_InterfaceDef_i::describe (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -88,7 +84,6 @@ TAO_InterfaceDef_i::describe (void) CORBA::Contained::Description * TAO_InterfaceDef_i::describe_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, @@ -152,7 +147,6 @@ TAO_InterfaceDef_i::describe_i (void) CORBA::TypeCode_ptr TAO_InterfaceDef_i::type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -163,7 +157,6 @@ TAO_InterfaceDef_i::type (void) CORBA::TypeCode_ptr TAO_InterfaceDef_i::type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -183,7 +176,6 @@ TAO_InterfaceDef_i::type_i (void) CORBA::InterfaceDefSeq * TAO_InterfaceDef_i::base_interfaces (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -194,7 +186,6 @@ TAO_InterfaceDef_i::base_interfaces (void) CORBA::InterfaceDefSeq * TAO_InterfaceDef_i::base_interfaces_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue; ACE_Unbounded_Queue<ACE_TString> path_queue; @@ -232,7 +223,6 @@ TAO_InterfaceDef_i::base_interfaces_i (void) void TAO_InterfaceDef_i::base_interfaces (const CORBA::InterfaceDefSeq &base_interfaces) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -243,7 +233,6 @@ TAO_InterfaceDef_i::base_interfaces (const CORBA::InterfaceDefSeq &base_interfac void TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interfaces) - ACE_THROW_SPEC ((CORBA::SystemException)) { // If we are an abstract interface, all our base interfaces must be // abstract as well. @@ -314,7 +303,6 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interf CORBA::Boolean TAO_InterfaceDef_i::is_a (const char *interface_id) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -325,7 +313,6 @@ TAO_InterfaceDef_i::is_a (const char *interface_id) CORBA::Boolean TAO_InterfaceDef_i::is_a_i (const char *interface_id) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/Object:1.0") == 0) { @@ -378,7 +365,6 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id) CORBA::InterfaceDef::FullInterfaceDescription * TAO_InterfaceDef_i::describe_interface (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -389,7 +375,6 @@ TAO_InterfaceDef_i::describe_interface (void) CORBA::InterfaceDef::FullInterfaceDescription * TAO_InterfaceDef_i::describe_interface_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::InterfaceDef::FullInterfaceDescription *fifd = 0; ACE_NEW_RETURN (fifd, @@ -585,7 +570,6 @@ TAO_InterfaceDef_i::create_attribute ( CORBA::IDLType_ptr type, CORBA::AttributeMode mode ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::AttributeDef::_nil ()); @@ -606,7 +590,6 @@ TAO_InterfaceDef_i::create_attribute_i ( CORBA::IDLType_ptr type, CORBA::AttributeMode mode ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // This will throw an exception if a name clash is found. // create_common() will check for all other errors. @@ -662,7 +645,6 @@ TAO_InterfaceDef_i::create_operation (const char *id, const CORBA::ParDescriptionSeq ¶ms, const CORBA::ExceptionDefSeq &exceptions, const CORBA::ContextIdSeq &contexts) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::OperationDef::_nil ()); @@ -687,7 +669,6 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, const CORBA::ParDescriptionSeq ¶ms, const CORBA::ExceptionDefSeq &exceptions, const CORBA::ContextIdSeq &contexts) - ACE_THROW_SPEC ((CORBA::SystemException)) { // This will throw an exception if a name clash is found. // create_common() will check for all other errors. @@ -857,7 +838,6 @@ TAO_InterfaceDef_i::interface_contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -1164,7 +1144,6 @@ TAO_InterfaceDef_i::inherited_operations ( void TAO_InterfaceDef_i::check_inherited (const char *name, CORBA::DefinitionKind kind) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h index e913e3bfed5..4159cea7e79 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h @@ -56,73 +56,58 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Return our definition kind. virtual void destroy ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void destroy_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::Contained::Description *describe ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From Contained_i's pure virtual function. virtual CORBA::Contained::Description *describe_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From IDLType_i's pure virtual function. virtual CORBA::InterfaceDefSeq *base_interfaces ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::InterfaceDefSeq *base_interfaces_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void base_interfaces ( const CORBA::InterfaceDefSeq &base_interfaces - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void base_interfaces_i ( const CORBA::InterfaceDefSeq &base_interfaces - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::Boolean is_a ( const char *interface_id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::Boolean is_a_i ( const char *interface_id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::InterfaceDef::FullInterfaceDescription *describe_interface ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::InterfaceDef::FullInterfaceDescription *describe_interface_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::AttributeDef_ptr create_attribute ( const char *id, @@ -130,8 +115,7 @@ public: const char *version, CORBA::IDLType_ptr type, CORBA::AttributeMode mode - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::AttributeDef_ptr create_attribute_i ( const char *id, @@ -139,8 +123,7 @@ public: const char *version, CORBA::IDLType_ptr type, CORBA::AttributeMode mode - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::OperationDef_ptr create_operation ( const char *id, @@ -151,8 +134,7 @@ public: const CORBA::ParDescriptionSeq ¶ms, const CORBA::ExceptionDefSeq &exceptions, const CORBA::ContextIdSeq &contexts - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::OperationDef_ptr create_operation_i ( const char *id, @@ -163,16 +145,14 @@ public: const CORBA::ParDescriptionSeq ¶ms, const CORBA::ExceptionDefSeq &exceptions, const CORBA::ContextIdSeq &contexts - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void interface_contents ( ACE_Unbounded_Queue<CORBA::DefinitionKind> &kind_queue, ACE_Unbounded_Queue<ACE_TString> &path_queue, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Gathers the attributes and operations of all the ancestors. static int name_clash (const char *name); @@ -200,8 +180,7 @@ private: // the base interfaces. void check_inherited (const char *name, - CORBA::DefinitionKind kind) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::DefinitionKind kind); // When creating a new attribute, check for a clash with an inherited // attribute name. }; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp index 6fe1c37dbc9..31eeced9bf2 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp @@ -26,14 +26,12 @@ TAO_LocalInterfaceDef_i::~TAO_LocalInterfaceDef_i (void) CORBA::DefinitionKind TAO_LocalInterfaceDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_LocalInterface; } CORBA::Boolean TAO_LocalInterfaceDef_i::is_a (const char *interface_id) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -44,7 +42,6 @@ TAO_LocalInterfaceDef_i::is_a (const char *interface_id) CORBA::Boolean TAO_LocalInterfaceDef_i::is_a_i (const char *interface_id) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/LocalBase:1.0") == 0) { diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h index 1943789c717..5687ba06a43 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h @@ -51,19 +51,16 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Return our definition kind. virtual CORBA::Boolean is_a ( const char *interface_id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::Boolean is_a_i ( const char *interface_id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp index 8a264a124af..2a31620dd97 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp @@ -28,14 +28,12 @@ TAO_ModuleDef_i::~TAO_ModuleDef_i (void) CORBA::DefinitionKind TAO_ModuleDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Module; } void TAO_ModuleDef_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -46,7 +44,6 @@ TAO_ModuleDef_i::destroy (void) void TAO_ModuleDef_i::destroy_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our members. TAO_Container_i::destroy_i (); @@ -57,7 +54,6 @@ TAO_ModuleDef_i::destroy_i (void) CORBA::Contained::Description * TAO_ModuleDef_i::describe (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -68,7 +64,6 @@ TAO_ModuleDef_i::describe (void) CORBA::Contained::Description * TAO_ModuleDef_i::describe_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h index fd63eee2482..7b35ac3c545 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h @@ -55,28 +55,23 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Return our definition kind. virtual void destroy () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Remove the repository entry. virtual void destroy_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Remove the repository entry. virtual CORBA::Contained::Description *describe () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From Contained_i's pure virtual function. virtual CORBA::Contained::Description *describe_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From Contained_i's pure virtual function. }; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp index 65d533bf3c9..d8d76b25cce 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp @@ -27,14 +27,12 @@ TAO_NativeDef_i::~TAO_NativeDef_i (void) CORBA::DefinitionKind TAO_NativeDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Native; } CORBA::TypeCode_ptr TAO_NativeDef_i::type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -45,7 +43,6 @@ TAO_NativeDef_i::type (void) CORBA::TypeCode_ptr TAO_NativeDef_i::type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h index 65776722912..aeab4b0ff43 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h @@ -52,18 +52,15 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Return our definition kind. virtual CORBA::TypeCode_ptr type () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From IDLType_i's pure virtual function. }; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp index 56150ad4c4c..fcbbf1032a9 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp @@ -30,14 +30,12 @@ TAO_OperationDef_i::~TAO_OperationDef_i (void) CORBA::DefinitionKind TAO_OperationDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Operation; } CORBA::Contained::Description * TAO_OperationDef_i::describe ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -48,7 +46,6 @@ TAO_OperationDef_i::describe ( ) CORBA::Contained::Description * TAO_OperationDef_i::describe_i ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, @@ -69,7 +66,6 @@ TAO_OperationDef_i::describe_i ( ) CORBA::TypeCode_ptr TAO_OperationDef_i::result (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -80,7 +76,6 @@ TAO_OperationDef_i::result (void) CORBA::TypeCode_ptr TAO_OperationDef_i::result_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString result_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -97,7 +92,6 @@ TAO_OperationDef_i::result_i (void) CORBA::IDLType_ptr TAO_OperationDef_i::result_def (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -108,7 +102,6 @@ TAO_OperationDef_i::result_def (void) CORBA::IDLType_ptr TAO_OperationDef_i::result_def_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString result_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -124,7 +117,6 @@ TAO_OperationDef_i::result_def_i (void) void TAO_OperationDef_i::result_def (CORBA::IDLType_ptr result_def) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -135,7 +127,6 @@ TAO_OperationDef_i::result_def (CORBA::IDLType_ptr result_def) void TAO_OperationDef_i::result_def_i (CORBA::IDLType_ptr result_def) - ACE_THROW_SPEC ((CORBA::SystemException)) { char *result_path = TAO_IFR_Service_Utils::reference_to_path (result_def); @@ -147,7 +138,6 @@ TAO_OperationDef_i::result_def_i (CORBA::IDLType_ptr result_def) CORBA::ParDescriptionSeq * TAO_OperationDef_i::params (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -158,7 +148,6 @@ TAO_OperationDef_i::params (void) CORBA::ParDescriptionSeq * TAO_OperationDef_i::params_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong i = 0; ACE_Configuration_Section_Key params_key; @@ -253,7 +242,6 @@ TAO_OperationDef_i::params_i (void) void TAO_OperationDef_i::params (const CORBA::ParDescriptionSeq ¶ms) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -264,7 +252,6 @@ TAO_OperationDef_i::params (const CORBA::ParDescriptionSeq ¶ms) void TAO_OperationDef_i::params_i (const CORBA::ParDescriptionSeq ¶ms) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->remove_section (this->section_key_, "params", @@ -315,7 +302,6 @@ TAO_OperationDef_i::params_i (const CORBA::ParDescriptionSeq ¶ms) CORBA::OperationMode TAO_OperationDef_i::mode (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::OP_NORMAL); @@ -326,7 +312,6 @@ TAO_OperationDef_i::mode (void) CORBA::OperationMode TAO_OperationDef_i::mode_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { u_int mode; this->repo_->config ()->get_integer_value (this->section_key_, @@ -338,7 +323,6 @@ TAO_OperationDef_i::mode_i (void) void TAO_OperationDef_i::mode (CORBA::OperationMode mode) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -349,7 +333,6 @@ TAO_OperationDef_i::mode (CORBA::OperationMode mode) void TAO_OperationDef_i::mode_i (CORBA::OperationMode mode) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_integer_value (this->section_key_, "mode", @@ -358,7 +341,6 @@ TAO_OperationDef_i::mode_i (CORBA::OperationMode mode) CORBA::ContextIdSeq * TAO_OperationDef_i::contexts (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -369,7 +351,6 @@ TAO_OperationDef_i::contexts (void) CORBA::ContextIdSeq * TAO_OperationDef_i::contexts_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Configuration_Section_Key contexts_key; int status = @@ -425,7 +406,6 @@ TAO_OperationDef_i::contexts_i (void) void TAO_OperationDef_i::contexts (const CORBA::ContextIdSeq &contexts) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -436,7 +416,6 @@ TAO_OperationDef_i::contexts (const CORBA::ContextIdSeq &contexts) void TAO_OperationDef_i::contexts_i (const CORBA::ContextIdSeq &contexts) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->remove_section (this->section_key_, "contexts", @@ -464,7 +443,6 @@ TAO_OperationDef_i::contexts_i (const CORBA::ContextIdSeq &contexts) CORBA::ExceptionDefSeq * TAO_OperationDef_i::exceptions ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -475,7 +453,6 @@ TAO_OperationDef_i::exceptions ( ) CORBA::ExceptionDefSeq * TAO_OperationDef_i::exceptions_i ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Configuration_Section_Key excepts_key; int status = @@ -541,7 +518,6 @@ TAO_OperationDef_i::exceptions_i ( ) void TAO_OperationDef_i::exceptions (const CORBA::ExceptionDefSeq &exceptions) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -552,7 +528,6 @@ TAO_OperationDef_i::exceptions (const CORBA::ExceptionDefSeq &exceptions) void TAO_OperationDef_i::exceptions_i (const CORBA::ExceptionDefSeq &exceptions) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->remove_section (this->section_key_, "excepts", @@ -567,7 +542,6 @@ TAO_OperationDef_i::exceptions_i (const CORBA::ExceptionDefSeq &exceptions) void TAO_OperationDef_i::make_description ( CORBA::OperationDescription &od) - ACE_THROW_SPEC ((CORBA::SystemException)) { od.name = this->name_i (); @@ -686,7 +660,6 @@ TAO_OperationDef_i::make_description ( CORBA::TypeCode_ptr TAO_OperationDef_i::type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->result_i (); } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h index c8b9bbf4a30..2ed64dc9ca5 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h @@ -51,102 +51,75 @@ public: virtual ~TAO_OperationDef_i (void); // Destructor - virtual CORBA::DefinitionKind def_kind () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::DefinitionKind def_kind (); // Return our definition kind. - virtual CORBA::Contained::Description *describe () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Contained::Description *describe (); // From Contained_i's pure virtual function. - virtual CORBA::Contained::Description *describe_i () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Contained::Description *describe_i (); // From Contained_i's pure virtual function. - virtual CORBA::TypeCode_ptr result () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::TypeCode_ptr result (); - CORBA::TypeCode_ptr result_i () - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::TypeCode_ptr result_i (); - virtual CORBA::IDLType_ptr result_def () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::IDLType_ptr result_def (); - CORBA::IDLType_ptr result_def_i () - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::IDLType_ptr result_def_i (); virtual void result_def ( - CORBA::IDLType_ptr result_def) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::IDLType_ptr result_def); void result_def_i ( - CORBA::IDLType_ptr result_def) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::IDLType_ptr result_def); - virtual CORBA::ParDescriptionSeq *params () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ParDescriptionSeq *params (); - CORBA::ParDescriptionSeq *params_i () - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ParDescriptionSeq *params_i (); virtual void params ( - const CORBA::ParDescriptionSeq ¶ms) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CORBA::ParDescriptionSeq ¶ms); void params_i ( - const CORBA::ParDescriptionSeq ¶ms) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CORBA::ParDescriptionSeq ¶ms); - virtual CORBA::OperationMode mode () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::OperationMode mode (); - CORBA::OperationMode mode_i () - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::OperationMode mode_i (); virtual void mode ( - CORBA::OperationMode mode) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::OperationMode mode); void mode_i ( - CORBA::OperationMode mode) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::OperationMode mode); - virtual CORBA::ContextIdSeq *contexts () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ContextIdSeq *contexts (); - CORBA::ContextIdSeq *contexts_i () - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ContextIdSeq *contexts_i (); virtual void contexts ( - const CORBA::ContextIdSeq &contexts) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CORBA::ContextIdSeq &contexts); void contexts_i ( - const CORBA::ContextIdSeq &contexts) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CORBA::ContextIdSeq &contexts); - virtual CORBA::ExceptionDefSeq *exceptions () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ExceptionDefSeq *exceptions (); - CORBA::ExceptionDefSeq *exceptions_i () - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ExceptionDefSeq *exceptions_i (); virtual void exceptions ( - const CORBA::ExceptionDefSeq &exceptions) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CORBA::ExceptionDefSeq &exceptions); void exceptions_i ( - const CORBA::ExceptionDefSeq &exceptions) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CORBA::ExceptionDefSeq &exceptions); // Common code for containers to call in // making descriptions. - void make_description (CORBA::OperationDescription &desc) - ACE_THROW_SPEC ((CORBA::SystemException)); + void make_description (CORBA::OperationDescription &desc); - CORBA::TypeCode_ptr type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::TypeCode_ptr type_i (void); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp index 2443d8c68f9..443ddf4d951 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp @@ -23,28 +23,24 @@ TAO_PrimitiveDef_i::~TAO_PrimitiveDef_i (void) CORBA::DefinitionKind TAO_PrimitiveDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Primitive; } void TAO_PrimitiveDef_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->destroy_i (); } void TAO_PrimitiveDef_i::destroy_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO); } CORBA::TypeCode_ptr TAO_PrimitiveDef_i::type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -55,7 +51,6 @@ TAO_PrimitiveDef_i::type (void) CORBA::TypeCode_ptr TAO_PrimitiveDef_i::type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { u_int pkind = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -115,7 +110,6 @@ TAO_PrimitiveDef_i::type_i (void) CORBA::PrimitiveKind TAO_PrimitiveDef_i::kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::pk_null); @@ -126,7 +120,6 @@ TAO_PrimitiveDef_i::kind (void) CORBA::PrimitiveKind TAO_PrimitiveDef_i::kind_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { u_int pkind = 0; this->repo_->config ()->get_integer_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h index 8214d91f77c..a82788ca233 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h @@ -51,37 +51,30 @@ public: // Destructor. virtual CORBA::DefinitionKind def_kind () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Return our definition kind. virtual void destroy () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // May not be called on a primitive kind - raises BAD_INV_ORDER. virtual void destroy_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Must implement this here because it's pure virtual in the // base class. virtual CORBA::TypeCode_ptr type () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual CORBA::PrimitiveKind kind () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; CORBA::PrimitiveKind kind_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp index b4340673544..3db08a3d7f6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp @@ -28,14 +28,12 @@ TAO_ProvidesDef_i::~TAO_ProvidesDef_i (void) CORBA::DefinitionKind TAO_ProvidesDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Provides; } CORBA::Contained::Description * TAO_ProvidesDef_i::describe (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -46,7 +44,6 @@ TAO_ProvidesDef_i::describe (void) CORBA::Contained::Description * TAO_ProvidesDef_i::describe_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ComponentIR::ProvidesDescription pd; TAO_IFR_Desc_Utils<CORBA::ComponentIR::ProvidesDescription, @@ -74,7 +71,6 @@ TAO_ProvidesDef_i::describe_i (void) CORBA::InterfaceDef_ptr TAO_ProvidesDef_i::interface_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::InterfaceDef::_nil ()); @@ -85,7 +81,6 @@ TAO_ProvidesDef_i::interface_type (void) CORBA::InterfaceDef_ptr TAO_ProvidesDef_i::interface_type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString holder; this->repo_->config ()->get_string_value (this->section_key_, @@ -105,7 +100,6 @@ void TAO_ProvidesDef_i::interface_type ( CORBA::InterfaceDef_ptr interface_type ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -118,7 +112,6 @@ void TAO_ProvidesDef_i::interface_type_i ( CORBA::InterfaceDef_ptr interface_type ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->remove_value (this->section_key_, "base_type"); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h index 26e284cb89a..3c0ef1a66f5 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h @@ -50,37 +50,30 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Return our definition kind. virtual CORBA::Contained::Description *describe ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From Contained_i's pure virtual function. virtual CORBA::Contained::Description *describe_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From Contained_i's pure virtual function. virtual CORBA::InterfaceDef_ptr interface_type ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::InterfaceDef_ptr interface_type_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void interface_type ( CORBA::InterfaceDef_ptr interface_type - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void interface_type_i ( CORBA::InterfaceDef_ptr interface_type - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp index 0ca5b1f2c99..a41a77b49df 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp @@ -23,7 +23,6 @@ TAO_PublishesDef_i::~TAO_PublishesDef_i (void) CORBA::DefinitionKind TAO_PublishesDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Publishes; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h index ca8407fb2c4..262c8c65386 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h @@ -52,8 +52,7 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Return our definition kind. }; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp index 2445d5936af..995534cce41 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp @@ -40,21 +40,18 @@ TAO_Repository_i::~TAO_Repository_i (void) CORBA::DefinitionKind TAO_Repository_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Repository; } void TAO_Repository_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO); } CORBA::Contained_ptr TAO_Repository_i::lookup_id (const char *search_id) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::Contained::_nil ()); @@ -63,7 +60,6 @@ TAO_Repository_i::lookup_id (const char *search_id) CORBA::Contained_ptr TAO_Repository_i::lookup_id_i (const char *search_id) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (ACE_OS::strcmp (search_id, "IDL:omg.org/CORBA/Object:1.0") == 0 || ACE_OS::strcmp (search_id, "IDL:omg.org/CORBA/ValueBase:1.0") == 0) @@ -103,7 +99,6 @@ TAO_Repository_i::lookup_id_i (const char *search_id) CORBA::TypeCode_ptr TAO_Repository_i::get_canonical_typecode (CORBA::TypeCode_ptr tc) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -112,7 +107,6 @@ TAO_Repository_i::get_canonical_typecode (CORBA::TypeCode_ptr tc) CORBA::TypeCode_ptr TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::TCKind kind = tc->kind (); @@ -202,7 +196,6 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc) CORBA::PrimitiveDef_ptr TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString obj_id ("pkinds\\"); @@ -218,7 +211,6 @@ TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind) CORBA::StringDef_ptr TAO_Repository_i::create_string (CORBA::ULong bound) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::StringDef::_nil ()); @@ -227,7 +219,6 @@ TAO_Repository_i::create_string (CORBA::ULong bound) CORBA::StringDef_ptr TAO_Repository_i::create_string_i (CORBA::ULong bound) - ACE_THROW_SPEC ((CORBA::SystemException)) { u_int count = 0; this->config_->get_integer_value (this->strings_key_, @@ -272,7 +263,6 @@ TAO_Repository_i::create_string_i (CORBA::ULong bound) CORBA::WstringDef_ptr TAO_Repository_i::create_wstring (CORBA::ULong bound) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::WstringDef::_nil ()); @@ -281,7 +271,6 @@ TAO_Repository_i::create_wstring (CORBA::ULong bound) CORBA::WstringDef_ptr TAO_Repository_i::create_wstring_i (CORBA::ULong bound) - ACE_THROW_SPEC ((CORBA::SystemException)) { u_int count = 0; this->config_->get_integer_value (this->wstrings_key_, @@ -327,7 +316,6 @@ TAO_Repository_i::create_wstring_i (CORBA::ULong bound) CORBA::SequenceDef_ptr TAO_Repository_i::create_sequence (CORBA::ULong bound, CORBA::IDLType_ptr element_type) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::SequenceDef::_nil ()); @@ -338,7 +326,6 @@ TAO_Repository_i::create_sequence (CORBA::ULong bound, CORBA::SequenceDef_ptr TAO_Repository_i::create_sequence_i (CORBA::ULong bound, CORBA::IDLType_ptr element_type) - ACE_THROW_SPEC ((CORBA::SystemException)) { u_int count = 0; this->config_->get_integer_value (this->sequences_key_, @@ -395,7 +382,6 @@ TAO_Repository_i::create_sequence_i (CORBA::ULong bound, CORBA::ArrayDef_ptr TAO_Repository_i::create_array (CORBA::ULong length, CORBA::IDLType_ptr element_type) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ArrayDef::_nil ()); @@ -406,7 +392,6 @@ TAO_Repository_i::create_array (CORBA::ULong length, CORBA::ArrayDef_ptr TAO_Repository_i::create_array_i (CORBA::ULong length, CORBA::IDLType_ptr element_type) - ACE_THROW_SPEC ((CORBA::SystemException)) { u_int count = 0; this->config_->get_integer_value (this->arrays_key_, @@ -463,7 +448,6 @@ TAO_Repository_i::create_array_i (CORBA::ULong length, CORBA::FixedDef_ptr TAO_Repository_i::create_fixed (CORBA::UShort digits, CORBA::Short scale) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::FixedDef::_nil ()); @@ -475,7 +459,6 @@ CORBA::FixedDef_ptr TAO_Repository_i::create_fixed_i (CORBA::UShort /* digits */, CORBA::Short /* scale */ ) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h index 87cf86d6f10..0a4317d761c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h @@ -84,97 +84,80 @@ public: virtual ~TAO_Repository_i (void); virtual CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Accessor for the readonly attribute. virtual void destroy ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // May not be called on a repository - raises BAD_INV_ORDER. virtual CORBA::Contained_ptr lookup_id ( const char *search_id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::Contained_ptr lookup_id_i ( const char *search_id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::TypeCode_ptr get_canonical_typecode ( CORBA::TypeCode_ptr tc - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::TypeCode_ptr get_canonical_typecode_i ( CORBA::TypeCode_ptr tc - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::PrimitiveDef_ptr get_primitive ( CORBA::PrimitiveKind kind - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // No locking necessary because the database is not // accessed. virtual CORBA::StringDef_ptr create_string ( CORBA::ULong bound - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::StringDef_ptr create_string_i ( CORBA::ULong bound) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual CORBA::WstringDef_ptr create_wstring ( CORBA::ULong bound - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::WstringDef_ptr create_wstring_i ( CORBA::ULong bound - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::SequenceDef_ptr create_sequence ( CORBA::ULong bound, CORBA::IDLType_ptr element_type - ) - ACE_THROW_SPEC (( CORBA::SystemException)); + ); CORBA::SequenceDef_ptr create_sequence_i ( CORBA::ULong bound, CORBA::IDLType_ptr element_type - ) - ACE_THROW_SPEC (( CORBA::SystemException)); + ); virtual CORBA::ArrayDef_ptr create_array ( CORBA::ULong length, CORBA::IDLType_ptr element_type - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ArrayDef_ptr create_array_i ( CORBA::ULong length, CORBA::IDLType_ptr element_type - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::FixedDef_ptr create_fixed ( CORBA::UShort digits, CORBA::Short scale - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::FixedDef_ptr create_fixed_i ( CORBA::UShort digits, CORBA::Short scale - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); int repo_init (CORBA::Repository_ptr repo_ref, PortableServer::POA_ptr repo_poa); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp index 1b96ebf5d1d..d91db54a12d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp @@ -28,14 +28,12 @@ TAO_SequenceDef_i::~TAO_SequenceDef_i (void) CORBA::DefinitionKind TAO_SequenceDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Sequence; } void TAO_SequenceDef_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -46,7 +44,6 @@ TAO_SequenceDef_i::destroy (void) void TAO_SequenceDef_i::destroy_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Only if it is (w)string, fixed, array or sequence. this->destroy_element_type (); @@ -63,7 +60,6 @@ TAO_SequenceDef_i::destroy_i (void) CORBA::TypeCode_ptr TAO_SequenceDef_i::type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -74,7 +70,6 @@ TAO_SequenceDef_i::type (void) CORBA::TypeCode_ptr TAO_SequenceDef_i::type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::TypeCode_var element_typecode = this->element_type_i (); @@ -89,7 +84,6 @@ TAO_SequenceDef_i::type_i (void) CORBA::ULong TAO_SequenceDef_i::bound (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -100,7 +94,6 @@ TAO_SequenceDef_i::bound (void) CORBA::ULong TAO_SequenceDef_i::bound_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { u_int bound = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -112,7 +105,6 @@ TAO_SequenceDef_i::bound_i (void) void TAO_SequenceDef_i::bound (CORBA::ULong bound) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -121,7 +113,6 @@ TAO_SequenceDef_i::bound (CORBA::ULong bound) void TAO_SequenceDef_i::bound_i (CORBA::ULong bound) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_integer_value (this->section_key_, "bound", @@ -130,7 +121,6 @@ TAO_SequenceDef_i::bound_i (CORBA::ULong bound) CORBA::TypeCode_ptr TAO_SequenceDef_i::element_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -141,7 +131,6 @@ TAO_SequenceDef_i::element_type (void) CORBA::TypeCode_ptr TAO_SequenceDef_i::element_type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString element_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -157,7 +146,6 @@ TAO_SequenceDef_i::element_type_i (void) CORBA::IDLType_ptr TAO_SequenceDef_i::element_type_def (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -168,7 +156,6 @@ TAO_SequenceDef_i::element_type_def (void) CORBA::IDLType_ptr TAO_SequenceDef_i::element_type_def_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString element_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -184,7 +171,6 @@ TAO_SequenceDef_i::element_type_def_i (void) void TAO_SequenceDef_i::element_type_def (CORBA::IDLType_ptr element_type_def) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -195,7 +181,6 @@ TAO_SequenceDef_i::element_type_def (CORBA::IDLType_ptr element_type_def) void TAO_SequenceDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->destroy_element_type (); @@ -209,7 +194,6 @@ TAO_SequenceDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def) void TAO_SequenceDef_i::destroy_element_type () - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString element_path; this->repo_->config ()->get_string_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h index 9189728fcce..313f7013f03 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h @@ -51,77 +51,61 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Return our definition kind. virtual void destroy () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Remove the repository entry. virtual void destroy_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual CORBA::TypeCode_ptr type () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From IDLType_i's pure virtual function. virtual CORBA::ULong bound () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; CORBA::ULong bound_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual void bound ( CORBA::ULong bound) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; void bound_i ( CORBA::ULong bound) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual CORBA::TypeCode_ptr element_type () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; CORBA::TypeCode_ptr element_type_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual CORBA::IDLType_ptr element_type_def () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; CORBA::IDLType_ptr element_type_def_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual void element_type_def ( CORBA::IDLType_ptr element_type_def) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; void element_type_def_i ( CORBA::IDLType_ptr element_type_def) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; private: void destroy_element_type () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Destroys an anonymous non-primitive element type. }; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp index 28fb4b79870..ff0658e0d68 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp @@ -24,14 +24,12 @@ TAO_StringDef_i::~TAO_StringDef_i (void) CORBA::DefinitionKind TAO_StringDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_String; } void TAO_StringDef_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -42,7 +40,6 @@ TAO_StringDef_i::destroy (void) void TAO_StringDef_i::destroy_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString name; this->repo_->config ()->get_string_value (this->section_key_, @@ -56,7 +53,6 @@ TAO_StringDef_i::destroy_i (void) CORBA::TypeCode_ptr TAO_StringDef_i::type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -67,7 +63,6 @@ TAO_StringDef_i::type (void) CORBA::TypeCode_ptr TAO_StringDef_i::type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong bound = this->bound_i (); @@ -78,7 +73,6 @@ TAO_StringDef_i::type_i (void) CORBA::ULong TAO_StringDef_i::bound (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -89,7 +83,6 @@ TAO_StringDef_i::bound (void) CORBA::ULong TAO_StringDef_i::bound_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { u_int retval = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -101,7 +94,6 @@ TAO_StringDef_i::bound_i (void) void TAO_StringDef_i::bound (CORBA::ULong bound) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -112,7 +104,6 @@ TAO_StringDef_i::bound (CORBA::ULong bound) void TAO_StringDef_i::bound_i (CORBA::ULong bound) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_integer_value (this->section_key_, "bound", diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h index f6bb6c00a8a..fc6aaabd45e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h @@ -52,46 +52,37 @@ public: // Destructor. virtual CORBA::DefinitionKind def_kind () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Return our definition kind. virtual void destroy () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Remove the repository entry. virtual void destroy_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual CORBA::TypeCode_ptr type () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From IDLType_i's pure virtual function. virtual CORBA::ULong bound () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; CORBA::ULong bound_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual void bound ( CORBA::ULong bound) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; void bound_i ( CORBA::ULong bound) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp index 08257683595..96499913af6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp @@ -30,14 +30,12 @@ TAO_StructDef_i::~TAO_StructDef_i (void) CORBA::DefinitionKind TAO_StructDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Struct; } void TAO_StructDef_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -48,7 +46,6 @@ TAO_StructDef_i::destroy (void) void TAO_StructDef_i::destroy_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our members. TAO_Container_i::destroy_i (); @@ -59,7 +56,6 @@ TAO_StructDef_i::destroy_i (void) CORBA::TypeCode_ptr TAO_StructDef_i::type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -70,7 +66,6 @@ TAO_StructDef_i::type (void) CORBA::TypeCode_ptr TAO_StructDef_i::type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -110,7 +105,6 @@ TAO_StructDef_i::type_i (void) CORBA::StructMemberSeq * TAO_StructDef_i::members (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -121,7 +115,6 @@ TAO_StructDef_i::members (void) CORBA::StructMemberSeq * TAO_StructDef_i::members_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue; ACE_Unbounded_Queue<ACE_TString> path_queue; @@ -241,7 +234,6 @@ TAO_StructDef_i::members_i (void) void TAO_StructDef_i::members (const CORBA::StructMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -252,7 +244,6 @@ TAO_StructDef_i::members (const CORBA::StructMemberSeq &members) void TAO_StructDef_i::members_i (const CORBA::StructMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our old members, both refs and defns. TAO_Container_i::destroy_i (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h index ede4b8371f8..cb353ea3f64 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h @@ -53,46 +53,37 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Return our definition kind. virtual void destroy () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Remove the repository entry and its contents. virtual void destroy_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual CORBA::TypeCode_ptr type () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From IDLType_i's pure virtual function. virtual CORBA::StructMemberSeq *members () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; CORBA::StructMemberSeq *members_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual void members ( const CORBA::StructMemberSeq &members) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; void members_i ( const CORBA::StructMemberSeq &members) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp index bf8052c6d64..676a6edffc4 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp @@ -27,7 +27,6 @@ TAO_TypedefDef_i::~TAO_TypedefDef_i (void) CORBA::Contained::Description * TAO_TypedefDef_i::describe (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -38,7 +37,6 @@ TAO_TypedefDef_i::describe (void) CORBA::Contained::Description * TAO_TypedefDef_i::describe_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h index 2bf952d08ca..db81dd0a43b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h @@ -54,13 +54,11 @@ public: // Destructor virtual CORBA::Contained::Description *describe () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From Contained_i's pure virtual function. virtual CORBA::Contained::Description *describe_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From Contained_i's pure virtual function. }; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp index a4a4e3c4785..eb2a8ecb860 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp @@ -33,14 +33,12 @@ TAO_UnionDef_i::~TAO_UnionDef_i (void) CORBA::DefinitionKind TAO_UnionDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Union; } void TAO_UnionDef_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -51,7 +49,6 @@ TAO_UnionDef_i::destroy (void) void TAO_UnionDef_i::destroy_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our members. TAO_Container_i::destroy_i (); @@ -62,7 +59,6 @@ TAO_UnionDef_i::destroy_i (void) CORBA::TypeCode_ptr TAO_UnionDef_i::type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -73,7 +69,6 @@ TAO_UnionDef_i::type (void) CORBA::TypeCode_ptr TAO_UnionDef_i::type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -116,7 +111,6 @@ TAO_UnionDef_i::type_i (void) CORBA::TypeCode_ptr TAO_UnionDef_i::discriminator_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -127,7 +121,6 @@ TAO_UnionDef_i::discriminator_type (void) CORBA::TypeCode_ptr TAO_UnionDef_i::discriminator_type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString disc_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -147,7 +140,6 @@ TAO_UnionDef_i::discriminator_type_i (void) CORBA::IDLType_ptr TAO_UnionDef_i::discriminator_type_def (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -158,7 +150,6 @@ TAO_UnionDef_i::discriminator_type_def (void) CORBA::IDLType_ptr TAO_UnionDef_i::discriminator_type_def_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString disc_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -176,7 +167,6 @@ void TAO_UnionDef_i::discriminator_type_def ( CORBA::IDLType_ptr discriminator_type_def ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -189,7 +179,6 @@ void TAO_UnionDef_i::discriminator_type_def_i ( CORBA::IDLType_ptr discriminator_type_def ) - ACE_THROW_SPEC ((CORBA::SystemException)) { char *disc_path = TAO_IFR_Service_Utils::reference_to_path (discriminator_type_def); @@ -201,7 +190,6 @@ TAO_UnionDef_i::discriminator_type_def_i ( CORBA::UnionMemberSeq * TAO_UnionDef_i::members (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -212,7 +200,6 @@ TAO_UnionDef_i::members (void) CORBA::UnionMemberSeq * TAO_UnionDef_i::members_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue; @@ -316,7 +303,6 @@ TAO_UnionDef_i::members_i (void) void TAO_UnionDef_i::members (const CORBA::UnionMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -327,7 +313,6 @@ TAO_UnionDef_i::members (const CORBA::UnionMemberSeq &members) void TAO_UnionDef_i::members_i (const CORBA::UnionMemberSeq &members) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our old members, both refs and defns. TAO_Container_i::destroy_i (); @@ -377,7 +362,6 @@ TAO_UnionDef_i::members_i (const CORBA::UnionMemberSeq &members) void TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key, CORBA::UnionMember &member) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Configuration::VALUETYPE vt; this->repo_->config ()->find_value (member_key, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h index b29dba18492..fa6681d7940 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h @@ -53,78 +53,62 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Return our definition kind. virtual void destroy () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Remove the repository entry and its contents. virtual void destroy_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual CORBA::TypeCode_ptr type () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr discriminator_type () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; CORBA::TypeCode_ptr discriminator_type_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual CORBA::IDLType_ptr discriminator_type_def () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; CORBA::IDLType_ptr discriminator_type_def_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual void discriminator_type_def ( CORBA::IDLType_ptr discriminator_type_def) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; void discriminator_type_def_i ( CORBA::IDLType_ptr discriminator_type_def) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual CORBA::UnionMemberSeq *members () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; CORBA::UnionMemberSeq *members_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual void members ( const CORBA::UnionMemberSeq &members) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; void members_i ( const CORBA::UnionMemberSeq &members) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; private: void fetch_label ( const ACE_Configuration_Section_Key member_key, - CORBA::UnionMember &member) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::UnionMember &member); // Used by members() to get each member's label value. }; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp index c9505d4e842..983fc16f60d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp @@ -26,14 +26,12 @@ TAO_UsesDef_i::~TAO_UsesDef_i (void) CORBA::DefinitionKind TAO_UsesDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Uses; } CORBA::Contained::Description * TAO_UsesDef_i::describe (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -44,7 +42,6 @@ TAO_UsesDef_i::describe (void) CORBA::Contained::Description * TAO_UsesDef_i::describe_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ComponentIR::UsesDescription ud; TAO_IFR_Desc_Utils<CORBA::ComponentIR::UsesDescription, @@ -73,7 +70,6 @@ TAO_UsesDef_i::describe_i (void) CORBA::InterfaceDef_ptr TAO_UsesDef_i::interface_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::InterfaceDef::_nil ()); @@ -84,7 +80,6 @@ TAO_UsesDef_i::interface_type (void) CORBA::InterfaceDef_ptr TAO_UsesDef_i::interface_type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString holder; this->repo_->config ()->get_string_value (this->section_key_, @@ -104,7 +99,6 @@ void TAO_UsesDef_i::interface_type ( CORBA::InterfaceDef_ptr interface_type ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -117,7 +111,6 @@ void TAO_UsesDef_i::interface_type_i ( CORBA::InterfaceDef_ptr interface_type ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->remove_value (this->section_key_, "base_type"); @@ -150,7 +143,6 @@ TAO_UsesDef_i::interface_type_i ( CORBA::Boolean TAO_UsesDef_i::is_multiple (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -161,7 +153,6 @@ TAO_UsesDef_i::is_multiple (void) CORBA::Boolean TAO_UsesDef_i::is_multiple_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong val = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -174,7 +165,6 @@ void TAO_UsesDef_i::is_multiple ( CORBA::Boolean is_multiple ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -187,7 +177,6 @@ void TAO_UsesDef_i::is_multiple_i ( CORBA::Boolean is_multiple ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_integer_value (this->section_key_, "is_multiple", diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h index 7041e0200d1..8ddbbe8e8fa 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h @@ -51,55 +51,44 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Return our definition kind. virtual CORBA::Contained::Description *describe ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From Contained_i's pure virtual function. virtual CORBA::Contained::Description *describe_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From Contained_i's pure virtual function. virtual CORBA::InterfaceDef_ptr interface_type ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void interface_type ( CORBA::InterfaceDef_ptr interface_type - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void interface_type_i ( CORBA::InterfaceDef_ptr interface_type - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::InterfaceDef_ptr interface_type_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::Boolean is_multiple ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::Boolean is_multiple_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void is_multiple ( CORBA::Boolean is_multiple - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void is_multiple_i ( CORBA::Boolean is_multiple - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp index 286aefa3e47..b8d4422d08c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp @@ -30,14 +30,12 @@ TAO_ValueBoxDef_i::~TAO_ValueBoxDef_i (void) CORBA::DefinitionKind TAO_ValueBoxDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_ValueBox; } CORBA::TypeCode_ptr TAO_ValueBoxDef_i::type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -48,7 +46,6 @@ TAO_ValueBoxDef_i::type (void) CORBA::TypeCode_ptr TAO_ValueBoxDef_i::type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -78,7 +75,6 @@ TAO_ValueBoxDef_i::type_i (void) CORBA::IDLType_ptr TAO_ValueBoxDef_i::original_type_def (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -89,7 +85,6 @@ TAO_ValueBoxDef_i::original_type_def (void) CORBA::IDLType_ptr TAO_ValueBoxDef_i::original_type_def_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString boxed_type_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -105,7 +100,6 @@ TAO_ValueBoxDef_i::original_type_def_i (void) void TAO_ValueBoxDef_i::original_type_def (CORBA::IDLType_ptr original_type_def) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -116,7 +110,6 @@ TAO_ValueBoxDef_i::original_type_def (CORBA::IDLType_ptr original_type_def) void TAO_ValueBoxDef_i::original_type_def_i (CORBA::IDLType_ptr original_type_def) - ACE_THROW_SPEC ((CORBA::SystemException)) { char *boxed_type = TAO_IFR_Service_Utils::reference_to_path (original_type_def); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h index ae7d26a8803..f7568c14ef2 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h @@ -52,37 +52,30 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Return our definition kind. virtual CORBA::TypeCode_ptr type () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From IDLType_i's pure virtual function. virtual CORBA::IDLType_ptr original_type_def () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; CORBA::IDLType_ptr original_type_def_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual void original_type_def ( CORBA::IDLType_ptr original_type_def) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; void original_type_def_i ( CORBA::IDLType_ptr original_type_def) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp index 89cfe35d91f..b6816228a5e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp @@ -30,14 +30,12 @@ TAO_ValueDef_i::~TAO_ValueDef_i (void) CORBA::DefinitionKind TAO_ValueDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Value; } void TAO_ValueDef_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -48,7 +46,6 @@ TAO_ValueDef_i::destroy (void) void TAO_ValueDef_i::destroy_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->TAO_Container_i::destroy_i (); @@ -71,7 +68,6 @@ TAO_ValueDef_i::destroy_i (void) CORBA::Contained::Description * TAO_ValueDef_i::describe (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -82,7 +78,6 @@ TAO_ValueDef_i::describe (void) CORBA::Contained::Description * TAO_ValueDef_i::describe_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ValueDescription *vd = 0; ACE_NEW_RETURN (vd, @@ -104,7 +99,6 @@ TAO_ValueDef_i::describe_i (void) CORBA::TypeCode_ptr TAO_ValueDef_i::type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -115,7 +109,6 @@ TAO_ValueDef_i::type (void) CORBA::TypeCode_ptr TAO_ValueDef_i::type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { /// Since valuetype type codes may encapsultate the type code of a /// base class, this call could be recursive, with the @@ -128,7 +121,6 @@ TAO_ValueDef_i::type_i (void) CORBA::InterfaceDefSeq * TAO_ValueDef_i::supported_interfaces (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -139,7 +131,6 @@ TAO_ValueDef_i::supported_interfaces (void) CORBA::InterfaceDefSeq * TAO_ValueDef_i::supported_interfaces_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::InterfaceDefSeq *seq = 0; ACE_NEW_RETURN (seq, @@ -191,7 +182,6 @@ void TAO_ValueDef_i::supported_interfaces ( const CORBA::InterfaceDefSeq &supported_interfaces ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -204,7 +194,6 @@ void TAO_ValueDef_i::supported_interfaces_i ( const CORBA::InterfaceDefSeq &supported_interfaces ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->remove_section (this->section_key_, "supported", @@ -276,7 +265,6 @@ TAO_ValueDef_i::supported_interfaces_i ( CORBA::InitializerSeq * TAO_ValueDef_i::initializers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -287,7 +275,6 @@ TAO_ValueDef_i::initializers (void) CORBA::InitializerSeq * TAO_ValueDef_i::initializers_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::InitializerSeq *iseq = 0; ACE_NEW_RETURN (iseq, @@ -381,7 +368,6 @@ TAO_ValueDef_i::initializers_i (void) void TAO_ValueDef_i::initializers (const CORBA::InitializerSeq &initializers) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -392,7 +378,6 @@ TAO_ValueDef_i::initializers (const CORBA::InitializerSeq &initializers) void TAO_ValueDef_i::initializers_i (const CORBA::InitializerSeq &initializers) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->remove_section (this->section_key_, "initializers", @@ -406,7 +391,6 @@ TAO_ValueDef_i::initializers_i (const CORBA::InitializerSeq &initializers) CORBA::ValueDef_ptr TAO_ValueDef_i::base_value (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::ValueDef::_nil ()); @@ -417,7 +401,6 @@ TAO_ValueDef_i::base_value (void) CORBA::ValueDef_ptr TAO_ValueDef_i::base_value_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString holder; int status = @@ -442,7 +425,6 @@ TAO_ValueDef_i::base_value_i (void) void TAO_ValueDef_i::base_value (CORBA::ValueDef_ptr base_value) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -453,7 +435,6 @@ TAO_ValueDef_i::base_value (CORBA::ValueDef_ptr base_value) void TAO_ValueDef_i::base_value_i (CORBA::ValueDef_ptr base_value) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (base_value)) { @@ -488,7 +469,6 @@ TAO_ValueDef_i::base_value_i (CORBA::ValueDef_ptr base_value) CORBA::ValueDefSeq * TAO_ValueDef_i::abstract_base_values (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -499,7 +479,6 @@ TAO_ValueDef_i::abstract_base_values (void) CORBA::ValueDefSeq * TAO_ValueDef_i::abstract_base_values_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ValueDefSeq *vd_seq = 0; ACE_NEW_RETURN (vd_seq, @@ -551,7 +530,6 @@ void TAO_ValueDef_i::abstract_base_values ( const CORBA::ValueDefSeq &abstract_base_values ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -564,7 +542,6 @@ void TAO_ValueDef_i::abstract_base_values_i ( const CORBA::ValueDefSeq &abstract_base_values ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->remove_section (this->section_key_, "abstract_bases", @@ -619,7 +596,6 @@ TAO_ValueDef_i::abstract_base_values_i ( CORBA::Boolean TAO_ValueDef_i::is_abstract (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -630,7 +606,6 @@ TAO_ValueDef_i::is_abstract (void) CORBA::Boolean TAO_ValueDef_i::is_abstract_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong is_it = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -641,7 +616,6 @@ TAO_ValueDef_i::is_abstract_i (void) void TAO_ValueDef_i::is_abstract (CORBA::Boolean is_abstract) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -652,7 +626,6 @@ TAO_ValueDef_i::is_abstract (CORBA::Boolean is_abstract) void TAO_ValueDef_i::is_abstract_i (CORBA::Boolean is_abstract) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_integer_value ( this->section_key_, @@ -662,7 +635,6 @@ TAO_ValueDef_i::is_abstract_i (CORBA::Boolean is_abstract) CORBA::Boolean TAO_ValueDef_i::is_custom (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -673,7 +645,6 @@ TAO_ValueDef_i::is_custom (void) CORBA::Boolean TAO_ValueDef_i::is_custom_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong is_it = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -684,7 +655,6 @@ TAO_ValueDef_i::is_custom_i (void) void TAO_ValueDef_i::is_custom (CORBA::Boolean is_custom) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -695,7 +665,6 @@ TAO_ValueDef_i::is_custom (CORBA::Boolean is_custom) void TAO_ValueDef_i::is_custom_i (CORBA::Boolean is_custom) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_integer_value ( this->section_key_, @@ -705,7 +674,6 @@ TAO_ValueDef_i::is_custom_i (CORBA::Boolean is_custom) CORBA::Boolean TAO_ValueDef_i::is_truncatable (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -716,7 +684,6 @@ TAO_ValueDef_i::is_truncatable (void) CORBA::Boolean TAO_ValueDef_i::is_truncatable_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong is_it = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -727,7 +694,6 @@ TAO_ValueDef_i::is_truncatable_i (void) void TAO_ValueDef_i::is_truncatable (CORBA::Boolean is_truncatable) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -738,7 +704,6 @@ TAO_ValueDef_i::is_truncatable (CORBA::Boolean is_truncatable) void TAO_ValueDef_i::is_truncatable_i (CORBA::Boolean is_truncatable) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_integer_value ( this->section_key_, @@ -748,7 +713,6 @@ TAO_ValueDef_i::is_truncatable_i (CORBA::Boolean is_truncatable) CORBA::Boolean TAO_ValueDef_i::is_a (const char *id) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -759,7 +723,6 @@ TAO_ValueDef_i::is_a (const char *id) CORBA::Boolean TAO_ValueDef_i::is_a_i (const char *id) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (ACE_OS::strcmp (id, "IDL:omg.org/CORBA/ValueBase:1.0") == 0) { @@ -835,7 +798,6 @@ TAO_ValueDef_i::is_a_i (const char *id) CORBA::ValueDef::FullValueDescription * TAO_ValueDef_i::describe_value (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -846,7 +808,6 @@ TAO_ValueDef_i::describe_value (void) CORBA::ValueDef::FullValueDescription * TAO_ValueDef_i::describe_value_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ValueDef::FullValueDescription *fv_desc = 0; ACE_NEW_RETURN (fv_desc, @@ -1317,7 +1278,6 @@ TAO_ValueDef_i::create_value_member (const char *id, const char *version, CORBA::IDLType_ptr type, CORBA::Visibility access) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ValueMemberDef::_nil ()); @@ -1336,7 +1296,6 @@ TAO_ValueDef_i::create_value_member_i (const char *id, const char *version, CORBA::IDLType_ptr type, CORBA::Visibility access) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Container_i::tmp_name_holder_ = name; ACE_Configuration_Section_Key new_key; @@ -1386,7 +1345,6 @@ TAO_ValueDef_i::create_attribute ( CORBA::IDLType_ptr type, CORBA::AttributeMode mode ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::AttributeDef::_nil ()); @@ -1407,7 +1365,6 @@ TAO_ValueDef_i::create_attribute_i ( CORBA::IDLType_ptr type, CORBA::AttributeMode mode ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Container_i::tmp_name_holder_ = name; ACE_Configuration_Section_Key new_key; @@ -1460,7 +1417,6 @@ TAO_ValueDef_i::create_operation ( const CORBA::ExceptionDefSeq &exceptions, const CORBA::ContextIdSeq &contexts ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::OperationDef::_nil ()); @@ -1487,7 +1443,6 @@ TAO_ValueDef_i::create_operation_i ( const CORBA::ExceptionDefSeq &exceptions, const CORBA::ContextIdSeq &contexts ) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Container_i::tmp_name_holder_ = name; ACE_Configuration_Section_Key new_key; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h index 3d1f3fd3049..1cb58d87332 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h @@ -54,182 +54,143 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Return our definition kind. virtual void destroy ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // Remove the repository entry. virtual void destroy_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::Contained::Description *describe ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From Contained_i's pure virtual function. virtual CORBA::Contained::Description *describe_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr type ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // From IDLType_i's pure virtual function. virtual CORBA::InterfaceDefSeq *supported_interfaces ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::InterfaceDefSeq *supported_interfaces_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void supported_interfaces ( const CORBA::InterfaceDefSeq & supported_interfaces - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void supported_interfaces_i ( const CORBA::InterfaceDefSeq & supported_interfaces - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::InitializerSeq *initializers ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::InitializerSeq *initializers_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void initializers ( const CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void initializers_i ( const CORBA::InitializerSeq & initializers - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ValueDef_ptr base_value ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ValueDef_ptr base_value_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void base_value ( CORBA::ValueDef_ptr base_value - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void base_value_i ( CORBA::ValueDef_ptr base_value - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ValueDefSeq *abstract_base_values ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ValueDefSeq *abstract_base_values_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void abstract_base_values ( const CORBA::ValueDefSeq & abstract_base_values - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void abstract_base_values_i ( const CORBA::ValueDefSeq & abstract_base_values - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::Boolean is_abstract ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::Boolean is_abstract_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void is_abstract ( CORBA::Boolean is_abstract - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void is_abstract_i ( CORBA::Boolean is_abstract - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::Boolean is_custom ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::Boolean is_custom_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void is_custom ( CORBA::Boolean is_custom - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void is_custom_i ( CORBA::Boolean is_custom - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::Boolean is_truncatable ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::Boolean is_truncatable_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void is_truncatable ( CORBA::Boolean is_truncatable - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void is_truncatable_i ( CORBA::Boolean is_truncatable - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::Boolean is_a ( const char *id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::Boolean is_a_i ( const char *id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ValueDef::FullValueDescription *describe_value ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ValueDef::FullValueDescription *describe_value_i ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::ValueMemberDef_ptr create_value_member ( const char *id, @@ -237,8 +198,7 @@ public: const char *version, CORBA::IDLType_ptr type, CORBA::Visibility access - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::ValueMemberDef_ptr create_value_member_i ( const char *id, @@ -246,8 +206,7 @@ public: const char *version, CORBA::IDLType_ptr type, CORBA::Visibility access - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::AttributeDef_ptr create_attribute ( const char *id, @@ -255,8 +214,7 @@ public: const char *version, CORBA::IDLType_ptr type, CORBA::AttributeMode mode - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::AttributeDef_ptr create_attribute_i ( const char *id, @@ -264,8 +222,7 @@ public: const char *version, CORBA::IDLType_ptr type, CORBA::AttributeMode mode - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual CORBA::OperationDef_ptr create_operation ( const char *id, @@ -276,8 +233,7 @@ public: const CORBA::ParDescriptionSeq ¶ms, const CORBA::ExceptionDefSeq &exceptions, const CORBA::ContextIdSeq &contexts - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); CORBA::OperationDef_ptr create_operation_i ( const char *id, @@ -288,8 +244,7 @@ public: const CORBA::ParDescriptionSeq ¶ms, const CORBA::ExceptionDefSeq &exceptions, const CORBA::ContextIdSeq &contexts - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); static int name_clash (const char *name); // Called from TAO_IFR_Service_Utils::name_exists() when we diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp index 005edee0cd1..3403dbd29f7 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp @@ -29,14 +29,12 @@ TAO_ValueMemberDef_i::~TAO_ValueMemberDef_i (void) CORBA::DefinitionKind TAO_ValueMemberDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_ValueMember; } CORBA::Contained::Description * TAO_ValueMemberDef_i::describe (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -47,7 +45,6 @@ TAO_ValueMemberDef_i::describe (void) CORBA::Contained::Description * TAO_ValueMemberDef_i::describe_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ValueMember vm; TAO_IFR_Desc_Utils<CORBA::ValueMember, @@ -87,7 +84,6 @@ TAO_ValueMemberDef_i::describe_i (void) CORBA::TypeCode_ptr TAO_ValueMemberDef_i::type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -98,7 +94,6 @@ TAO_ValueMemberDef_i::type (void) CORBA::TypeCode_ptr TAO_ValueMemberDef_i::type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString holder; this->repo_->config ()->get_string_value (this->section_key_, @@ -112,7 +107,6 @@ TAO_ValueMemberDef_i::type_i (void) CORBA::IDLType_ptr TAO_ValueMemberDef_i::type_def (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -123,7 +117,6 @@ TAO_ValueMemberDef_i::type_def (void) CORBA::IDLType_ptr TAO_ValueMemberDef_i::type_def_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString holder; this->repo_->config ()->get_string_value (this->section_key_, @@ -138,7 +131,6 @@ TAO_ValueMemberDef_i::type_def_i (void) void TAO_ValueMemberDef_i::type_def (CORBA::IDLType_ptr type_def) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -149,7 +141,6 @@ TAO_ValueMemberDef_i::type_def (CORBA::IDLType_ptr type_def) void TAO_ValueMemberDef_i::type_def_i (CORBA::IDLType_ptr type_def) - ACE_THROW_SPEC ((CORBA::SystemException)) { const char *path = TAO_IFR_Service_Utils::reference_to_path (type_def); this->repo_->config ()->set_string_value (this->section_key_, @@ -159,7 +150,6 @@ TAO_ValueMemberDef_i::type_def_i (CORBA::IDLType_ptr type_def) CORBA::Visibility TAO_ValueMemberDef_i::access (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -170,7 +160,6 @@ TAO_ValueMemberDef_i::access (void) CORBA::Visibility TAO_ValueMemberDef_i::access_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong val = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -181,7 +170,6 @@ TAO_ValueMemberDef_i::access_i (void) void TAO_ValueMemberDef_i::access (CORBA::Visibility access) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -192,7 +180,6 @@ TAO_ValueMemberDef_i::access (CORBA::Visibility access) void TAO_ValueMemberDef_i::access_i (CORBA::Visibility access) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_integer_value (this->section_key_, "access", diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h index 45137157c14..5bf36db0728 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h @@ -51,63 +51,50 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Return our definition kind. virtual CORBA::Contained::Description *describe () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From Contained_i's pure virtual function. virtual CORBA::Contained::Description *describe_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr type () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; CORBA::TypeCode_ptr type_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual CORBA::IDLType_ptr type_def () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; CORBA::IDLType_ptr type_def_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual void type_def ( CORBA::IDLType_ptr type_def) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; void type_def_i ( CORBA::IDLType_ptr type_def) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual CORBA::Visibility access () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; CORBA::Visibility access_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual void access ( CORBA::Visibility access) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; void access_i ( CORBA::Visibility access) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp index 0e40d0dd1ec..d603e93e435 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp @@ -26,14 +26,12 @@ TAO_WstringDef_i::~TAO_WstringDef_i (void) CORBA::DefinitionKind TAO_WstringDef_i::def_kind (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Wstring; } void TAO_WstringDef_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -44,7 +42,6 @@ TAO_WstringDef_i::destroy (void) void TAO_WstringDef_i::destroy_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString name; this->repo_->config ()->get_string_value (this->section_key_, @@ -58,7 +55,6 @@ TAO_WstringDef_i::destroy_i (void) CORBA::TypeCode_ptr TAO_WstringDef_i::type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -69,7 +65,6 @@ TAO_WstringDef_i::type (void) CORBA::TypeCode_ptr TAO_WstringDef_i::type_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong bound = this->bound_i (); @@ -77,7 +72,6 @@ TAO_WstringDef_i::type_i (void) } CORBA::ULong TAO_WstringDef_i::bound (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -89,7 +83,6 @@ TAO_WstringDef_i::bound (void) CORBA::ULong TAO_WstringDef_i::bound_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { u_int retval = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -101,7 +94,6 @@ TAO_WstringDef_i::bound_i (void) void TAO_WstringDef_i::bound (CORBA::ULong bound) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -112,7 +104,6 @@ TAO_WstringDef_i::bound (CORBA::ULong bound) void TAO_WstringDef_i::bound_i (CORBA::ULong bound) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_integer_value (this->section_key_, "bound", diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h index 6e41ff96d89..9e2b1397fa0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h @@ -52,46 +52,37 @@ public: // Destructor. virtual CORBA::DefinitionKind def_kind () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Return our definition kind. virtual void destroy () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // Remove the repository entry. virtual void destroy_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual CORBA::TypeCode_ptr type () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From IDLType_i's virtual function. virtual CORBA::TypeCode_ptr type_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; // From IDLType_i's virtual function. virtual CORBA::ULong bound () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; CORBA::ULong bound_i () - - ACE_THROW_SPEC ((CORBA::SystemException)); +; virtual void bound ( CORBA::ULong bound) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; void bound_i ( CORBA::ULong bound) - - ACE_THROW_SPEC ((CORBA::SystemException)); +; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp index b64c252a9b1..94c2b13c87a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp @@ -61,7 +61,6 @@ TAO_LB_CPU_Load_Average_Monitor::~TAO_LB_CPU_Load_Average_Monitor (void) CosLoadBalancing::Location * TAO_LB_CPU_Load_Average_Monitor::the_location (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosLoadBalancing::Location * location; ACE_NEW_THROW_EX (location, @@ -77,7 +76,6 @@ TAO_LB_CPU_Load_Average_Monitor::the_location (void) CosLoadBalancing::LoadList * TAO_LB_CPU_Load_Average_Monitor::loads (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Float load = 0; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h index 035a41a37dc..7dc97095d66 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h @@ -63,8 +63,7 @@ public: /** * The returned "Location" is a sequence of length 1. */ - virtual CosLoadBalancing::Location * the_location () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosLoadBalancing::Location * the_location (); /// Return the average CPU load at the location which this /// LoadMonitor resides. @@ -73,8 +72,7 @@ public: * equal to CosLoadBalancing::LoadAverage, and the average CPU * load. */ - virtual CosLoadBalancing::LoadList * loads () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosLoadBalancing::LoadList * loads (); //@} diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp index f6c9ab4202f..6af2f8c23c0 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp @@ -111,7 +111,6 @@ TAO_LB_CPU_Utilization_Monitor::~TAO_LB_CPU_Utilization_Monitor (void) CosLoadBalancing::Location * TAO_LB_CPU_Utilization_Monitor::the_location (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosLoadBalancing::Location * location; ACE_NEW_THROW_EX (location, @@ -127,7 +126,6 @@ TAO_LB_CPU_Utilization_Monitor::the_location (void) CosLoadBalancing::LoadList * TAO_LB_CPU_Utilization_Monitor::loads (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Float load = 0; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h index ea3431fa897..d7e8e281494 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h @@ -60,8 +60,7 @@ public: /** * The returned "Location" is a sequence of length 1. */ - virtual CosLoadBalancing::Location * the_location () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosLoadBalancing::Location * the_location (); /// Return the average CPU load at the location which this /// LoadMonitor resides. @@ -70,8 +69,7 @@ public: * equal to CosLoadBalancing::LoadAverage, and the average CPU * load. */ - virtual CosLoadBalancing::LoadList * loads () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosLoadBalancing::LoadList * loads (); //@} diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp index 3fb67cb6dd4..06ef0a6907c 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp @@ -12,14 +12,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO_LB_ClientORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO_LB_ClientORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ClientRequestInterceptor_ptr tmp; ACE_NEW_THROW_EX (tmp, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h index ae4b5b53b76..5e954707386 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h @@ -56,11 +56,9 @@ public: * interface. */ //@{ - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); //@} }; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp index f66ac874705..97a45fd32fb 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp @@ -11,22 +11,18 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL char * TAO_LB_ClientRequestInterceptor::name () - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("TAO_LB_ClientRequestInterceptor"); } void TAO_LB_ClientRequestInterceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO_LB_ClientRequestInterceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { /* CORBA::Object_var t = ri->target (); @@ -75,30 +71,24 @@ TAO_LB_ClientRequestInterceptor::send_request ( void TAO_LB_ClientRequestInterceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO_LB_ClientRequestInterceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO_LB_ClientRequestInterceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void TAO_LB_ClientRequestInterceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h index 900293f53f6..a20986f4f6d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h @@ -68,34 +68,24 @@ public: */ //@{ /// Return the name of this ClientRequestInterceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void send_poll ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ClientRequestInfo_ptr ri); //@} }; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp index b426519dec2..fefb7cd4a69 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp @@ -31,14 +31,12 @@ TAO_LB_IORInterceptor::TAO_LB_IORInterceptor ( char * TAO_LB_IORInterceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("TAO_LB_IORInterceptor"); } void TAO_LB_IORInterceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Force the LoadManager reference to be released since the ORB's // lifetime is tied to object reference lifetimes. @@ -48,14 +46,12 @@ TAO_LB_IORInterceptor::destroy (void) void TAO_LB_IORInterceptor::establish_components ( PortableInterceptor::IORInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO_LB_IORInterceptor::components_established ( PortableInterceptor::IORInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { int argc = 0; CORBA::ORB_var orb = CORBA::ORB_init (argc, @@ -89,7 +85,6 @@ void TAO_LB_IORInterceptor::adapter_manager_state_changed ( const char *, PortableInterceptor::AdapterState state) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (state == PortableInterceptor::ACTIVE) { @@ -101,7 +96,6 @@ void TAO_LB_IORInterceptor::adapter_state_changed ( const PortableInterceptor::ObjectReferenceTemplateSeq &, PortableInterceptor::AdapterState state) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (state == PortableInterceptor::ACTIVE) { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h index b3d2481831d..aa22bfd1059 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h @@ -71,37 +71,25 @@ public: */ //@{ /// Return the name of this IORInterceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); /// Cleanup resources acquired by this IORInterceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); /// Add the tagged components to the IOR. virtual void establish_components ( - PortableInterceptor::IORInfo_ptr info) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + PortableInterceptor::IORInfo_ptr info); virtual void components_established ( - PortableInterceptor::IORInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::IORInfo_ptr info); virtual void adapter_manager_state_changed ( const char * id, - PortableInterceptor::AdapterState state) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + PortableInterceptor::AdapterState state); virtual void adapter_state_changed ( const PortableInterceptor::ObjectReferenceTemplateSeq & templates, - PortableInterceptor::AdapterState state) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + PortableInterceptor::AdapterState state); //@} diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp index 0e31588a9bb..7aa42d2bba7 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp @@ -54,14 +54,12 @@ TAO_LB_LeastLoaded::~TAO_LB_LeastLoaded (void) char * TAO_LB_LeastLoaded::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("LeastLoaded"); } CosLoadBalancing::Properties * TAO_LB_LeastLoaded::get_properties (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosLoadBalancing::Properties * props = 0; ACE_NEW_THROW_EX (props, @@ -79,7 +77,6 @@ void TAO_LB_LeastLoaded::push_loads ( const PortableGroup::Location & the_location, const CosLoadBalancing::LoadList & loads) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Only the first load is used by this load balancing strategy. if (loads.length () == 0) @@ -153,8 +150,6 @@ TAO_LB_LeastLoaded::push_loads ( CosLoadBalancing::LoadList * TAO_LB_LeastLoaded::get_loads (CosLoadBalancing::LoadManager_ptr load_manager, const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::LocationNotFound)) { if (CORBA::is_nil (load_manager)) throw CORBA::BAD_PARAM (); @@ -174,9 +169,6 @@ CORBA::Object_ptr TAO_LB_LeastLoaded::next_member ( PortableGroup::ObjectGroup_ptr object_group, CosLoadBalancing::LoadManager_ptr load_manager) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)) { if (CORBA::is_nil (load_manager)) throw CORBA::BAD_PARAM (); @@ -227,7 +219,6 @@ void TAO_LB_LeastLoaded::analyze_loads ( PortableGroup::ObjectGroup_ptr object_group, CosLoadBalancing::LoadManager_ptr load_manager) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (load_manager)) throw CORBA::BAD_PARAM (); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h index 73d3715b1a3..b4f2509debf 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h @@ -87,34 +87,25 @@ public: * Methods required by the CosLoadBalancing::Strategy interface. */ //@{ - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual CosLoadBalancing::Properties * get_properties () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosLoadBalancing::Properties * get_properties (); virtual void push_loads ( const PortableGroup::Location & the_location, - const CosLoadBalancing::LoadList & loads) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CosLoadBalancing::LoadList & loads); virtual CosLoadBalancing::LoadList * get_loads ( CosLoadBalancing::LoadManager_ptr load_manager, - const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::LocationNotFound)); + const PortableGroup::Location & the_location); virtual CORBA::Object_ptr next_member ( PortableGroup::ObjectGroup_ptr object_group, - CosLoadBalancing::LoadManager_ptr load_manager) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)); + CosLoadBalancing::LoadManager_ptr load_manager); virtual void analyze_loads ( PortableGroup::ObjectGroup_ptr object_group, - CosLoadBalancing::LoadManager_ptr load_manager) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosLoadBalancing::LoadManager_ptr load_manager); //@} /// Returns the default POA for this servant. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp index 56b62f8a780..75794766a04 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp @@ -23,7 +23,6 @@ TAO_LB_LoadAlert::~TAO_LB_LoadAlert (void) void TAO_LB_LoadAlert::enable_alert (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_); @@ -32,7 +31,6 @@ TAO_LB_LoadAlert::enable_alert (void) void TAO_LB_LoadAlert::disable_alert (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h index d4f2ecb6ddc..c84f325033b 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h @@ -43,12 +43,10 @@ public: /// Forward requests back to the load manager via the object group /// reference. - virtual void enable_alert (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void enable_alert (void); /// Stop forwarding requests, and begin accepting them again. - virtual void disable_alert (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disable_alert (void); //@} diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp index 1ce94dba907..dad51762f88 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp @@ -15,14 +15,12 @@ TAO_LB_LoadAlert_Handler::~TAO_LB_LoadAlert_Handler (void) void TAO_LB_LoadAlert_Handler::enable_alert (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO_LB_LoadAlert_Handler::enable_alert_excep ( ::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, @@ -32,14 +30,12 @@ TAO_LB_LoadAlert_Handler::enable_alert_excep ( void TAO_LB_LoadAlert_Handler::disable_alert (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO_LB_LoadAlert_Handler::disable_alert_excep ( ::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h index 7168d127bcd..9523f02abc5 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h @@ -43,19 +43,15 @@ class TAO_LB_LoadAlert_Handler { public: - virtual void enable_alert (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void enable_alert (void); virtual void enable_alert_excep ( - ::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::Messaging::ExceptionHolder *); - virtual void disable_alert (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disable_alert (void); virtual void disable_alert_excep ( - ::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::Messaging::ExceptionHolder *); protected: diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp index 378f0b7ca41..eea89c9641d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp @@ -52,14 +52,12 @@ TAO_LB_LoadAverage::~TAO_LB_LoadAverage (void) char * TAO_LB_LoadAverage::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("LoadAverage"); } CosLoadBalancing::Properties * TAO_LB_LoadAverage::get_properties (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosLoadBalancing::Properties * props = 0; ACE_NEW_THROW_EX (props, @@ -77,7 +75,6 @@ void TAO_LB_LoadAverage::push_loads ( const PortableGroup::Location & the_location, const CosLoadBalancing::LoadList & loads) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Only the first load is used by this load balancing strategy. if (loads.length () == 0) @@ -151,8 +148,6 @@ TAO_LB_LoadAverage::push_loads ( CosLoadBalancing::LoadList * TAO_LB_LoadAverage::get_loads (CosLoadBalancing::LoadManager_ptr load_manager, const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::LocationNotFound)) { if (CORBA::is_nil (load_manager)) throw CORBA::BAD_PARAM (); @@ -172,9 +167,6 @@ CORBA::Object_ptr TAO_LB_LoadAverage::next_member ( PortableGroup::ObjectGroup_ptr object_group, CosLoadBalancing::LoadManager_ptr load_manager) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)) { if (CORBA::is_nil (load_manager)) throw CORBA::BAD_PARAM (); @@ -197,7 +189,6 @@ void TAO_LB_LoadAverage::analyze_loads ( PortableGroup::ObjectGroup_ptr object_group, CosLoadBalancing::LoadManager_ptr load_manager) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (load_manager)) throw CORBA::BAD_PARAM (); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h index 74e2b0d4c4c..62e64a28326 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h @@ -69,34 +69,25 @@ public: * Methods required by the CosLoadBalancing::Strategy interface. */ //@{ - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual CosLoadBalancing::Properties * get_properties () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosLoadBalancing::Properties * get_properties (); virtual void push_loads ( const PortableGroup::Location & the_location, - const CosLoadBalancing::LoadList & loads) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CosLoadBalancing::LoadList & loads); virtual CosLoadBalancing::LoadList * get_loads ( CosLoadBalancing::LoadManager_ptr load_manager, - const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::LocationNotFound)); + const PortableGroup::Location & the_location); virtual CORBA::Object_ptr next_member ( PortableGroup::ObjectGroup_ptr object_group, - CosLoadBalancing::LoadManager_ptr load_manager) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)); + CosLoadBalancing::LoadManager_ptr load_manager); virtual void analyze_loads ( PortableGroup::ObjectGroup_ptr object_group, - CosLoadBalancing::LoadManager_ptr load_manager) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosLoadBalancing::LoadManager_ptr load_manager); //@} /// Returns the default POA for this servant. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp index ad9d4f6f92d..8ead44278b1 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp @@ -73,7 +73,6 @@ void TAO_LB_LoadManager::push_loads ( const PortableGroup::Location & the_location, const CosLoadBalancing::LoadList & loads) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (loads.length () == 0) throw CORBA::BAD_PARAM (); @@ -131,8 +130,6 @@ TAO_LB_LoadManager::push_loads ( CosLoadBalancing::LoadList * TAO_LB_LoadManager::get_loads (const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::LocationNotFound)) { CosLoadBalancing::LoadList * tmp; ACE_NEW_THROW_EX (tmp, @@ -158,7 +155,6 @@ TAO_LB_LoadManager::get_loads (const PortableGroup::Location & the_location) void TAO_LB_LoadManager::enable_alert (const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CosLoadBalancing::LoadAlertNotFound)) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->load_alert_lock_); @@ -213,7 +209,6 @@ TAO_LB_LoadManager::enable_alert (const PortableGroup::Location & the_location) void TAO_LB_LoadManager::disable_alert (const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CosLoadBalancing::LoadAlertNotFound)) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->load_alert_lock_); @@ -269,9 +264,6 @@ void TAO_LB_LoadManager::register_load_alert ( const PortableGroup::Location & the_location, CosLoadBalancing::LoadAlert_ptr load_alert) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::LoadAlertAlreadyPresent, - CosLoadBalancing::LoadAlertNotAdded)) { if (CORBA::is_nil (load_alert)) throw CORBA::BAD_PARAM (); @@ -297,8 +289,6 @@ TAO_LB_LoadManager::register_load_alert ( CosLoadBalancing::LoadAlert_ptr TAO_LB_LoadManager::get_load_alert ( const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::LoadAlertNotFound)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -322,8 +312,6 @@ TAO_LB_LoadManager::get_load_alert ( void TAO_LB_LoadManager::remove_load_alert ( const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::LoadAlertNotFound)) { // Disable the "alert" status on the LoadAlert object since it will // no longer be associated with the LoadManager. In particular, @@ -344,8 +332,6 @@ void TAO_LB_LoadManager::register_load_monitor ( const PortableGroup::Location & the_location, CosLoadBalancing::LoadMonitor_ptr load_monitor) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::MonitorAlreadyPresent)) { if (CORBA::is_nil (load_monitor)) throw CORBA::BAD_PARAM (); @@ -403,8 +389,6 @@ TAO_LB_LoadManager::register_load_monitor ( CosLoadBalancing::LoadMonitor_ptr TAO_LB_LoadManager::get_load_monitor ( const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::LocationNotFound)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -424,8 +408,6 @@ TAO_LB_LoadManager::get_load_monitor ( void TAO_LB_LoadManager::remove_load_monitor ( const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::LocationNotFound)) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, @@ -456,9 +438,6 @@ TAO_LB_LoadManager::remove_load_monitor ( void TAO_LB_LoadManager::set_default_properties ( const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { PortableGroup::Properties new_props (props); this->preprocess_properties (new_props); @@ -468,7 +447,6 @@ TAO_LB_LoadManager::set_default_properties ( PortableGroup::Properties * TAO_LB_LoadManager::get_default_properties () - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->property_manager_.get_default_properties (); @@ -477,9 +455,6 @@ TAO_LB_LoadManager::get_default_properties () void TAO_LB_LoadManager::remove_default_properties ( const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { this->property_manager_.remove_default_properties (props); } @@ -488,9 +463,6 @@ void TAO_LB_LoadManager::set_type_properties ( const char *type_id, const PortableGroup::Properties & overrides) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { PortableGroup::Properties new_overrides (overrides); this->preprocess_properties (new_overrides); @@ -502,7 +474,6 @@ TAO_LB_LoadManager::set_type_properties ( PortableGroup::Properties * TAO_LB_LoadManager::get_type_properties ( const char *type_id) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->property_manager_.get_type_properties (type_id); @@ -512,9 +483,6 @@ void TAO_LB_LoadManager::remove_type_properties ( const char *type_id, const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { this->property_manager_.remove_type_properties (type_id, props); @@ -524,10 +492,6 @@ void TAO_LB_LoadManager::set_properties_dynamically ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Properties & overrides) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { PortableGroup::Properties new_overrides (overrides); this->preprocess_properties (new_overrides); @@ -539,8 +503,6 @@ TAO_LB_LoadManager::set_properties_dynamically ( PortableGroup::Properties * TAO_LB_LoadManager::get_properties ( PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)) { return this->property_manager_.get_properties (object_group); @@ -552,13 +514,6 @@ TAO_LB_LoadManager::create_member ( const PortableGroup::Location & the_location, const char * type_id, const PortableGroup::Criteria & the_criteria) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberAlreadyPresent, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::CannotMeetCriteria)) { return this->object_group_manager_.create_member (object_group, @@ -572,10 +527,6 @@ TAO_LB_LoadManager::add_member ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location, CORBA::Object_ptr member) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberAlreadyPresent, - PortableGroup::ObjectNotAdded)) { return this->object_group_manager_.add_member (object_group, @@ -587,9 +538,6 @@ PortableGroup::ObjectGroup_ptr TAO_LB_LoadManager::remove_member ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)) { return this->object_group_manager_.remove_member (object_group, @@ -599,8 +547,6 @@ TAO_LB_LoadManager::remove_member ( PortableGroup::Locations * TAO_LB_LoadManager::locations_of_members ( PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)) { return this->object_group_manager_.locations_of_members (object_group); @@ -609,7 +555,6 @@ TAO_LB_LoadManager::locations_of_members ( PortableGroup::ObjectGroups * TAO_LB_LoadManager::groups_at_location ( const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->object_group_manager_.groups_at_location (the_location); @@ -618,8 +563,6 @@ TAO_LB_LoadManager::groups_at_location ( PortableGroup::ObjectGroupId TAO_LB_LoadManager::get_object_group_id ( PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)) { return this->object_group_manager_.get_object_group_id (object_group); @@ -628,8 +571,6 @@ TAO_LB_LoadManager::get_object_group_id ( PortableGroup::ObjectGroup_ptr TAO_LB_LoadManager::get_object_group_ref ( PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)) { return this->object_group_manager_.get_object_group_ref (object_group); @@ -637,9 +578,6 @@ TAO_LB_LoadManager::get_object_group_ref ( PortableGroup::ObjectGroup_ptr TAO_LB_LoadManager::get_object_group_ref_from_id ( PortableGroup::ObjectGroupId group_id) - ACE_THROW_SPEC(( - CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)) { return this->object_group_manager_.get_object_group_ref_from_id ( group_id); @@ -649,9 +587,6 @@ CORBA::Object_ptr TAO_LB_LoadManager::get_member_ref ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)) { return this->object_group_manager_.get_member_ref (object_group, @@ -664,12 +599,6 @@ TAO_LB_LoadManager::create_object ( const PortableGroup::Criteria & the_criteria, PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::InvalidProperty, - PortableGroup::CannotMeetCriteria)) { // this->init (); @@ -742,8 +671,6 @@ void TAO_LB_LoadManager::delete_object ( const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectNotFound)) { this->generic_factory_.delete_object (factory_creation_id); } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h index 22cfeb1d3e3..47fce3ecdf4 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h @@ -53,65 +53,47 @@ public: /// For the PUSH load monitoring style. virtual void push_loads (const PortableGroup::Location & the_location, - const CosLoadBalancing::LoadList & loads) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CosLoadBalancing::LoadList & loads); /// Return the raw loads at the given location. virtual CosLoadBalancing::LoadList * get_loads ( - const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::LocationNotFound)); + const PortableGroup::Location & the_location); /// Inform member at given location of load alert condition. - virtual void enable_alert (const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CosLoadBalancing::LoadAlertNotFound)); + virtual void enable_alert (const PortableGroup::Location & the_location); /// Inform member at given location that load alert condition has /// passed. - virtual void disable_alert (const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CosLoadBalancing::LoadAlertNotFound)); + virtual void disable_alert (const PortableGroup::Location & the_location); /// Register a LoadAlert object for the member at the given /// location. virtual void register_load_alert ( const PortableGroup::Location & the_location, - CosLoadBalancing::LoadAlert_ptr load_alert) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::LoadAlertAlreadyPresent, - CosLoadBalancing::LoadAlertNotAdded)); + CosLoadBalancing::LoadAlert_ptr load_alert); /// Retrieve the LoadAlert object for the member at the given /// location. virtual CosLoadBalancing::LoadAlert_ptr get_load_alert ( - const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::LoadAlertNotFound)); + const PortableGroup::Location & the_location); /// Remove (de-register) the LoadAlert object for the member at the /// given location. - virtual void remove_load_alert (const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::LoadAlertNotFound)); + virtual void remove_load_alert (const PortableGroup::Location & the_location); /// Register a load monitor with the load balancer. virtual void register_load_monitor ( const PortableGroup::Location & the_location, - CosLoadBalancing::LoadMonitor_ptr load_monitor) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::MonitorAlreadyPresent)); + CosLoadBalancing::LoadMonitor_ptr load_monitor); /// Return a reference to the load monitor at the given location. virtual CosLoadBalancing::LoadMonitor_ptr get_load_monitor ( - const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::LocationNotFound)); + const PortableGroup::Location & the_location); /// Remove a load monitor at the given location from the load /// balancer. virtual void remove_load_monitor ( - const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::LocationNotFound)); + const PortableGroup::Location & the_location); //@} @@ -124,30 +106,20 @@ public: /// Set the default properties to be used by all object groups. virtual void set_default_properties ( - const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + const PortableGroup::Properties & props); /// Get the default properties used by all object groups. - virtual PortableGroup::Properties * get_default_properties () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual PortableGroup::Properties * get_default_properties (); /// Remove default properties. virtual void remove_default_properties ( - const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + const PortableGroup::Properties & props); /// Set properties associated with a given Replica type. These /// properties override the default properties. virtual void set_type_properties ( const char * type_id, - const PortableGroup::Properties & overrides) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + const PortableGroup::Properties & overrides); /** * Return the properties associated with a give Replica type. These @@ -155,16 +127,12 @@ public: * addition to the default properties that were not overridden. */ virtual PortableGroup::Properties * get_type_properties ( - const char * type_id) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char * type_id); /// Remove the given properties associated with the Replica type ID. virtual void remove_type_properties ( const char * type_id, - const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + const PortableGroup::Properties & props); /** * Dynamically set the properties associated with a given object @@ -174,11 +142,7 @@ public: */ virtual void set_properties_dynamically ( PortableGroup::ObjectGroup_ptr object_group, - const PortableGroup::Properties & overrides) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + const PortableGroup::Properties & overrides); /** * Return the properties currently in use by the given object @@ -188,9 +152,7 @@ public: * that weren't overridden. */ virtual PortableGroup::Properties * get_properties ( - PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)); + PortableGroup::ObjectGroup_ptr object_group); //@} @@ -208,24 +170,13 @@ public: PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location, const char * type_id, - const PortableGroup::Criteria & the_criteria) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberAlreadyPresent, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::CannotMeetCriteria)); + const PortableGroup::Criteria & the_criteria); /// Add an existing object to the ObjectGroup. virtual PortableGroup::ObjectGroup_ptr add_member ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location, - CORBA::Object_ptr member) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberAlreadyPresent, - PortableGroup::ObjectNotAdded)); + CORBA::Object_ptr member); /** * Remove an object at a specific location from the given @@ -236,49 +187,33 @@ public: */ virtual PortableGroup::ObjectGroup_ptr remove_member ( PortableGroup::ObjectGroup_ptr object_group, - const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)); + const PortableGroup::Location & the_location); /// Return the locations of the members in the given ObjectGroup. virtual PortableGroup::Locations * locations_of_members ( - PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)); + PortableGroup::ObjectGroup_ptr object_group); /// Return the locations of the members in the given ObjectGroup. virtual PortableGroup::ObjectGroups * groups_at_location ( - const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException)); + const PortableGroup::Location & the_location); /// Return the ObjectGroupId for the given ObjectGroup. virtual PortableGroup::ObjectGroupId get_object_group_id ( - PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)); + PortableGroup::ObjectGroup_ptr object_group); /// @note Does this method make sense for load balanced objects? virtual PortableGroup::ObjectGroup_ptr get_object_group_ref ( - PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)); + PortableGroup::ObjectGroup_ptr object_group); /// TAO specific method virtual PortableGroup::ObjectGroup_ptr get_object_group_ref_from_id ( - PortableGroup::ObjectGroupId group_id) - ACE_THROW_SPEC(( - CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)); + PortableGroup::ObjectGroupId group_id); /// Return the reference corresponding to the Replica of a given /// ObjectGroup at the given location. virtual CORBA::Object_ptr get_member_ref ( PortableGroup::ObjectGroup_ptr object_group, - const PortableGroup::Location & loc) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)); + const PortableGroup::Location & loc); //@} @@ -299,13 +234,7 @@ public: const char * type_id, const PortableGroup::Criteria & the_criteria, PortableGroup::GenericFactory::FactoryCreationId_out - factory_creation_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::InvalidProperty, - PortableGroup::CannotMeetCriteria)); + factory_creation_id); /** * Delete the object corresponding to the provided @@ -315,9 +244,7 @@ public: */ virtual void delete_object ( const PortableGroup::GenericFactory::FactoryCreationId & - factory_creation_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectNotFound)); + factory_creation_id); //@} diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp index eb8e197efe6..39cc9e497e1 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp @@ -53,14 +53,12 @@ TAO_LB_LoadMinimum::~TAO_LB_LoadMinimum (void) char * TAO_LB_LoadMinimum::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("LoadMinimum"); } CosLoadBalancing::Properties * TAO_LB_LoadMinimum::get_properties (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosLoadBalancing::Properties * props = 0; ACE_NEW_THROW_EX (props, @@ -78,7 +76,6 @@ void TAO_LB_LoadMinimum::push_loads ( const PortableGroup::Location & the_location, const CosLoadBalancing::LoadList & loads) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Only the first load is used by this load balancing strategy. if (loads.length () == 0) @@ -152,8 +149,6 @@ TAO_LB_LoadMinimum::push_loads ( CosLoadBalancing::LoadList * TAO_LB_LoadMinimum::get_loads (CosLoadBalancing::LoadManager_ptr load_manager, const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::LocationNotFound)) { if (CORBA::is_nil (load_manager)) throw CORBA::BAD_PARAM (); @@ -173,9 +168,6 @@ CORBA::Object_ptr TAO_LB_LoadMinimum::next_member ( PortableGroup::ObjectGroup_ptr object_group, CosLoadBalancing::LoadManager_ptr load_manager) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)) { if (CORBA::is_nil (load_manager)) throw CORBA::BAD_PARAM (); @@ -232,7 +224,6 @@ void TAO_LB_LoadMinimum::analyze_loads ( PortableGroup::ObjectGroup_ptr object_group, CosLoadBalancing::LoadManager_ptr load_manager) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (load_manager)) throw CORBA::BAD_PARAM (); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h index b2785462279..4874926aec4 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h @@ -88,34 +88,25 @@ public: * Methods required by the CosLoadBalancing::Strategy interface. */ //@{ - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual CosLoadBalancing::Properties * get_properties () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosLoadBalancing::Properties * get_properties (); virtual void push_loads ( const PortableGroup::Location & the_location, - const CosLoadBalancing::LoadList & loads) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CosLoadBalancing::LoadList & loads); virtual CosLoadBalancing::LoadList * get_loads ( CosLoadBalancing::LoadManager_ptr load_manager, - const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::LocationNotFound)); + const PortableGroup::Location & the_location); virtual CORBA::Object_ptr next_member ( PortableGroup::ObjectGroup_ptr object_group, - CosLoadBalancing::LoadManager_ptr load_manager) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)); + CosLoadBalancing::LoadManager_ptr load_manager); virtual void analyze_loads ( PortableGroup::ObjectGroup_ptr object_group, - CosLoadBalancing::LoadManager_ptr load_manager) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosLoadBalancing::LoadManager_ptr load_manager); //@} /// Returns the default POA for this servant. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp index 6210a2860db..f8e89fb7857 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp @@ -23,8 +23,6 @@ TAO_LB_MemberLocator::preinvoke ( PortableServer::POA_ptr /* adapter */, const char * /* operation */, PortableServer::ServantLocator::Cookie & /* the_cookie */) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)) { try { @@ -61,7 +59,6 @@ TAO_LB_MemberLocator::postinvoke ( const char * /* operation */, PortableServer::ServantLocator::Cookie /* the_cookie */, PortableServer::Servant /* the_servant */) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h index bc395ed36f0..d5a570cb318 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h @@ -61,9 +61,7 @@ public: const PortableServer::ObjectId & oid, PortableServer::POA_ptr adapter, const char * operation, - PortableServer::ServantLocator::Cookie & the_cookie) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)); + PortableServer::ServantLocator::Cookie & the_cookie); /// This method is no-op in this ServantLocator implementation. virtual void postinvoke ( @@ -71,8 +69,7 @@ public: PortableServer::POA_ptr adapter, const char * operation, PortableServer::ServantLocator::Cookie the_cookie, - PortableServer::Servant the_servant) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::Servant the_servant); //@} diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp index f82e4f02eb7..81e9373c6e2 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp @@ -27,14 +27,12 @@ TAO_LB_ORBInitializer::TAO_LB_ORBInitializer ( void TAO_LB_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO_LB_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var obj = info->resolve_initial_references ("LoadManager"); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h index 83f93618333..c019eebf019 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h @@ -68,11 +68,9 @@ public: * interface. */ //@{ - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); //@} private: diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp index be53f7004fd..8ca8ca70b05 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp @@ -84,7 +84,6 @@ CORBA::Object_ptr TAO_LB_ObjectReferenceFactory::make_object ( const char * repository_id, const PortableInterceptor::ObjectId & id) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (repository_id == 0) throw CORBA::BAD_PARAM (); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h index a5e119164e3..583e0674000 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h @@ -70,8 +70,7 @@ class TAO_LB_ObjectReferenceFactory //@{ virtual CORBA::Object_ptr make_object ( const char * repository_id, - const PortableInterceptor::ObjectId & id) - ACE_THROW_SPEC ((CORBA::SystemException)); + const PortableInterceptor::ObjectId & id); //@} diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp index febc140ce6d..2e85283e384 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp @@ -29,14 +29,12 @@ TAO_LB_Random::TAO_LB_Random (PortableServer::POA_ptr poa) char * TAO_LB_Random::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Random"); } CosLoadBalancing::Properties * TAO_LB_Random::get_properties (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosLoadBalancing::Properties * props = 0; ACE_NEW_THROW_EX (props, @@ -54,8 +52,6 @@ void TAO_LB_Random::push_loads ( const PortableGroup::Location & /* the_location */, const CosLoadBalancing::LoadList & /* loads */) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::StrategyNotAdaptive)) { throw CosLoadBalancing::StrategyNotAdaptive (); } @@ -63,8 +59,6 @@ TAO_LB_Random::push_loads ( CosLoadBalancing::LoadList * TAO_LB_Random::get_loads (CosLoadBalancing::LoadManager_ptr load_manager, const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::LocationNotFound)) { if (CORBA::is_nil (load_manager)) throw CORBA::BAD_PARAM (); @@ -76,9 +70,6 @@ CORBA::Object_ptr TAO_LB_Random::next_member ( PortableGroup::ObjectGroup_ptr object_group, CosLoadBalancing::LoadManager_ptr load_manager) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)) { if (CORBA::is_nil (load_manager)) throw CORBA::BAD_PARAM (); @@ -95,7 +86,6 @@ void TAO_LB_Random::analyze_loads ( PortableGroup::ObjectGroup_ptr /* object_group */, CosLoadBalancing::LoadManager_ptr /* load_manager */) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -110,9 +100,6 @@ TAO_LB_Random::_tao_next_member ( PortableGroup::ObjectGroup_ptr object_group, CosLoadBalancing::LoadManager_ptr load_manager, const PortableGroup::Locations & locations) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)) { const CORBA::ULong len = locations.length (); if (len == 0) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h index a1ffe3ee89c..a457e689c46 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h @@ -50,35 +50,25 @@ public: * Methods required by the CosLoadBalancing::Strategy interface. */ //@{ - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual CosLoadBalancing::Properties * get_properties () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosLoadBalancing::Properties * get_properties (); virtual void push_loads ( const PortableGroup::Location & the_location, - const CosLoadBalancing::LoadList & loads) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::StrategyNotAdaptive)); + const CosLoadBalancing::LoadList & loads); virtual CosLoadBalancing::LoadList * get_loads ( CosLoadBalancing::LoadManager_ptr load_manager, - const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::LocationNotFound)); + const PortableGroup::Location & the_location); virtual CORBA::Object_ptr next_member ( PortableGroup::ObjectGroup_ptr object_group, - CosLoadBalancing::LoadManager_ptr load_manager) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)); + CosLoadBalancing::LoadManager_ptr load_manager); virtual void analyze_loads ( PortableGroup::ObjectGroup_ptr object_group, - CosLoadBalancing::LoadManager_ptr load_manager) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosLoadBalancing::LoadManager_ptr load_manager); //@} /// Returns the default POA for this servant. @@ -90,10 +80,7 @@ public: static CORBA::Object_ptr _tao_next_member ( PortableGroup::ObjectGroup_ptr object_group, CosLoadBalancing::LoadManager_ptr load_manager, - const PortableGroup::Locations & locations) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)); + const PortableGroup::Locations & locations); /// Initialize the random load balancing strategy. /** diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp index 4266ba6052c..9c56658d726 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp @@ -26,14 +26,12 @@ TAO_LB_RoundRobin::~TAO_LB_RoundRobin (void) char * TAO_LB_RoundRobin::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("RoundRobin"); } CosLoadBalancing::Properties * TAO_LB_RoundRobin::get_properties (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // There are no RoundRobin properties. Return an empty property // list. @@ -54,8 +52,6 @@ void TAO_LB_RoundRobin::push_loads ( const PortableGroup::Location & /* the_location */, const CosLoadBalancing::LoadList & /* loads */) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::StrategyNotAdaptive)) { throw CosLoadBalancing::StrategyNotAdaptive (); } @@ -63,8 +59,6 @@ TAO_LB_RoundRobin::push_loads ( CosLoadBalancing::LoadList * TAO_LB_RoundRobin::get_loads (CosLoadBalancing::LoadManager_ptr load_manager, const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::LocationNotFound)) { if (CORBA::is_nil (load_manager)) throw CORBA::BAD_PARAM (); @@ -76,9 +70,6 @@ CORBA::Object_ptr TAO_LB_RoundRobin::next_member ( PortableGroup::ObjectGroup_ptr object_group, CosLoadBalancing::LoadManager_ptr load_manager) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)) { if (CORBA::is_nil (load_manager)) throw CORBA::BAD_PARAM (); @@ -144,7 +135,6 @@ void TAO_LB_RoundRobin::analyze_loads ( PortableGroup::ObjectGroup_ptr /* object_group */, CosLoadBalancing::LoadManager_ptr /* load_manager */) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h index aecac8a987b..2f307ed07a0 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h @@ -51,35 +51,25 @@ public: * Methods required by the CosLoadBalancing::Strategy interface. */ //@{ - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual CosLoadBalancing::Properties * get_properties () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosLoadBalancing::Properties * get_properties (); virtual void push_loads ( const PortableGroup::Location & the_location, - const CosLoadBalancing::LoadList & loads) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::StrategyNotAdaptive)); + const CosLoadBalancing::LoadList & loads); virtual CosLoadBalancing::LoadList * get_loads ( CosLoadBalancing::LoadManager_ptr load_manager, - const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLoadBalancing::LocationNotFound)); + const PortableGroup::Location & the_location); virtual CORBA::Object_ptr next_member ( PortableGroup::ObjectGroup_ptr object_group, - CosLoadBalancing::LoadManager_ptr load_manager) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)); + CosLoadBalancing::LoadManager_ptr load_manager); virtual void analyze_loads ( PortableGroup::ObjectGroup_ptr object_group, - CosLoadBalancing::LoadManager_ptr load_manager) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosLoadBalancing::LoadManager_ptr load_manager); //@} /// Returns the default POA for this servant. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp index 4feb2474cac..ca239bf7a8d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp @@ -24,22 +24,18 @@ TAO_LB_ServerRequestInterceptor::~TAO_LB_ServerRequestInterceptor (void) char * TAO_LB_ServerRequestInterceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("TAO_LB_ServerRequestInterceptor"); } void TAO_LB_ServerRequestInterceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO_LB_ServerRequestInterceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { if (this->load_alert_.alerted ()) { @@ -118,23 +114,18 @@ TAO_LB_ServerRequestInterceptor::receive_request_service_contexts ( void TAO_LB_ServerRequestInterceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void TAO_LB_ServerRequestInterceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr /* ri */) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO_LB_ServerRequestInterceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { if (TAO_debug_level > 0) { @@ -150,8 +141,6 @@ TAO_LB_ServerRequestInterceptor::send_exception ( void TAO_LB_ServerRequestInterceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { if (TAO_debug_level > 0) { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h index 5cd2591ffeb..dfdd7c2f0e6 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h @@ -63,35 +63,24 @@ public: * ServerRequestInterceptors. */ //@{ - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); //@} protected: diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp index e05a6f943da..6ff60dd60dd 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp @@ -42,9 +42,6 @@ DsLogAdmin::BasicLog_ptr TAO_BasicLogFactory_i::create (DsLogAdmin::LogFullActionType full_action, CORBA::ULongLong max_size, DsLogAdmin::LogId_out id_out) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidLogFullAction - )) { this->create_i (full_action, max_size, @@ -71,11 +68,6 @@ DsLogAdmin::BasicLog_ptr TAO_BasicLogFactory_i::create_with_id (DsLogAdmin::LogId id, DsLogAdmin::LogFullActionType full_action, CORBA::ULongLong max_size) - ACE_THROW_SPEC (( - CORBA::SystemException, - DsLogAdmin::LogIdAlreadyExists, - DsLogAdmin::InvalidLogFullAction - )) { this->create_with_id_i (id, full_action, diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h index b7341463161..e0ed34ee129 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h @@ -68,21 +68,13 @@ public: DsLogAdmin::BasicLog_ptr create (DsLogAdmin::LogFullActionType full_action, CORBA::ULongLong max_size, - DsLogAdmin::LogId_out id) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidLogFullAction - )); + DsLogAdmin::LogId_out id); /// Same as create (), but allows clients to specify the id. DsLogAdmin::BasicLog_ptr create_with_id (DsLogAdmin::LogId id, DsLogAdmin::LogFullActionType full_action, - CORBA::ULongLong max_size) - ACE_THROW_SPEC (( - CORBA::SystemException, - DsLogAdmin::LogIdAlreadyExists, - DsLogAdmin::InvalidLogFullAction - )); + CORBA::ULongLong max_size); protected: virtual CORBA::RepositoryId diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp index 8073177c807..493e3031023 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp @@ -26,7 +26,6 @@ TAO_BasicLog_i::~TAO_BasicLog_i (void) DsLogAdmin::Log_ptr TAO_BasicLog_i::copy (DsLogAdmin::LogId &id) - ACE_THROW_SPEC ((CORBA::SystemException)) { DsLogAdmin::BasicLogFactory_var basicLogFactory = DsLogAdmin::BasicLogFactory::_narrow (factory_.in ()); @@ -44,7 +43,6 @@ TAO_BasicLog_i::copy (DsLogAdmin::LogId &id) DsLogAdmin::Log_ptr TAO_BasicLog_i::copy_with_id (DsLogAdmin::LogId id) - ACE_THROW_SPEC ((CORBA::SystemException)) { DsLogAdmin::BasicLogFactory_var basicLogFactory = DsLogAdmin::BasicLogFactory::_narrow (factory_.in ()); @@ -61,7 +59,6 @@ TAO_BasicLog_i::copy_with_id (DsLogAdmin::LogId id) void TAO_BasicLog_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Remove ourselves from the list of logs. this->logmgr_i_.remove (this->logid_); diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h index 59ce4c92c4e..4d95d4cd916 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h @@ -62,16 +62,13 @@ public: DsLogAdmin::LogId id); /// Duplicate the log. - virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id); /// Duplicate the log specifying an id. - virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id); /// Destroy the log object and all contained records. - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); protected: diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp index feff0864efc..9cfdcc692e5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp @@ -28,10 +28,6 @@ TAO_Event_LogConsumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer void TAO_Event_LogConsumer::push (const CORBA::Any& data) -ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )) { // create a record list... DsLogAdmin::RecordList recList (1); @@ -88,9 +84,6 @@ ACE_THROW_SPEC (( void TAO_Event_LogConsumer::disconnect_push_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { this->supplier_proxy_->disconnect_push_supplier (); } diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h index abc9657d016..cd922828479 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h @@ -71,18 +71,11 @@ public: private: /// Disconnect from EventLog. - void disconnect_push_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + void disconnect_push_consumer (void); /// This method will call TAO_Log_i::log() to write /// the event to the Log. - void push (const CORBA::Any& data) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )); + void push (const CORBA::Any& data); /// ProxyPushSupplier used to connect to EventLog. CosEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_; diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp index f216c345308..e4644b21154 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp @@ -101,9 +101,6 @@ TAO_EventLogFactory_i::create ( CORBA::ULongLong max_size, const DsLogAdmin::CapacityAlarmThresholdList & thresholds, DsLogAdmin::LogId_out id_out) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidLogFullAction, - DsLogAdmin::InvalidThreshold)) { this->create_i (full_action, max_size, @@ -135,10 +132,6 @@ TAO_EventLogFactory_i::create_with_id ( DsLogAdmin::LogFullActionType full_action, CORBA::ULongLong max_size, const DsLogAdmin::CapacityAlarmThresholdList & thresholds) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::LogIdAlreadyExists, - DsLogAdmin::InvalidLogFullAction, - DsLogAdmin::InvalidThreshold)) { this->create_with_id_i (id, full_action, @@ -196,14 +189,12 @@ TAO_EventLogFactory_i::create_log_servant (DsLogAdmin::LogId id) CosEventChannelAdmin::ProxyPushSupplier_ptr TAO_EventLogFactory_i::obtain_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return consumer_admin_->obtain_push_supplier (); } CosEventChannelAdmin::ProxyPullSupplier_ptr TAO_EventLogFactory_i::obtain_pull_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return consumer_admin_->obtain_pull_supplier (); diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h index 3d4250a454d..3577180e6a8 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h @@ -78,12 +78,7 @@ public: CORBA::ULongLong max_size, const DsLogAdmin::CapacityAlarmThresholdList & thresholds, DsLogAdmin::LogId_out id - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DsLogAdmin::InvalidLogFullAction, - DsLogAdmin::InvalidThreshold - )); + ); /// Same as create (), but allows clients to specify the id. DsEventLogAdmin::EventLog_ptr create_with_id ( @@ -91,26 +86,14 @@ public: DsLogAdmin::LogFullActionType full_action, CORBA::ULongLong max_size, const DsLogAdmin::CapacityAlarmThresholdList & thresholds - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DsLogAdmin::LogIdAlreadyExists, - DsLogAdmin::InvalidLogFullAction, - DsLogAdmin::InvalidThreshold - )); + ); // = Implementation of the CosEventChannelAdmin::ConsumerAdmin methods. CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); protected: virtual CORBA::RepositoryId diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp index 1941a26221d..8320ca9f170 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp @@ -22,7 +22,6 @@ TAO_EventLogNotification::~TAO_EventLogNotification (void) void TAO_EventLogNotification::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->consumer_->disconnect_push_consumer (); } @@ -43,7 +42,6 @@ TAO_EventLogNotification::obtain_proxy_consumer() void TAO_EventLogNotification::send_notification (const CORBA::Any& any) - ACE_THROW_SPEC ((CORBA::SystemException)) { consumer_->push (any); } diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h index c76eb44ca2c..1bf43eb1d7b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h @@ -56,8 +56,7 @@ public: ~TAO_EventLogNotification (void); /// The skeleton methods. - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); protected: // = Helper methods @@ -67,8 +66,7 @@ protected: void obtain_proxy_consumer (); /// Send the event on the event channel. - virtual void send_notification (const CORBA::Any& any) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_notification (const CORBA::Any& any); private: diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp index 09c2e907049..9516d9d165b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp @@ -40,7 +40,6 @@ TAO_EventLog_i::~TAO_EventLog_i () DsLogAdmin::Log_ptr TAO_EventLog_i::copy (DsLogAdmin::LogId &id) -ACE_THROW_SPEC ((CORBA::SystemException)) { // Duplicate the log. DsEventLogAdmin::EventLogFactory_var eventLogFactory = @@ -57,7 +56,6 @@ ACE_THROW_SPEC ((CORBA::SystemException)) DsLogAdmin::Log_ptr TAO_EventLog_i::copy_with_id (DsLogAdmin::LogId id) -ACE_THROW_SPEC ((CORBA::SystemException)) { // Duplicate the log supplying the log id. DsEventLogAdmin::EventLogFactory_var eventLogFactory = @@ -75,7 +73,6 @@ ACE_THROW_SPEC ((CORBA::SystemException)) void TAO_EventLog_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Send event to indicate the log has been deleted. notifier_->object_deletion (logid_); @@ -104,14 +101,12 @@ TAO_EventLog_i::activate (void) CosEventChannelAdmin::ConsumerAdmin_ptr TAO_EventLog_i::for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->event_channel_->for_consumers (); } CosEventChannelAdmin::SupplierAdmin_ptr TAO_EventLog_i::for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->event_channel_->for_suppliers (); } diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h index 2a9d40090e1..cb6c3cfb4fd 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h @@ -71,17 +71,14 @@ public: DsLogAdmin::LogId id); /// Duplicate the log. - virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id); /// Duplicate the log specifying an id. - virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id); /// Destroy the log object and all contained records. void - destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + destroy (void); /// Activate the EventLog. void @@ -89,16 +86,10 @@ public: // = The CosEventChannelAdmin::EventChannel interface methods. CosEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + for_consumers (void); CosEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + for_suppliers (void); protected: diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp index d23f8a68742..5fd34c41fe8 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp @@ -37,8 +37,6 @@ TAO_Hash_Iterator_i::~TAO_Hash_Iterator_i (void) DsLogAdmin::RecordList* TAO_Hash_Iterator_i::get (CORBA::ULong position, CORBA::ULong how_many) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidParam)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h index 8e95a97d085..789b710d8d5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h @@ -61,9 +61,7 @@ public: /// Gets a list of LogRecords. virtual DsLogAdmin::RecordList* get (CORBA::ULong position, - CORBA::ULong how_many) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidParam)); + CORBA::ULong how_many); private: /// Pointer to record store diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp index c2b89d1aaaa..7a0e1b67407 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp @@ -250,9 +250,6 @@ void TAO_Hash_LogRecordStore::set_record_attribute (DsLogAdmin::RecordId id, const DsLogAdmin::NVList &attr_list) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidRecordId, - DsLogAdmin::InvalidAttribute)) { // TODO: validate attributes here. @@ -276,10 +273,6 @@ TAO_Hash_LogRecordStore::set_records_attribute ( const char *constraint, const DsLogAdmin::NVList &attr_list) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidGrammar, - DsLogAdmin::InvalidConstraint, - DsLogAdmin::InvalidAttribute)) { this->check_grammar (grammar); @@ -312,8 +305,6 @@ TAO_Hash_LogRecordStore::set_records_attribute ( DsLogAdmin::NVList* TAO_Hash_LogRecordStore::get_record_attribute (DsLogAdmin::RecordId id) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidRecordId)) { DsLogAdmin::LogRecord rec; @@ -366,8 +357,6 @@ DsLogAdmin::RecordList* TAO_Hash_LogRecordStore::query_i (const char *constraint, DsLogAdmin::Iterator_out &iter_out, CORBA::ULong how_many) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidConstraint)) { // Use an Interpreter to build an expression tree. TAO_Log_Constraint_Interpreter interpreter (constraint); @@ -452,9 +441,6 @@ DsLogAdmin::RecordList* TAO_Hash_LogRecordStore::query (const char *grammar, const char *constraint, DsLogAdmin::Iterator_out iter_out) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidGrammar, - DsLogAdmin::InvalidConstraint)) { this->check_grammar (grammar); @@ -467,7 +453,6 @@ DsLogAdmin::RecordList* TAO_Hash_LogRecordStore::retrieve (DsLogAdmin::TimeT from_time, CORBA::Long how_many, DsLogAdmin::Iterator_out iter_out) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Decide between forward vs backward retrieval. char constraint[32]; @@ -499,9 +484,6 @@ TAO_Hash_LogRecordStore::retrieve (DsLogAdmin::TimeT from_time, CORBA::ULong TAO_Hash_LogRecordStore::match (const char* grammar, const char *constraint) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidGrammar, - DsLogAdmin::InvalidConstraint)) { this->check_grammar (grammar); @@ -532,9 +514,6 @@ TAO_Hash_LogRecordStore::match (const char* grammar, CORBA::ULong TAO_Hash_LogRecordStore::delete_records (const char *grammar, const char *constraint) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidGrammar, - DsLogAdmin::InvalidConstraint)) { this->check_grammar (grammar); @@ -569,7 +548,6 @@ TAO_Hash_LogRecordStore::delete_records (const char *grammar, CORBA::ULong TAO_Hash_LogRecordStore::delete_records_by_id (const DsLogAdmin::RecordIdList &ids) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong count (0); @@ -642,8 +620,6 @@ TAO_Hash_LogRecordStore::lock() void TAO_Hash_LogRecordStore::check_grammar (const char* grammar) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidGrammar)) { // Verify grammar if (ACE_OS::strcmp (grammar, "TCL") != 0 && diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h index 23711349255..f297a0a2980 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h @@ -195,28 +195,19 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore /// Set single record attributes. virtual void set_record_attribute (DsLogAdmin::RecordId id, - const DsLogAdmin::NVList & attr_list) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidRecordId, - DsLogAdmin::InvalidAttribute)); + const DsLogAdmin::NVList & attr_list); /// Set the attributes of all records that matches the /// constraints with same attr_list. virtual CORBA::ULong set_records_attribute (const char * grammar, const char * c, - const DsLogAdmin::NVList & attr_list) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidGrammar, - DsLogAdmin::InvalidConstraint, - DsLogAdmin::InvalidAttribute)); + const DsLogAdmin::NVList & attr_list); /// Get the attributes of the record with id <id>. Raises /// DsLogAdmin::InvalidRecordId virtual DsLogAdmin::NVList* - get_record_attribute (DsLogAdmin::RecordId id) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidRecordId)); + get_record_attribute (DsLogAdmin::RecordId id); /// Ensure changes have been flushed to persistent media /// Returns 0 on success, -1 on failure. @@ -228,39 +219,28 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore virtual DsLogAdmin::RecordList* query (const char * grammar, const char * c, - DsLogAdmin::Iterator_out i) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidGrammar, - DsLogAdmin::InvalidConstraint)); + DsLogAdmin::Iterator_out i); /// Retrieve <how_many> records from time <from_time> using iterator /// <i>. virtual DsLogAdmin::RecordList* retrieve (DsLogAdmin::TimeT from_time, CORBA::Long how_many, - DsLogAdmin::Iterator_out i) - ACE_THROW_SPEC ((CORBA::SystemException)); + DsLogAdmin::Iterator_out i); /// Returns the number of records matching constraint <c>. virtual CORBA::ULong match (const char * grammar, - const char * c) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidGrammar, - DsLogAdmin::InvalidConstraint)); + const char * c); /// Delete records matching constraint <c>. virtual CORBA::ULong delete_records (const char * grammar, - const char * c) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidGrammar, - DsLogAdmin::InvalidConstraint)); + const char * c); /// Delete records matching ids in <ids> virtual CORBA::ULong - delete_records_by_id (const DsLogAdmin::RecordIdList & ids) - ACE_THROW_SPEC ((CORBA::SystemException)); + delete_records_by_id (const DsLogAdmin::RecordIdList & ids); virtual CORBA::ULong remove_old_records (void); @@ -296,14 +276,10 @@ protected: DsLogAdmin::RecordList* query_i (const char *constraint, DsLogAdmin::Iterator_out &iter_out, - CORBA::ULong how_many) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidConstraint)); + CORBA::ULong how_many); /// Throws DsLogAdmin::InvalidGrammar if we don't support this grammar. - void check_grammar (const char* grammar) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidGrammar)); + void check_grammar (const char* grammar); /// The size of a LogRecord diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp index a947a10e3d0..6f1825b1ee8 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp @@ -23,9 +23,6 @@ TAO_Hash_LogStore::~TAO_Hash_LogStore() DsLogAdmin::LogList* TAO_Hash_LogStore::list_logs (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -62,9 +59,6 @@ TAO_Hash_LogStore::list_logs (void) DsLogAdmin::LogIdList* TAO_Hash_LogStore::list_logs_by_id (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -102,9 +96,6 @@ TAO_Hash_LogStore::list_logs_by_id (void) DsLogAdmin::Log_ptr TAO_Hash_LogStore::find_log (DsLogAdmin::LogId id) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h index b33057fd5a1..bd737354172 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h @@ -53,24 +53,15 @@ public: /// Lists all logs created by the log factory. virtual DsLogAdmin::LogList * - list_logs (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + list_logs (void); /// Lists all log ids. virtual DsLogAdmin::LogIdList * - list_logs_by_id (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + list_logs_by_id (void); /// Returns a reference to the log with the supplied id. virtual DsLogAdmin::Log_ptr - find_log (DsLogAdmin::LogId id) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + find_log (DsLogAdmin::LogId id); /// Returns true if log exists, otherwise false virtual bool exists (DsLogAdmin::LogId id); diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp index 0fff26d0bbd..155f4ad8088 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp @@ -36,7 +36,6 @@ TAO_Iterator_i::~TAO_Iterator_i (void) void TAO_Iterator_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = this->poa_->servant_to_id (this); diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h index ec4dd4dd8d4..3b2f6e49f12 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h @@ -60,12 +60,10 @@ public: /// Gets a list of LogRecords. virtual DsLogAdmin::RecordList* get (CORBA::ULong position, CORBA::ULong how_many) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidParam)) = 0; + = 0; /// This destroys the iterator. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); protected: /// POA diff --git a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp index 970f414c29e..e3c45ebb720 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp @@ -21,9 +21,6 @@ TAO_LogActivator::~TAO_LogActivator () PortableServer::Servant TAO_LogActivator::incarnate (const PortableServer::ObjectId& oid, PortableServer::POA_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest - )) { CORBA::String_var poa_id = PortableServer::ObjectId_to_string (oid); @@ -42,7 +39,6 @@ TAO_LogActivator::etherealize (const PortableServer::ObjectId&, PortableServer::Servant servant, CORBA::Boolean, CORBA::Boolean remaining_activations) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (!remaining_activations) { diff --git a/TAO/orbsvcs/orbsvcs/Log/LogActivator.h b/TAO/orbsvcs/orbsvcs/Log/LogActivator.h index 35bcaca5f22..34c20edd1c5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.h @@ -49,20 +49,13 @@ public: virtual ~TAO_LogActivator(); virtual PortableServer::Servant incarnate (const PortableServer::ObjectId& oid, - PortableServer::POA_ptr poa) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::ForwardRequest - )); + PortableServer::POA_ptr poa); virtual void etherealize (const PortableServer::ObjectId& oid, PortableServer::POA_ptr poa, PortableServer::Servant servant, CORBA::Boolean cleanup_in_progress, - CORBA::Boolean remaining_activations) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + CORBA::Boolean remaining_activations); private: TAO_LogMgr_i& logmgr_i_; diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp index 182eb38d929..8db55311bd5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp @@ -152,9 +152,6 @@ TAO_LogMgr_i::create_log_object (DsLogAdmin::LogId id) DsLogAdmin::LogList* TAO_LogMgr_i::list_logs (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->logstore_->list_logs (); } @@ -162,9 +159,6 @@ TAO_LogMgr_i::list_logs (void) DsLogAdmin::LogIdList* TAO_LogMgr_i::list_logs_by_id (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->logstore_->list_logs_by_id (); } @@ -172,9 +166,6 @@ TAO_LogMgr_i::list_logs_by_id (void) DsLogAdmin::Log_ptr TAO_LogMgr_i::find_log (DsLogAdmin::LogId id) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->logstore_->find_log (id); } diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h index 209d202ac55..a66f7719ea3 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h @@ -52,24 +52,15 @@ public: /// Lists all log object references. DsLogAdmin::LogList * - list_logs (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + list_logs (void); /// Lists all log ids. DsLogAdmin::LogIdList * - list_logs_by_id (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + list_logs_by_id (void); /// Returns a reference to the log with the supplied id. DsLogAdmin::Log_ptr - find_log (DsLogAdmin::LogId id) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + find_log (DsLogAdmin::LogId id); /// Returns true if log exists, otherwise false bool exists (DsLogAdmin::LogId id); diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp index 73b508c0c06..0b0d77944d4 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp @@ -20,7 +20,6 @@ TAO_LogNotification::~TAO_LogNotification (void) void TAO_LogNotification::object_creation (DsLogAdmin::LogId id) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any any; @@ -42,7 +41,6 @@ TAO_LogNotification::object_creation (DsLogAdmin::LogId id) void TAO_LogNotification::object_deletion (DsLogAdmin::LogId id) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any any; DsLogNotification::ObjectDeletion event; @@ -64,7 +62,6 @@ TAO_LogNotification::object_deletion (DsLogAdmin::LogId id) void TAO_LogNotification::processing_error_alarm (CORBA::ULong error_num, const char* error_string) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any any; DsLogNotification::ProcessingErrorAlarm event; @@ -83,7 +80,6 @@ TAO_LogNotification::attribute_value_change (DsLogAdmin::Log_ptr log, DsLogNotification::AttributeType type, CORBA::Any oldValue, CORBA::Any newValue) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any any; DsLogNotification::AttributeValueChange event; @@ -113,7 +109,6 @@ TAO_LogNotification::capacity_alarm_threshold_value_change ( DsLogAdmin::LogId id, const DsLogAdmin::CapacityAlarmThresholdList& oldValue, const DsLogAdmin::CapacityAlarmThresholdList& newValue) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any oldV, newV; oldV <<= oldValue; @@ -131,7 +126,6 @@ TAO_LogNotification::log_full_action_value_change (DsLogAdmin::Log_ptr log, DsLogAdmin::LogId id, CORBA::ULong oldValue, CORBA::ULong newValue) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any oldV, newV; oldV <<= oldValue; @@ -149,7 +143,6 @@ TAO_LogNotification::max_log_size_value_change (DsLogAdmin::Log_ptr log, DsLogAdmin::LogId id, CORBA::ULongLong oldValue, CORBA::ULongLong newValue) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any oldV, newV; oldV <<= oldValue; @@ -167,7 +160,6 @@ TAO_LogNotification::start_time_value_change (DsLogAdmin::Log_ptr log, DsLogAdmin::LogId id, DsLogAdmin::TimeT oldValue, DsLogAdmin::TimeT newValue) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any oldV, newV; oldV <<= oldValue; @@ -185,7 +177,6 @@ TAO_LogNotification::stop_time_value_change (DsLogAdmin::Log_ptr log, DsLogAdmin::LogId id, DsLogAdmin::TimeT oldValue, DsLogAdmin::TimeT newValue) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any oldV, newV; oldV <<= oldValue; @@ -203,7 +194,6 @@ TAO_LogNotification::week_mask_value_change (DsLogAdmin::Log_ptr log, DsLogAdmin::LogId id, const DsLogAdmin::WeekMask& oldValue, const DsLogAdmin::WeekMask& newValue) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any oldV, newV; oldV <<= oldValue; @@ -221,7 +211,6 @@ TAO_LogNotification::max_record_life_value_change (DsLogAdmin::Log_ptr log, DsLogAdmin::LogId id, CORBA::ULong oldValue, CORBA::ULong newValue) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any oldV, newV; oldV <<= oldValue; @@ -240,7 +229,6 @@ TAO_LogNotification::quality_of_service_value_change ( DsLogAdmin::LogId id, const DsLogAdmin::QoSList& oldValue, const DsLogAdmin::QoSList& newValue) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any oldV, newV; oldV <<= oldValue; @@ -258,7 +246,6 @@ TAO_LogNotification::state_change (DsLogAdmin::Log_ptr log, DsLogAdmin::LogId id, DsLogNotification::StateType type, CORBA::Any newValue) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any any; DsLogNotification::StateChange event; @@ -286,7 +273,6 @@ TAO_LogNotification::administrative_state_change ( DsLogAdmin::Log_ptr log, DsLogAdmin::LogId id, DsLogAdmin::AdministrativeState newValue) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any newV; newV <<= newValue; @@ -302,7 +288,6 @@ TAO_LogNotification::operational_state_change ( DsLogAdmin::Log_ptr log, DsLogAdmin::LogId id, DsLogAdmin::OperationalState newValue) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any newV; newV <<= newValue; @@ -317,7 +302,6 @@ void TAO_LogNotification::forwarding_state_change (DsLogAdmin::Log_ptr log, DsLogAdmin::LogId id, DsLogAdmin::ForwardingState newValue) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any newV; newV <<= newValue; @@ -335,7 +319,6 @@ TAO_LogNotification::threshold_alarm ( DsLogAdmin::Threshold crossedValue, DsLogAdmin::Threshold observedValue, DsLogNotification::PerceivedSeverityType severity) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any any; DsLogNotification::ThresholdAlarm event; @@ -359,7 +342,6 @@ TAO_LogNotification::threshold_alarm ( void TAO_LogNotification::send_notification (const CORBA::Any & /* any */) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h index c16782d6fe9..b99ca01893a 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h @@ -49,118 +49,100 @@ public: virtual ~TAO_LogNotification (void); /// Event generated when a new log is created. - void object_creation (DsLogAdmin::LogId id) - ACE_THROW_SPEC ((CORBA::SystemException)); + void object_creation (DsLogAdmin::LogId id); /// Event generated when a new log is deleted. - void object_deletion (DsLogAdmin::LogId id) - ACE_THROW_SPEC ((CORBA::SystemException)); + void object_deletion (DsLogAdmin::LogId id); /// Event generated. - void processing_error_alarm (CORBA::ULong error_num, const char* error_string) - ACE_THROW_SPEC ((CORBA::SystemException)); + void processing_error_alarm (CORBA::ULong error_num, const char* error_string); /// AttributeValueChange event generation method. void attribute_value_change (DsLogAdmin::Log_ptr log, DsLogAdmin::LogId id, DsLogNotification::AttributeType type, CORBA::Any oldValue, - CORBA::Any newValue) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Any newValue); /// AttributeValueChange event generation method. void capacity_alarm_threshold_value_change (DsLogAdmin::Log_ptr log, DsLogAdmin::LogId id, const DsLogAdmin::CapacityAlarmThresholdList& oldValue, - const DsLogAdmin::CapacityAlarmThresholdList& newValue) - ACE_THROW_SPEC ((CORBA::SystemException)); + const DsLogAdmin::CapacityAlarmThresholdList& newValue); /// AttributeValueChange event generation method. void log_full_action_value_change (DsLogAdmin::Log_ptr log, DsLogAdmin::LogId id, CORBA::ULong oldValue, - CORBA::ULong newValue) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ULong newValue); /// AttributeValueChange event generation method. void max_log_size_value_change (DsLogAdmin::Log_ptr log, DsLogAdmin::LogId id, CORBA::ULongLong oldValue, - CORBA::ULongLong newValue) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ULongLong newValue); /// AttributeValueChange event generation method. void start_time_value_change (DsLogAdmin::Log_ptr log, DsLogAdmin::LogId id, DsLogAdmin::TimeT oldValue, - DsLogAdmin::TimeT newValue) - ACE_THROW_SPEC ((CORBA::SystemException)); + DsLogAdmin::TimeT newValue); /// AttributeValueChange event generation method. void stop_time_value_change (DsLogAdmin::Log_ptr log, DsLogAdmin::LogId id, DsLogAdmin::TimeT oldValue, - DsLogAdmin::TimeT newValue) - ACE_THROW_SPEC ((CORBA::SystemException)); + DsLogAdmin::TimeT newValue); /// AttributeValueChange event generation method. void week_mask_value_change (DsLogAdmin::Log_ptr log, DsLogAdmin::LogId id, const DsLogAdmin::WeekMask& oldValue, - const DsLogAdmin::WeekMask& newValue) - ACE_THROW_SPEC ((CORBA::SystemException)); + const DsLogAdmin::WeekMask& newValue); /// AttributeValueChange event generation method. void max_record_life_value_change (DsLogAdmin::Log_ptr log, DsLogAdmin::LogId id, CORBA::ULong oldValue, - CORBA::ULong newValue) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ULong newValue); /// AttributeValueChange event generation method. void quality_of_service_value_change (DsLogAdmin::Log_ptr log, DsLogAdmin::LogId id, const DsLogAdmin::QoSList& oldValue, - const DsLogAdmin::QoSList& newValue) - ACE_THROW_SPEC ((CORBA::SystemException)); + const DsLogAdmin::QoSList& newValue); /// StateChange event generation method. void state_change (DsLogAdmin::Log_ptr log, DsLogAdmin::LogId id, DsLogNotification::StateType type, - CORBA::Any newValue) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Any newValue); /// StateChange event generation method. void administrative_state_change (DsLogAdmin::Log_ptr log, DsLogAdmin::LogId id, - DsLogAdmin::AdministrativeState newValue) - ACE_THROW_SPEC ((CORBA::SystemException)); + DsLogAdmin::AdministrativeState newValue); /// StateChange event generation method. void operational_state_change (DsLogAdmin::Log_ptr log, DsLogAdmin::LogId id, - DsLogAdmin::OperationalState newValue) - ACE_THROW_SPEC ((CORBA::SystemException)); + DsLogAdmin::OperationalState newValue); /// StateChange event generation method. void forwarding_state_change (DsLogAdmin::Log_ptr log, DsLogAdmin::LogId id, - DsLogAdmin::ForwardingState newValue) - ACE_THROW_SPEC ((CORBA::SystemException)); + DsLogAdmin::ForwardingState newValue); /// StateChange event generation method. void threshold_alarm (DsLogAdmin::Log_ptr log, DsLogAdmin::LogId id, DsLogAdmin::Threshold crossedValue, DsLogAdmin::Threshold observedValue, - DsLogNotification::PerceivedSeverityType severity) - ACE_THROW_SPEC ((CORBA::SystemException)); + DsLogNotification::PerceivedSeverityType severity); /// Method overriden by by event-aware logging services to cause /// a notification event to be sent. - virtual void send_notification (const CORBA::Any &) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_notification (const CORBA::Any &); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h index 785c965d4e6..f66b8c1681f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h @@ -164,9 +164,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore virtual void set_record_attribute (DsLogAdmin::RecordId id, const DsLogAdmin::NVList & attr_list) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidRecordId, - DsLogAdmin::InvalidAttribute)) = 0; + = 0; /// Set the attributes of all records that matches the /// constraints with same attr_list. @@ -174,17 +172,13 @@ class TAO_Log_Serv_Export TAO_LogRecordStore set_records_attribute (const char * grammar, const char * c, const DsLogAdmin::NVList & attr_list) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidGrammar, - DsLogAdmin::InvalidConstraint, - DsLogAdmin::InvalidAttribute)) = 0; + = 0; /// Get the attributes of the record with id <id>. Raises /// DsLogAdmin::InvalidRecordId virtual DsLogAdmin::NVList* get_record_attribute (DsLogAdmin::RecordId id) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidRecordId)) = 0; + = 0; /// Ensure changes have been flushed to persistent media /// Returns 0 on success, -1 on failure @@ -198,9 +192,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore query (const char * grammar, const char * c, DsLogAdmin::Iterator_out i) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidGrammar, - DsLogAdmin::InvalidConstraint)) = 0; + = 0; /// Retrieve <how_many> records from time <from_time> using iterator /// <i>. @@ -208,28 +200,24 @@ class TAO_Log_Serv_Export TAO_LogRecordStore retrieve (DsLogAdmin::TimeT from_time, CORBA::Long how_many, DsLogAdmin::Iterator_out i) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; /// Returns the number of records matching constraint <c>. virtual CORBA::ULong match (const char * grammar, const char * c) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidGrammar, - DsLogAdmin::InvalidConstraint)) = 0; + = 0; /// Delete records matching constraint <c>. virtual CORBA::ULong delete_records (const char * grammar, const char * c) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidGrammar, - DsLogAdmin::InvalidConstraint)) = 0; + = 0; /// Delete records matching ids in <ids> virtual CORBA::ULong delete_records_by_id (const DsLogAdmin::RecordIdList & ids) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; virtual CORBA::ULong diff --git a/TAO/orbsvcs/orbsvcs/Log/LogStore.h b/TAO/orbsvcs/orbsvcs/Log/LogStore.h index 8fe2fddceb5..66f8ea5888c 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogStore.h @@ -38,23 +38,17 @@ public: /// Lists all logs created by the log factory. virtual DsLogAdmin::LogList * list_logs (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; /// Lists all log ids. virtual DsLogAdmin::LogIdList * list_logs_by_id (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; /// Returns a reference to the log with the supplied id. virtual DsLogAdmin::Log_ptr find_log (DsLogAdmin::LogId id) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + = 0; /// Returns true if log exists, otherwise false virtual bool diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp index b8b51624edf..33870c64cd0 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp @@ -11,8 +11,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Log_Constraint_Interpreter::TAO_Log_Constraint_Interpreter ( const char *constraints ) - ACE_THROW_SPEC ((DsLogAdmin::InvalidConstraint, - CORBA::NO_MEMORY)) { if (TAO_ETCL_Interpreter::is_empty_string (constraints)) { diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h index 709310343f9..8bb542da1be 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h @@ -51,9 +51,7 @@ public: * Constraint exception if the constraint given has syntax errors or * semantic errors, such as mismatched types. */ - TAO_Log_Constraint_Interpreter (const char* constraints) - ACE_THROW_SPEC ((DsLogAdmin::InvalidConstraint, - CORBA::NO_MEMORY)); + TAO_Log_Constraint_Interpreter (const char* constraints); /// Destructor. ~TAO_Log_Constraint_Interpreter (void); diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index 605ca774d7c..c9a12d91002 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -98,21 +98,18 @@ TAO_Log_i::~TAO_Log_i (void) DsLogAdmin::LogMgr_ptr TAO_Log_i::my_factory (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return DsLogAdmin::LogMgr::_duplicate (this->factory_.in ()); } DsLogAdmin::LogId TAO_Log_i::id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return logid_; } DsLogAdmin::QoSList* TAO_Log_i::get_log_qos (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -132,8 +129,6 @@ TAO_Log_i::get_log_qos (void) void TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::UnsupportedQoS)) { ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -181,7 +176,6 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos) CORBA::ULong TAO_Log_i::get_max_record_life (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -194,7 +188,6 @@ TAO_Log_i::get_max_record_life (void) void TAO_Log_i::set_max_record_life (CORBA::ULong life) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -233,7 +226,6 @@ TAO_Log_i::set_max_record_life (CORBA::ULong life) CORBA::ULongLong TAO_Log_i::get_max_size (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -245,8 +237,6 @@ TAO_Log_i::get_max_size (void) void TAO_Log_i::set_max_size (CORBA::ULongLong size) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidParam)) { ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -307,7 +297,6 @@ TAO_Log_i::set_max_size (CORBA::ULongLong size) CORBA::ULongLong TAO_Log_i::get_current_size (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -319,7 +308,6 @@ TAO_Log_i::get_current_size (void) CORBA::ULongLong TAO_Log_i::get_n_records (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -331,7 +319,6 @@ TAO_Log_i::get_n_records (void) DsLogAdmin::LogFullActionType TAO_Log_i::get_log_full_action (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -343,8 +330,6 @@ TAO_Log_i::get_log_full_action (void) void TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidLogFullAction)) { ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -398,7 +383,6 @@ TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action) DsLogAdmin::AdministrativeState TAO_Log_i::get_administrative_state (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -410,7 +394,6 @@ TAO_Log_i::get_administrative_state (void) void TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -443,7 +426,6 @@ TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state) DsLogAdmin::ForwardingState TAO_Log_i::get_forwarding_state (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -456,7 +438,6 @@ TAO_Log_i::get_forwarding_state (void) void TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -489,7 +470,6 @@ TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state) DsLogAdmin::OperationalState TAO_Log_i::get_operational_state (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // No locks are necessary, since op_state_ is set in ::init() and // never changed. @@ -498,7 +478,6 @@ TAO_Log_i::get_operational_state (void) DsLogAdmin::TimeInterval TAO_Log_i::get_interval (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -510,9 +489,6 @@ TAO_Log_i::get_interval (void) void TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidTime, - DsLogAdmin::InvalidTimeInterval)) { ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -564,7 +540,6 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval) DsLogAdmin::AvailabilityStatus TAO_Log_i::get_availability_status (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -576,7 +551,6 @@ TAO_Log_i::get_availability_status (void) DsLogAdmin::AvailabilityStatus TAO_Log_i::get_availability_status_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // The log is considered "on duty" if all the following are true: // * operational state is enabled @@ -605,7 +579,6 @@ TAO_Log_i::get_availability_status_i (void) DsLogAdmin::CapacityAlarmThresholdList* TAO_Log_i::get_capacity_alarm_thresholds (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -619,8 +592,6 @@ void TAO_Log_i::set_capacity_alarm_thresholds (const DsLogAdmin::CapacityAlarmThresholdList &threshs) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidThreshold)) { ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -678,7 +649,6 @@ TAO_Log_i::set_capacity_alarm_thresholds (const DsLogAdmin::WeekMask* TAO_Log_i::get_week_mask (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -690,10 +660,6 @@ TAO_Log_i::get_week_mask (void) void TAO_Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidTime, - DsLogAdmin::InvalidTimeInterval, - DsLogAdmin::InvalidMask)) { ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -733,9 +699,6 @@ DsLogAdmin::RecordList* TAO_Log_i::query (const char *grammar, const char *constraint, DsLogAdmin::Iterator_out iter_out) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidGrammar, - DsLogAdmin::InvalidConstraint)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -751,7 +714,6 @@ DsLogAdmin::RecordList* TAO_Log_i::retrieve (DsLogAdmin::TimeT from_time, CORBA::Long how_many, DsLogAdmin::Iterator_out iter_out) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -766,9 +728,6 @@ TAO_Log_i::retrieve (DsLogAdmin::TimeT from_time, CORBA::ULong TAO_Log_i::match (const char* grammar, const char *constraint) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidGrammar, - DsLogAdmin::InvalidConstraint)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -785,9 +744,6 @@ TAO_Log_i::match (const char* grammar, CORBA::ULong TAO_Log_i::delete_records (const char *grammar, const char *constraint) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidGrammar, - DsLogAdmin::InvalidConstraint)) { ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -822,7 +778,6 @@ TAO_Log_i::delete_records (const char *grammar, CORBA::ULong TAO_Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -856,11 +811,6 @@ TAO_Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids) void TAO_Log_i::write_records (const DsLogAdmin::Anys &records) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::LogFull, - DsLogAdmin::LogOffDuty, - DsLogAdmin::LogLocked, - DsLogAdmin::LogDisabled)) { // create a record list.. DsLogAdmin::RecordList reclist (records.length ()); @@ -876,11 +826,6 @@ TAO_Log_i::write_records (const DsLogAdmin::Anys &records) void TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::LogFull, - DsLogAdmin::LogOffDuty, - DsLogAdmin::LogLocked, - DsLogAdmin::LogDisabled)) { ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -962,9 +907,6 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist) void TAO_Log_i::set_record_attribute (DsLogAdmin::RecordId id, const DsLogAdmin::NVList &attr_list) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidRecordId, - DsLogAdmin::InvalidAttribute)) { ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -979,10 +921,6 @@ TAO_Log_i::set_records_attribute (const char *grammar, const char *constraint, const DsLogAdmin::NVList &attr_list) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidGrammar, - DsLogAdmin::InvalidConstraint, - DsLogAdmin::InvalidAttribute)) { ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -996,8 +934,6 @@ TAO_Log_i::set_records_attribute (const char *grammar, DsLogAdmin::NVList* TAO_Log_i::get_record_attribute (DsLogAdmin::RecordId id) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidRecordId)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -1010,8 +946,6 @@ TAO_Log_i::get_record_attribute (DsLogAdmin::RecordId id) void TAO_Log_i::flush (void) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::UnsupportedQoS)) { /// XXX locks? this->recordstore_->flush (); @@ -1019,7 +953,6 @@ TAO_Log_i::flush (void) CORBA::Boolean TAO_Log_i::scheduled (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { DsLogAdmin::TimeInterval interval = this->recordstore_->get_interval (); @@ -1071,7 +1004,6 @@ TAO_Log_i::scheduled (void) void TAO_Log_i::copy_attributes (DsLogAdmin::Log_ptr log) - ACE_THROW_SPEC ((CORBA::SystemException)) { const DsLogAdmin::LogFullActionType log_full_action = this->get_log_full_action (); @@ -1121,7 +1053,6 @@ TAO_Log_i::copy_attributes (DsLogAdmin::Log_ptr log) void TAO_Log_i::remove_old_records (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { const CORBA::ULong count = this->recordstore_->remove_old_records (); @@ -1148,7 +1079,6 @@ TAO_Log_i::remove_old_records (void) void TAO_Log_i::check_capacity_alarm_threshold (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { const CORBA::ULongLong max_size = this->recordstore_->get_max_size (); @@ -1210,7 +1140,6 @@ TAO_Log_i::check_capacity_alarm_threshold (void) void TAO_Log_i::reset_capacity_alarm_threshold (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { const CORBA::ULongLong max_size = this->recordstore_->get_max_size (); @@ -1241,7 +1170,6 @@ TAO_Log_i::reset_capacity_alarm_threshold (void) CORBA::Boolean TAO_Log_i::validate_capacity_alarm_thresholds ( const DsLogAdmin::CapacityAlarmThresholdList & threshs) - ACE_THROW_SPEC ((CORBA::SystemException)) { for (CORBA::ULong i = 0; i < threshs.length (); i++) if (threshs[i] > 100) @@ -1290,7 +1218,6 @@ TAO_Log_i::reset_log_qos (const DsLogAdmin::QoSList& qos) void TAO_Log_i::validate_log_qos (const DsLogAdmin::QoSList& qos) - ACE_THROW_SPEC ((DsLogAdmin::UnsupportedQoS)) { DsLogAdmin::QoSList denied; @@ -1358,9 +1285,6 @@ TAO_Log_i::reset_week_mask (const DsLogAdmin::WeekMask& masks) void TAO_Log_i::validate_week_mask (const DsLogAdmin::WeekMask& masks) - ACE_THROW_SPEC ((DsLogAdmin::InvalidTime, - DsLogAdmin::InvalidTimeInterval, - DsLogAdmin::InvalidMask)) { for (CORBA::ULong i = 0; i < masks.length (); ++i) { diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h index 60caca26dfc..241bbb6d161 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h @@ -71,115 +71,89 @@ public: */ //@{ /// Return the factory of the log. - DsLogAdmin::LogMgr_ptr my_factory (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + DsLogAdmin::LogMgr_ptr my_factory (void); /// Return the id of the log. - DsLogAdmin::LogId id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + DsLogAdmin::LogId id (void); /// Get the list of the QoS properties supported by the log. DsLogAdmin::QoSList* - get_log_qos (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + get_log_qos (void); /// Set the list of the QoS properties supported by the log. - void set_log_qos (const DsLogAdmin::QoSList & qos) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::UnsupportedQoS)); + void set_log_qos (const DsLogAdmin::QoSList & qos); /// Get the record life in seconds (0 infinite). CORBA::ULong - get_max_record_life (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + get_max_record_life (void); /// Set the record life in seconds (0 infinite). void - set_max_record_life (CORBA::ULong life) - ACE_THROW_SPEC ((CORBA::SystemException)); + set_max_record_life (CORBA::ULong life); /// Get the maximum size in octets. CORBA::ULongLong - get_max_size (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + get_max_size (void); /// Set the maximum size in octets. void - set_max_size (CORBA::ULongLong size) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidParam)); + set_max_size (CORBA::ULongLong size); /// Get the current size of the log in octets. CORBA::ULongLong - get_current_size (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + get_current_size (void); /// Return the number of records in the log. CORBA::ULongLong - get_n_records (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + get_n_records (void); /// Get the action to be taken when the log reaches its maximum size. DsLogAdmin::LogFullActionType - get_log_full_action (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + get_log_full_action (void); /// Set the action to be taken when the log reaches its maximum size. void - set_log_full_action (DsLogAdmin::LogFullActionType action) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidLogFullAction)); + set_log_full_action (DsLogAdmin::LogFullActionType action); /// Get the administrative state of the log. DsLogAdmin::AdministrativeState - get_administrative_state (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + get_administrative_state (void); /// Set the administrative state of the log. void - set_administrative_state (DsLogAdmin::AdministrativeState state) - ACE_THROW_SPEC ((CORBA::SystemException)); + set_administrative_state (DsLogAdmin::AdministrativeState state); /// Get the forwarding state of the log. /// @@ Note: is it ok to make this method virtual? /// @@@ Of course! get_forwarding_state() is virtual in the base /// class dictated by the IDL! -Ossama virtual DsLogAdmin::ForwardingState - get_forwarding_state (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + get_forwarding_state (void); /// Set the forwarding state of the log. /// @@ Note: is it ok to make this method virtual? void - set_forwarding_state (DsLogAdmin::ForwardingState state) - ACE_THROW_SPEC ((CORBA::SystemException)); + set_forwarding_state (DsLogAdmin::ForwardingState state); /// Get the operational state of the log. DsLogAdmin::OperationalState - get_operational_state (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + get_operational_state (void); /// Get the log duration DsLogAdmin::TimeInterval - get_interval (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + get_interval (void); /// Set the log duration. void - set_interval (const DsLogAdmin::TimeInterval & interval) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidTime, - DsLogAdmin::InvalidTimeInterval)); + set_interval (const DsLogAdmin::TimeInterval & interval); /// Get the availability status DsLogAdmin::AvailabilityStatus - get_availability_status (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + get_availability_status (void); /// Get the capacity alarm threshold DsLogAdmin::CapacityAlarmThresholdList* - get_capacity_alarm_thresholds (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + get_capacity_alarm_thresholds (void); /** * Set the capacity alarm threshold. Threshold values represent @@ -191,155 +165,108 @@ public: */ void set_capacity_alarm_thresholds - (const DsLogAdmin::CapacityAlarmThresholdList & threshs) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidThreshold)); + (const DsLogAdmin::CapacityAlarmThresholdList & threshs); /// Get the weekly scheduling parameters DsLogAdmin::WeekMask* - get_week_mask (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + get_week_mask (void); /// Set the weekly scheduling parameters. void - set_week_mask (const DsLogAdmin::WeekMask & masks) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidTime, - DsLogAdmin::InvalidTimeInterval, - DsLogAdmin::InvalidMask)); + set_week_mask (const DsLogAdmin::WeekMask & masks); /// Returns all records in the log that match the given constraint /// <c>. DsLogAdmin::RecordList* query (const char * grammar, const char * c, - DsLogAdmin::Iterator_out i) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidGrammar, - DsLogAdmin::InvalidConstraint)); + DsLogAdmin::Iterator_out i); /// Retrieve <how_many> records from time <from_time> using iterator /// <i>. DsLogAdmin::RecordList* retrieve (DsLogAdmin::TimeT from_time, CORBA::Long how_many, - DsLogAdmin::Iterator_out i) - ACE_THROW_SPEC ((CORBA::SystemException)); + DsLogAdmin::Iterator_out i); /// Returns the number of records matching constraint <c>. CORBA::ULong match (const char * grammar, - const char * c) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidGrammar, - DsLogAdmin::InvalidConstraint)); + const char * c); /// Delete records matching constraint <c>. CORBA::ULong delete_records (const char * grammar, - const char * c) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidGrammar, - DsLogAdmin::InvalidConstraint)); + const char * c); /// Delete records matching ids in <ids> CORBA::ULong - delete_records_by_id (const DsLogAdmin::RecordIdList & ids) - ACE_THROW_SPEC ((CORBA::SystemException)); + delete_records_by_id (const DsLogAdmin::RecordIdList & ids); /// Write records to the log storage. void - write_records (const DsLogAdmin::Anys & records) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::LogFull, - DsLogAdmin::LogOffDuty, - DsLogAdmin::LogLocked, - DsLogAdmin::LogDisabled)); + write_records (const DsLogAdmin::Anys & records); /// Write a list of record ids to storage. Raises DsLogAdmin::LogFull /// and DsLogAdmin::LogLocked void - write_recordlist (const DsLogAdmin::RecordList & list) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::LogFull, - DsLogAdmin::LogOffDuty, - DsLogAdmin::LogLocked, - DsLogAdmin::LogDisabled)); + write_recordlist (const DsLogAdmin::RecordList & list); /// Set single record attributes. void set_record_attribute (DsLogAdmin::RecordId id, - const DsLogAdmin::NVList & attr_list) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidRecordId, - DsLogAdmin::InvalidAttribute)); + const DsLogAdmin::NVList & attr_list); /// Set the attributes of all records that matches the /// constraints with same attr_list. CORBA::ULong set_records_attribute (const char * grammar, const char * c, - const DsLogAdmin::NVList & attr_list) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidGrammar, - DsLogAdmin::InvalidConstraint, - DsLogAdmin::InvalidAttribute)); + const DsLogAdmin::NVList & attr_list); /// Get the attributes of the record with id <id>. Raises /// DsLogAdmin::InvalidRecordId DsLogAdmin::NVList* - get_record_attribute (DsLogAdmin::RecordId id) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::InvalidRecordId)); + get_record_attribute (DsLogAdmin::RecordId id); /// Causes all pending events to be written to storage. Raises /// DsLogAdmin::UnsupportedQos void - flush (void) - ACE_THROW_SPEC ((CORBA::SystemException, - DsLogAdmin::UnsupportedQoS)); + flush (void); //@} /// Remove records that have exceeded max_record_life_. - void remove_old_records (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void remove_old_records (void); protected: /// Get the availability status /// @note must be called with locks held DsLogAdmin::AvailabilityStatus - get_availability_status_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + get_availability_status_i (void); /// Tells if the Log is scheduled to run now. /// @note must be called with locks held - CORBA::Boolean scheduled (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean scheduled (void); /// Copy the attributes of the log being passed. - void copy_attributes (DsLogAdmin::Log_ptr log) - ACE_THROW_SPEC ((CORBA::SystemException)); + void copy_attributes (DsLogAdmin::Log_ptr log); /// Check if threshold reached. - void check_capacity_alarm_threshold (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void check_capacity_alarm_threshold (void); /// Reset capacity alarm threshold. - void reset_capacity_alarm_threshold (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void reset_capacity_alarm_threshold (void); /// Check that valid threshold values have been given. static CORBA::Boolean validate_capacity_alarm_thresholds ( - const DsLogAdmin::CapacityAlarmThresholdList & threshs) - ACE_THROW_SPEC ((CORBA::SystemException)); + const DsLogAdmin::CapacityAlarmThresholdList & threshs); /// Reset Log QoS void reset_log_qos (const DsLogAdmin::QoSList& qos); /// Validate log QoS - void validate_log_qos (const DsLogAdmin::QoSList& qos) - ACE_THROW_SPEC ((DsLogAdmin::UnsupportedQoS)); + void validate_log_qos (const DsLogAdmin::QoSList& qos); /// Reset Week Mask /// @@ -354,10 +281,7 @@ protected: /// Used to check whether week mask is valid. If not, throws an /// InvalidTime, InvalidTimeInterval, or InvalidMask exception. /// - void validate_week_mask (const DsLogAdmin::WeekMask& masks) - ACE_THROW_SPEC ((DsLogAdmin::InvalidTime, - DsLogAdmin::InvalidTimeInterval, - DsLogAdmin::InvalidMask)); + void validate_week_mask (const DsLogAdmin::WeekMask& masks); protected: /// Reference to the LogMgr servant diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp index 226586b688b..c4bac928a7b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp @@ -52,10 +52,6 @@ void TAO_Notify_LogConsumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )) { // No-Op. } @@ -63,10 +59,6 @@ TAO_Notify_LogConsumer::offer_change void TAO_Notify_LogConsumer::push (const CORBA::Any& event) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )) { // create a record list... DsLogAdmin::RecordList recList (1); @@ -124,9 +116,6 @@ TAO_Notify_LogConsumer::push void TAO_Notify_LogConsumer::disconnect_push_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { } diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h index 2739da295fb..ae88fcff8aa 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h @@ -72,26 +72,15 @@ protected: virtual void offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )); + ); // = PushSupplier methods virtual void push ( const CORBA::Any & event - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )); + ); virtual void disconnect_push_consumer ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); /// ProxyPushSupplier used to connect to NotifyLog. CosNotifyChannelAdmin::ProxyPushSupplier_var proxy_supplier_; diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp index 512714b612e..1f2d514406d 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp @@ -81,13 +81,6 @@ TAO_NotifyLogFactory_i::create ( const CosNotification::AdminProperties & initial_admin, DsLogAdmin::LogId_out id_out ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DsLogAdmin::InvalidLogFullAction, - DsLogAdmin::InvalidThreshold, - CosNotification::UnsupportedQoS, - CosNotification::UnsupportedAdmin - )) { ACE_UNUSED_ARG (initial_qos); ACE_UNUSED_ARG (initial_admin); @@ -125,14 +118,6 @@ TAO_NotifyLogFactory_i::create_with_id ( const CosNotification::QoSProperties & initial_qos, const CosNotification::AdminProperties & initial_admin ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DsLogAdmin::LogIdAlreadyExists, - DsLogAdmin::InvalidLogFullAction, - DsLogAdmin::InvalidThreshold, - CosNotification::UnsupportedQoS, - CosNotification::UnsupportedAdmin - )) { ACE_UNUSED_ARG (initial_qos); ACE_UNUSED_ARG (initial_admin); @@ -192,81 +177,54 @@ TAO_NotifyLogFactory_i::create_log_servant (DsLogAdmin::LogId id) CosNotifyChannelAdmin::AdminID TAO_NotifyLogFactory_i::MyID (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return consumer_admin_->MyID (); } CosNotifyChannelAdmin::EventChannel_ptr TAO_NotifyLogFactory_i::MyChannel (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { throw CORBA::NO_IMPLEMENT(); } CosNotifyChannelAdmin::InterFilterGroupOperator TAO_NotifyLogFactory_i::MyOperator (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return consumer_admin_->MyOperator (); } CosNotifyFilter::MappingFilter_ptr TAO_NotifyLogFactory_i::priority_filter (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return consumer_admin_->priority_filter (); } void TAO_NotifyLogFactory_i::priority_filter (CosNotifyFilter::MappingFilter_ptr filter) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { consumer_admin_->priority_filter(filter); } CosNotifyFilter::MappingFilter_ptr TAO_NotifyLogFactory_i::lifetime_filter (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return consumer_admin_->lifetime_filter (); } void TAO_NotifyLogFactory_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr filter) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { consumer_admin_->lifetime_filter (filter); } CosNotifyChannelAdmin::ProxyIDSeq* TAO_NotifyLogFactory_i::pull_suppliers (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return consumer_admin_->pull_suppliers (); } CosNotifyChannelAdmin::ProxyIDSeq* TAO_NotifyLogFactory_i::push_suppliers (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return consumer_admin_->push_suppliers (); } @@ -274,10 +232,6 @@ TAO_NotifyLogFactory_i::push_suppliers (void) CosNotifyChannelAdmin::ProxySupplier_ptr TAO_NotifyLogFactory_i::get_proxy_supplier ( CosNotifyChannelAdmin::ProxyID proxy_id) - ACE_THROW_SPEC (( - CosNotifyChannelAdmin::ProxyNotFound, - CORBA::SystemException - )) { return consumer_admin_->get_proxy_supplier (proxy_id); } @@ -286,10 +240,6 @@ CosNotifyChannelAdmin::ProxySupplier_ptr TAO_NotifyLogFactory_i::obtain_notification_pull_supplier ( CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID& proxy_id) - ACE_THROW_SPEC (( - CosNotifyChannelAdmin::AdminLimitExceeded, - CORBA::SystemException - )) { return consumer_admin_->obtain_notification_pull_supplier (ctype, proxy_id); } @@ -298,10 +248,6 @@ CosNotifyChannelAdmin::ProxySupplier_ptr TAO_NotifyLogFactory_i::obtain_notification_push_supplier ( CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID& proxy_id) - ACE_THROW_SPEC (( - CosNotifyChannelAdmin::AdminLimitExceeded, - CORBA::SystemException - )) { return consumer_admin_->obtain_notification_push_supplier (ctype, proxy_id); } @@ -309,9 +255,6 @@ TAO_NotifyLogFactory_i::obtain_notification_push_supplier ( CosEventChannelAdmin::ProxyPushSupplier_ptr TAO_NotifyLogFactory_i::obtain_push_supplier ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return consumer_admin_->obtain_push_supplier (); } @@ -321,9 +264,6 @@ TAO_NotifyLogFactory_i::obtain_push_supplier ( CosEventChannelAdmin::ProxyPullSupplier_ptr TAO_NotifyLogFactory_i::obtain_pull_supplier ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return consumer_admin_->obtain_pull_supplier (); @@ -331,9 +271,6 @@ TAO_NotifyLogFactory_i::obtain_pull_supplier ( void TAO_NotifyLogFactory_i::destroy (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // No-Op. } @@ -342,29 +279,18 @@ TAO_NotifyLogFactory_i::destroy (void) void TAO_NotifyLogFactory_i::subscription_change (const CosNotification::EventTypeSeq& added, const CosNotification::EventTypeSeq& removed) - ACE_THROW_SPEC (( - CosNotifyComm::InvalidEventType, - CORBA::SystemException - )) { consumer_admin_->subscription_change (added, removed); } CosNotification::QoSProperties* TAO_NotifyLogFactory_i::get_qos (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return consumer_admin_->get_qos (); } void TAO_NotifyLogFactory_i::set_qos (const CosNotification::QoSProperties& qos) - ACE_THROW_SPEC (( - CosNotification::UnsupportedQoS, - CORBA::SystemException - )) { consumer_admin_->set_qos (qos); } @@ -372,56 +298,36 @@ TAO_NotifyLogFactory_i::set_qos (const CosNotification::QoSProperties& qos) void TAO_NotifyLogFactory_i::validate_qos (const CosNotification::QoSProperties& required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos) - ACE_THROW_SPEC (( - CosNotification::UnsupportedQoS, - CORBA::SystemException - )) { consumer_admin_->validate_qos (required_qos, available_qos); } CosNotifyFilter::FilterID TAO_NotifyLogFactory_i::add_filter (CosNotifyFilter::Filter_ptr filter) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return consumer_admin_->add_filter (filter); } void TAO_NotifyLogFactory_i::remove_filter (CosNotifyFilter::FilterID id) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { consumer_admin_->remove_filter (id); } CosNotifyFilter::Filter_ptr TAO_NotifyLogFactory_i::get_filter (CosNotifyFilter::FilterID id) - ACE_THROW_SPEC (( - CosNotifyFilter::FilterNotFound, - CORBA::SystemException - )) { return consumer_admin_->get_filter (id); } CosNotifyFilter::FilterIDSeq* TAO_NotifyLogFactory_i::get_all_filters (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return consumer_admin_->get_all_filters (); } void TAO_NotifyLogFactory_i::remove_all_filters (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { consumer_admin_->remove_all_filters (); } diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h index 89ba2e56282..d883bec416b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h @@ -72,14 +72,7 @@ public: const CosNotification::QoSProperties & initial_qos, const CosNotification::AdminProperties & initial_admin, DsLogAdmin::LogId_out id - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DsLogAdmin::InvalidLogFullAction, - DsLogAdmin::InvalidThreshold, - CosNotification::UnsupportedQoS, - CosNotification::UnsupportedAdmin - )); + ); /// Same as create (), but allows clients to specify the id. DsNotifyLogAdmin::NotifyLog_ptr create_with_id ( @@ -89,147 +82,60 @@ public: const DsLogAdmin::CapacityAlarmThresholdList & thresholds, const CosNotification::QoSProperties & initial_qos, const CosNotification::AdminProperties & initial_admin - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DsLogAdmin::LogIdAlreadyExists, - DsLogAdmin::InvalidLogFullAction, - DsLogAdmin::InvalidThreshold, - CosNotification::UnsupportedQoS, - CosNotification::UnsupportedAdmin - )); + ); // = Methods from CosNotifyChannelAdmin::ConsumerAdmin. - CosNotifyChannelAdmin::AdminID MyID (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - CosNotifyChannelAdmin::EventChannel_ptr MyChannel (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - CosNotifyFilter::MappingFilter_ptr priority_filter (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - void priority_filter (CosNotifyFilter::MappingFilter_ptr) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - CosNotifyFilter::MappingFilter_ptr lifetime_filter (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - void lifetime_filter (CosNotifyFilter::MappingFilter_ptr) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - CosNotifyChannelAdmin::ProxyIDSeq* pull_suppliers (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - CosNotifyChannelAdmin::ProxyIDSeq* push_suppliers (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + CosNotifyChannelAdmin::AdminID MyID (void); + + CosNotifyChannelAdmin::EventChannel_ptr MyChannel (void); + + CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (void); + + CosNotifyFilter::MappingFilter_ptr priority_filter (void); + void priority_filter (CosNotifyFilter::MappingFilter_ptr); + + CosNotifyFilter::MappingFilter_ptr lifetime_filter (void); + void lifetime_filter (CosNotifyFilter::MappingFilter_ptr); + + CosNotifyChannelAdmin::ProxyIDSeq* pull_suppliers (void); + CosNotifyChannelAdmin::ProxyIDSeq* push_suppliers (void); CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier ( - CosNotifyChannelAdmin::ProxyID proxy_id) - ACE_THROW_SPEC (( - CosNotifyChannelAdmin::ProxyNotFound, - CORBA::SystemException - )); + CosNotifyChannelAdmin::ProxyID proxy_id); CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_pull_supplier ( CosNotifyChannelAdmin::ClientType ctype, - CosNotifyChannelAdmin::ProxyID& proxy_id) - ACE_THROW_SPEC (( - CosNotifyChannelAdmin::AdminLimitExceeded, - CORBA::SystemException - )); + CosNotifyChannelAdmin::ProxyID& proxy_id); CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_push_supplier ( CosNotifyChannelAdmin::ClientType ctype, - CosNotifyChannelAdmin::ProxyID& id) - ACE_THROW_SPEC (( - CosNotifyChannelAdmin::AdminLimitExceeded, - CORBA::SystemException - )); + CosNotifyChannelAdmin::ProxyID& id); CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); - void destroy (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + void destroy (void); /// CosNotifyComm::NotifySubscribe. void subscription_change (const CosNotification::EventTypeSeq& added, - const CosNotification::EventTypeSeq& removed) - ACE_THROW_SPEC (( - CosNotifyComm::InvalidEventType, - CORBA::SystemException - )); + const CosNotification::EventTypeSeq& removed); /// CosNotification::QoSAdmin. - CosNotification::QoSProperties* get_qos (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - void set_qos (const CosNotification::QoSProperties&) - ACE_THROW_SPEC (( - CosNotification::UnsupportedQoS, - CORBA::SystemException - )); + CosNotification::QoSProperties* get_qos (void); + void set_qos (const CosNotification::QoSProperties&); void validate_qos (const CosNotification::QoSProperties&, - CosNotification::NamedPropertyRangeSeq_out) - ACE_THROW_SPEC (( - CosNotification::UnsupportedQoS, - CORBA::SystemException - )); + CosNotification::NamedPropertyRangeSeq_out); /// CosNotifyFilter::FilterAdmin. - CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - void remove_filter (CosNotifyFilter::FilterID) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID) - ACE_THROW_SPEC (( - CosNotifyFilter::FilterNotFound, - CORBA::SystemException - )); - CosNotifyFilter::FilterIDSeq* get_all_filters (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - void remove_all_filters (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr); + void remove_filter (CosNotifyFilter::FilterID); + CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID); + CosNotifyFilter::FilterIDSeq* get_all_filters (void); + void remove_all_filters (void); protected: virtual CORBA::RepositoryId diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp index e3f5117bedf..fb5cf40bf1a 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp @@ -47,9 +47,6 @@ TAO_NotifyLogNotification::~TAO_NotifyLogNotification (void) void TAO_NotifyLogNotification::send_notification (const CORBA::Any& any) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { this->proxy_consumer_->push (any); } @@ -58,10 +55,6 @@ void TAO_NotifyLogNotification::subscription_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed */) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )) { //No-Op. } @@ -69,9 +62,6 @@ TAO_NotifyLogNotification::subscription_change void TAO_NotifyLogNotification::disconnect_push_supplier (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h index 5d39f68220a..cc49f39e868 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h @@ -68,24 +68,14 @@ protected: virtual void subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )); + ); // = StructuredPushSupplier method virtual void disconnect_push_supplier ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); /// Send the event on the event channel. - virtual void send_notification (const CORBA::Any& any) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void send_notification (const CORBA::Any& any); private: /// A reference to the ORB. diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp index 0bb2cec3a2f..a44248f0908 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp @@ -44,9 +44,6 @@ TAO_NotifyLog_i::~TAO_NotifyLog_i () DsLogAdmin::Log_ptr TAO_NotifyLog_i::copy (DsLogAdmin::LogId &id) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { DsNotifyLogAdmin::NotifyLogFactory_var notifyLogFactory = DsNotifyLogAdmin::NotifyLogFactory::_narrow (factory_.in ()); @@ -66,9 +63,6 @@ TAO_NotifyLog_i::copy (DsLogAdmin::LogId &id) DsLogAdmin::Log_ptr TAO_NotifyLog_i::copy_with_id (DsLogAdmin::LogId id) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { DsNotifyLogAdmin::NotifyLogFactory_var notifyLogFactory = DsNotifyLogAdmin::NotifyLogFactory::_narrow (factory_.in ()); @@ -89,7 +83,6 @@ TAO_NotifyLog_i::copy_with_id (DsLogAdmin::LogId id) void TAO_NotifyLog_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { notifier_->object_deletion (logid_); @@ -156,9 +149,6 @@ TAO_NotifyLog_i::activate (void) //IDL to C++ CosNotifyFilter::Filter_ptr TAO_NotifyLog_i::get_filter (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { //TODO: need to add impl throw CORBA::NO_IMPLEMENT (); @@ -166,9 +156,6 @@ TAO_NotifyLog_i::get_filter (void) void TAO_NotifyLog_i::set_filter (CosNotifyFilter::Filter_ptr /* filter */) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { throw CORBA::NO_IMPLEMENT (); @@ -177,9 +164,6 @@ TAO_NotifyLog_i::set_filter (CosNotifyFilter::Filter_ptr /* filter */) CosNotifyChannelAdmin::EventChannelFactory_ptr TAO_NotifyLog_i::MyFactory (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { //TODO: need to add impl throw CORBA::NO_IMPLEMENT (); @@ -187,27 +171,18 @@ TAO_NotifyLog_i::MyFactory (void) CosNotifyChannelAdmin::ConsumerAdmin_ptr TAO_NotifyLog_i::default_consumer_admin (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->event_channel_->default_consumer_admin (); } CosNotifyChannelAdmin::SupplierAdmin_ptr TAO_NotifyLog_i::default_supplier_admin (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->event_channel_->default_supplier_admin (); } CosNotifyFilter::FilterFactory_ptr TAO_NotifyLog_i::default_filter_factory (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->event_channel_->default_filter_factory (); } @@ -215,9 +190,6 @@ TAO_NotifyLog_i::default_filter_factory (void) CosNotifyChannelAdmin::ConsumerAdmin_ptr TAO_NotifyLog_i::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID& id) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->event_channel_->new_for_consumers (op,id); } @@ -225,75 +197,48 @@ TAO_NotifyLog_i::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOpera CosNotifyChannelAdmin::SupplierAdmin_ptr TAO_NotifyLog_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID& id) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->event_channel_->new_for_suppliers (op,id); } CosNotifyChannelAdmin::ConsumerAdmin_ptr TAO_NotifyLog_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id) - ACE_THROW_SPEC (( - CosNotifyChannelAdmin::AdminNotFound, - CORBA::SystemException - )) { return this->event_channel_->get_consumeradmin (id); } CosNotifyChannelAdmin::SupplierAdmin_ptr TAO_NotifyLog_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id) - ACE_THROW_SPEC (( - CosNotifyChannelAdmin::AdminNotFound, - CORBA::SystemException - )) { return this->event_channel_->get_supplieradmin (id); } CosNotifyChannelAdmin::AdminIDSeq* TAO_NotifyLog_i::get_all_consumeradmins (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->event_channel_->get_all_consumeradmins (); } CosNotifyChannelAdmin::AdminIDSeq* TAO_NotifyLog_i::get_all_supplieradmins (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->event_channel_->get_all_supplieradmins (); } CosNotification::AdminProperties* TAO_NotifyLog_i::get_admin (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->event_channel_->get_admin (); } void TAO_NotifyLog_i::set_admin (const CosNotification::AdminProperties& admin) - ACE_THROW_SPEC (( - CosNotification::UnsupportedAdmin, - CORBA::SystemException - )) { this->event_channel_->set_admin (admin); } CosNotification::QoSProperties* TAO_NotifyLog_i::get_qos (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { //need to add merging of QoS from Log_i and EventChannel_i throw CORBA::NO_IMPLEMENT (); @@ -301,10 +246,6 @@ TAO_NotifyLog_i::get_qos (void) void TAO_NotifyLog_i::set_qos (const CosNotification::QoSProperties& /* qos */) - ACE_THROW_SPEC (( - CosNotification::UnsupportedQoS, - CORBA::SystemException - )) { throw CORBA::NO_IMPLEMENT (); //TODO: need to add later @@ -314,8 +255,6 @@ void TAO_NotifyLog_i::validate_qos ( const CosNotification::QoSProperties& /* required_qos */, CosNotification::NamedPropertyRangeSeq_out /* available_qos */) - ACE_THROW_SPEC ((CosNotification::UnsupportedQoS, - CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); @@ -324,9 +263,6 @@ TAO_NotifyLog_i::validate_qos ( CosEventChannelAdmin::ConsumerAdmin_ptr TAO_NotifyLog_i::for_consumers (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->event_channel_->for_consumers(); } @@ -334,9 +270,6 @@ TAO_NotifyLog_i::for_consumers (void) CosEventChannelAdmin::SupplierAdmin_ptr TAO_NotifyLog_i::for_suppliers ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->event_channel_->for_suppliers(); } diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h index 08e111ff2c9..3b5c70666d8 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h @@ -70,21 +70,14 @@ public: ~TAO_NotifyLog_i (); /// Duplicate the log. - virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id); /// Duplicate the log specifying an id. - virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id); /// Destroy the log object and all contained records. void - destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + destroy (void); /// Activate the NotifyLog. void @@ -92,123 +85,61 @@ public: // = Methods from CosNotifyChannelAdmin::EventChannel. CosNotifyFilter::Filter_ptr - get_filter (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + get_filter (void); - void set_filter (CosNotifyFilter::Filter_ptr filter) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + void set_filter (CosNotifyFilter::Filter_ptr filter); CosNotifyChannelAdmin::EventChannelFactory_ptr - MyFactory (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + MyFactory (void); CosNotifyChannelAdmin::ConsumerAdmin_ptr - default_consumer_admin (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + default_consumer_admin (void); CosNotifyChannelAdmin::SupplierAdmin_ptr - default_supplier_admin (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + default_supplier_admin (void); CosNotifyFilter::FilterFactory_ptr - default_filter_factory (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + default_filter_factory (void); CosNotifyChannelAdmin::ConsumerAdmin_ptr new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op, - CosNotifyChannelAdmin::AdminID& id) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + CosNotifyChannelAdmin::AdminID& id); CosNotifyChannelAdmin::SupplierAdmin_ptr new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op, - CosNotifyChannelAdmin::AdminID& id) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + CosNotifyChannelAdmin::AdminID& id); CosNotifyChannelAdmin::ConsumerAdmin_ptr - get_consumeradmin (CosNotifyChannelAdmin::AdminID id) - ACE_THROW_SPEC (( - CosNotifyChannelAdmin::AdminNotFound, - CORBA::SystemException - )); + get_consumeradmin (CosNotifyChannelAdmin::AdminID id); CosNotifyChannelAdmin::SupplierAdmin_ptr - get_supplieradmin (CosNotifyChannelAdmin::AdminID id) - ACE_THROW_SPEC (( - CosNotifyChannelAdmin::AdminNotFound, - CORBA::SystemException - )); + get_supplieradmin (CosNotifyChannelAdmin::AdminID id); CosNotifyChannelAdmin::AdminIDSeq* - get_all_consumeradmins (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + get_all_consumeradmins (void); CosNotifyChannelAdmin::AdminIDSeq* - get_all_supplieradmins (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + get_all_supplieradmins (void); CosNotification::AdminProperties* - get_admin (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + get_admin (void); - void set_admin (const CosNotification::AdminProperties& admin) - ACE_THROW_SPEC (( - CosNotification::UnsupportedAdmin, - CORBA::SystemException - )); + void set_admin (const CosNotification::AdminProperties& admin); CosNotification::QoSProperties* - get_qos (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + get_qos (void); - void set_qos (const CosNotification::QoSProperties&) - ACE_THROW_SPEC (( - CosNotification::UnsupportedQoS, - CORBA::SystemException - )); + void set_qos (const CosNotification::QoSProperties&); void validate_qos (const CosNotification::QoSProperties&, - CosNotification::NamedPropertyRangeSeq_out) - ACE_THROW_SPEC (( - CosNotification::UnsupportedQoS, - CORBA::SystemException - )); + CosNotification::NamedPropertyRangeSeq_out); // = Methods from DsEventLogAdmin::EventLog. CosEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + for_consumers (void); CosEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + for_suppliers (void); private: /// The PushConsumer that consumes the events and stores them diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp index 9bc54b2d479..1ad4bf75e82 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp @@ -43,7 +43,6 @@ TAO_Rtec_LogConsumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer void TAO_Rtec_LogConsumer::push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { // create a record list... DsLogAdmin::RecordList recList (1); @@ -58,7 +57,6 @@ TAO_Rtec_LogConsumer::push (const RtecEventComm::EventSet& events) void TAO_Rtec_LogConsumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->supplier_proxy_->disconnect_push_supplier (); } diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h index 86f0976f833..6d7ae4ae311 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h @@ -69,13 +69,11 @@ public: private: /// Disconnect from EventLog. - void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void disconnect_push_consumer (void); /// This method will call TAO_Log_i::log() to write /// the event to the Log. - void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push (const RtecEventComm::EventSet& events); /// ProxyPushSupplier used to connect to RTEventLog. RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_; diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp index 69f700e5210..d7a2e535aae 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp @@ -99,11 +99,6 @@ TAO_RTEventLogFactory_i::create ( const DsLogAdmin::CapacityAlarmThresholdList & thresholds, DsLogAdmin::LogId_out id_out ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DsLogAdmin::InvalidLogFullAction, - DsLogAdmin::InvalidThreshold - )) { this->create_i (full_action, max_size, @@ -136,12 +131,6 @@ TAO_RTEventLogFactory_i::create_with_id ( CORBA::ULongLong max_size, const DsLogAdmin::CapacityAlarmThresholdList & thresholds ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DsLogAdmin::LogIdAlreadyExists, - DsLogAdmin::InvalidLogFullAction, - DsLogAdmin::InvalidThreshold - )) { this->create_with_id_i (id, full_action, @@ -199,9 +188,6 @@ TAO_RTEventLogFactory_i::create_log_servant (DsLogAdmin::LogId id) RtecEventChannelAdmin::ProxyPushSupplier_ptr TAO_RTEventLogFactory_i::obtain_push_supplier ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return consumer_admin_->obtain_push_supplier(); } diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h index 4b2d5889cb2..75acc1d0b6c 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h @@ -75,12 +75,7 @@ public: CORBA::ULongLong max_size, const DsLogAdmin::CapacityAlarmThresholdList & thresholds, DsLogAdmin::LogId_out id - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DsLogAdmin::InvalidLogFullAction, - DsLogAdmin::InvalidThreshold - )); + ); /// Same as create (), but allows clients to specify the id. RTEventLogAdmin::EventLog_ptr create_with_id ( @@ -88,20 +83,11 @@ public: DsLogAdmin::LogFullActionType full_action, CORBA::ULongLong max_size, const DsLogAdmin::CapacityAlarmThresholdList & thresholds - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - DsLogAdmin::LogIdAlreadyExists, - DsLogAdmin::InvalidLogFullAction, - DsLogAdmin::InvalidThreshold - )); + ); // = Implementation of the RtecEventChannelAdmin::ConsumerAdmin methods. RtecEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); protected: virtual CORBA::RepositoryId diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp index ad1a4b1fafa..14a78477a3b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp @@ -40,7 +40,6 @@ TAO_RTEventLogNotification::~TAO_RTEventLogNotification (void) void TAO_RTEventLogNotification::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // No-Op. } @@ -70,7 +69,6 @@ TAO_RTEventLogNotification::obtainProxyConsumer (void) void TAO_RTEventLogNotification::send_notification (const CORBA::Any& any) - ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventComm::EventSet event (1); event.length (1); diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h index a2530fe0783..22fa66d06c3 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h @@ -58,8 +58,7 @@ public: ~TAO_RTEventLogNotification (void); /// The skeleton methods. - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); protected: // = Helper methods @@ -69,8 +68,7 @@ protected: void obtainProxyConsumer (void); // Send the event on the event channel. - virtual void send_notification (const CORBA::Any& any) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_notification (const CORBA::Any& any); private: /// The ORB reference. diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp index 3cd28485e62..3b09d9d207b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp @@ -49,7 +49,6 @@ TAO_RTEventLog_i::~TAO_RTEventLog_i () DsLogAdmin::Log_ptr TAO_RTEventLog_i::copy (DsLogAdmin::LogId &id) - ACE_THROW_SPEC ((CORBA::SystemException)) { RTEventLogAdmin::EventLogFactory_var eventLogFactory = RTEventLogAdmin::EventLogFactory::_narrow (factory_.in ()); @@ -65,7 +64,6 @@ TAO_RTEventLog_i::copy (DsLogAdmin::LogId &id) DsLogAdmin::Log_ptr TAO_RTEventLog_i::copy_with_id (DsLogAdmin::LogId id) - ACE_THROW_SPEC ((DsLogAdmin::LogIdAlreadyExists, CORBA::SystemException)) { RTEventLogAdmin::EventLogFactory_var eventLogFactory = RTEventLogAdmin::EventLogFactory::_narrow (factory_.in ()); @@ -81,7 +79,6 @@ TAO_RTEventLog_i::copy_with_id (DsLogAdmin::LogId id) void TAO_RTEventLog_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { notifier_->object_deletion (logid_); @@ -107,7 +104,6 @@ TAO_RTEventLog_i::activate (void) RtecEventChannelAdmin::ConsumerAdmin_ptr TAO_RTEventLog_i::for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->event_channel_->for_consumers(); } @@ -115,9 +111,6 @@ TAO_RTEventLog_i::for_consumers (void) RtecEventChannelAdmin::SupplierAdmin_ptr TAO_RTEventLog_i::for_suppliers ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->event_channel_->for_suppliers(); } @@ -125,10 +118,6 @@ TAO_RTEventLog_i::for_suppliers ( RtecEventChannelAdmin::Observer_Handle TAO_RTEventLog_i::append_observer ( RtecEventChannelAdmin::Observer_ptr observer) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)) { return this->observer_strategy_->append_observer (observer); } @@ -136,10 +125,6 @@ TAO_RTEventLog_i::append_observer ( void TAO_RTEventLog_i::remove_observer ( RtecEventChannelAdmin::Observer_Handle handle) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)) { this->observer_strategy_->remove_observer (handle); } diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h index 01f965c729a..de0a2a0f37d 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h @@ -72,17 +72,14 @@ public: ~TAO_RTEventLog_i (); /// Duplicate the log. - virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id); /// Duplicate the log specifying an id. - virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id) - ACE_THROW_SPEC ((DsLogAdmin::LogIdAlreadyExists, CORBA::SystemException)); + virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id); /// Destroy the log object and all contained records. void - destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + destroy (void); /// Activate the RTEventLog. void @@ -90,25 +87,15 @@ public: // = The RtecEventChannelAdmin::EventChannel interface methods. RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + for_consumers (void); RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + for_suppliers (void); virtual RtecEventChannelAdmin::Observer_Handle - append_observer (RtecEventChannelAdmin::Observer_ptr) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); + append_observer (RtecEventChannelAdmin::Observer_ptr); virtual void - remove_observer (RtecEventChannelAdmin::Observer_Handle) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)); + remove_observer (RtecEventChannelAdmin::Observer_Handle); private: /// The EventChannel used. diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h index 0335c8bf43c..52f73b55c2f 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h @@ -100,10 +100,7 @@ public: CORBA::Short register_period (RtecScheduler::Period_t p, CORBA::Environment &ACE_TRY_ENV - = CORBA::Environment::default_environment ()) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL, - Metrics::SYNCHRONIZATION)); + = CORBA::Environment::default_environment ()); // Binds the period to the internal frame map, with a new frame data // structure. Returns 0 if a new entry is bound successfully, // returns 1 if an attempt is made to bind an existing entry, and @@ -114,15 +111,11 @@ public: CORBA::Short update_all_frames_with_time (Metrics::Time mt, CORBA::Environment &ACE_TRY_ENV - = CORBA::Environment::default_environment ()) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::SYNCHRONIZATION)); + = CORBA::Environment::default_environment ()); // Updates time frames, based on the passed time value. CORBA::Short update_all_frames (CORBA::Environment &ACE_TRY_ENV - = CORBA::Environment::default_environment ()) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::SYNCHRONIZATION)); + = CORBA::Environment::default_environment ()); // Updates time frames, based on the current time as of the call. CORBA::Short update_frame (RtecScheduler::Period_t p, const ACE_Time_Value& tv); @@ -132,19 +125,13 @@ public: CORBA::Short update_frame_with_time (RtecScheduler::Period_t p, Metrics::Time mt, CORBA::Environment &ACE_TRY_ENV - = CORBA::Environment::default_environment ()) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL, - Metrics::SYNCHRONIZATION)); + = CORBA::Environment::default_environment ()); // Updates the passed period's time frame, based on the passed time // value. CORBA::Short update_frame (RtecScheduler::Period_t p, CORBA::Environment &ACE_TRY_ENV - = CORBA::Environment::default_environment ()) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL, - Metrics::SYNCHRONIZATION)); + = CORBA::Environment::default_environment ()); // Updates the passed period's time frame, based on the current time // as of the call. @@ -153,15 +140,11 @@ public: CORBA::Short reset_all_frames_with_time (Metrics::Time mt, CORBA::Environment &ACE_TRY_ENV - = CORBA::Environment::default_environment ()) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::SYNCHRONIZATION)); + = CORBA::Environment::default_environment ()); // Resets time frames, based on the passed time value. CORBA::Short reset_all_frames (CORBA::Environment &ACE_TRY_ENV - = CORBA::Environment::default_environment ()) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::SYNCHRONIZATION)); + = CORBA::Environment::default_environment ()); // Resets time frames, based on the current time as of the call. CORBA::Short reset_frame (RtecScheduler::Period_t p, const ACE_Time_Value& tv); @@ -171,19 +154,13 @@ public: CORBA::Short reset_frame_with_time (RtecScheduler::Period_t p, Metrics::Time mt, CORBA::Environment &ACE_TRY_ENV - = CORBA::Environment::default_environment ()) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL, - Metrics::SYNCHRONIZATION)); + = CORBA::Environment::default_environment ()); // Resets the passed period's start-of-frame, based on the passed time // value. CORBA::Short reset_frame (RtecScheduler::Period_t p, CORBA::Environment &ACE_TRY_ENV - = CORBA::Environment::default_environment ()) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL, - Metrics::SYNCHRONIZATION)); + = CORBA::Environment::default_environment ()); // Resets the passed period's start-of-frame, based on the current time // as of the call. @@ -193,10 +170,7 @@ public: CORBA::Short get_start_time (RtecScheduler::Period_t p, Metrics::Time &start, CORBA::Environment &ACE_TRY_ENV - = CORBA::Environment::default_environment ()) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL, - Metrics::SYNCHRONIZATION)); + = CORBA::Environment::default_environment ()); // Gets the start time for the period's current frame. CORBA::Short get_end_time (RtecScheduler::Period_t p, ACE_Time_Value &end); @@ -205,19 +179,13 @@ public: CORBA::Short get_end_time (RtecScheduler::Period_t p, Metrics::Time &end, CORBA::Environment &ACE_TRY_ENV - = CORBA::Environment::default_environment ()) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL, - Metrics::SYNCHRONIZATION)); + = CORBA::Environment::default_environment ()); // Gets the end time for the period's current frame. CORBA::Short get_frame_id (RtecScheduler::Period_t p, CORBA::ULong &id, CORBA::Environment &ACE_TRY_ENV - = CORBA::Environment::default_environment ()) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL, - Metrics::SYNCHRONIZATION)); + = CORBA::Environment::default_environment ()); // Gets the locally unique identifier for the period's current frame. CORBA::Short get_frame_data (RtecScheduler::Period_t p, ACE_Time_Value &start, @@ -229,10 +197,7 @@ public: Metrics::Time &end, CORBA::ULong &id, CORBA::Environment &ACE_TRY_ENV - = CORBA::Environment::default_environment ()) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL, - Metrics::SYNCHRONIZATION)); + = CORBA::Environment::default_environment ()); // Gets the start time, end time, and id period's current frame. protected: diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.inl b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.inl index a3ec949edb9..37a6206fce0 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.inl +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.inl @@ -54,9 +54,6 @@ ACE_INLINE CORBA::Short TAO_Metrics_FrameManager<ACE_LOCK>:: register_period (RtecScheduler::Period_t p, CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL, - Metrics::SYNCHRONIZATION)) { // Treat a zero period as a special case: no need to register, but // no harm if someone tries. @@ -128,8 +125,6 @@ ACE_INLINE CORBA::Short TAO_Metrics_FrameManager<ACE_LOCK>:: update_all_frames_with_time (Metrics::Time mt, CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::SYNCHRONIZATION)) { // Reentrant method that calls locked method. ACE_Time_Value tv; @@ -148,8 +143,6 @@ template <class ACE_LOCK> ACE_INLINE CORBA::Short TAO_Metrics_FrameManager<ACE_LOCK>:: update_all_frames (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::SYNCHRONIZATION)) { // Synchronize read/write access to the map while the new frames are // being computed. @@ -224,9 +217,6 @@ ACE_INLINE CORBA::Short TAO_Metrics_FrameManager<ACE_LOCK>:: update_frame_with_time (RtecScheduler::Period_t p, Metrics::Time mt, CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL, - Metrics::SYNCHRONIZATION)) { // Treat a zero period as a special case. if (p == 0) @@ -253,9 +243,6 @@ template <class ACE_LOCK> ACE_INLINE CORBA::Short TAO_Metrics_FrameManager<ACE_LOCK>:: update_frame (RtecScheduler::Period_t p, CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL, - Metrics::SYNCHRONIZATION)) { // Treat a zero period as a special case. if (p == 0) @@ -328,8 +315,6 @@ ACE_INLINE CORBA::Short TAO_Metrics_FrameManager<ACE_LOCK>:: reset_all_frames_with_time (Metrics::Time mt, CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::SYNCHRONIZATION)) { // Reentrant method that calls locked method. ACE_Time_Value tv; @@ -348,8 +333,6 @@ template <class ACE_LOCK> ACE_INLINE CORBA::Short TAO_Metrics_FrameManager<ACE_LOCK>:: reset_all_frames (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::SYNCHRONIZATION)) { // Synchronize read/write access to the map during the reset ACE_Write_Guard<ACE_LOCK> mon (this->lock_); @@ -424,9 +407,6 @@ ACE_INLINE CORBA::Short TAO_Metrics_FrameManager<ACE_LOCK>:: reset_frame_with_time (RtecScheduler::Period_t p, Metrics::Time mt, CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL, - Metrics::SYNCHRONIZATION)) { // Treat a zero period as a special case. if (p == 0) @@ -453,9 +433,6 @@ template <class ACE_LOCK> ACE_INLINE CORBA::Short TAO_Metrics_FrameManager<ACE_LOCK>:: reset_frame (RtecScheduler::Period_t p, CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL, - Metrics::SYNCHRONIZATION)) { // Treat a zero period as a special case. if (p == 0) @@ -550,9 +527,6 @@ ACE_INLINE CORBA::Short TAO_Metrics_FrameManager<ACE_LOCK>:: get_start_time (RtecScheduler::Period_t p, Metrics::Time &start, CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL, - Metrics::SYNCHRONIZATION)) { // Treat a zero period as a special case. if (p == 0) @@ -622,9 +596,6 @@ ACE_INLINE CORBA::Short TAO_Metrics_FrameManager<ACE_LOCK>:: get_end_time (RtecScheduler::Period_t p, Metrics::Time &end, CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL, - Metrics::SYNCHRONIZATION)) { // Treat a zero period as a special case. if (p == 0) @@ -652,9 +623,6 @@ TAO_Metrics_FrameManager<ACE_LOCK>:: get_frame_id (RtecScheduler::Period_t p, CORBA::ULong &id, CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL, - Metrics::SYNCHRONIZATION)) { // Treat a zero period as a special case. if (p == 0) @@ -747,9 +715,6 @@ TAO_Metrics_FrameManager<ACE_LOCK>:: get_frame_data (RtecScheduler::Period_t p, Metrics::Time &start, Metrics::Time &end, CORBA::ULong &id, CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL, - Metrics::SYNCHRONIZATION)) { // Treat a zero period as a special case. if (p == 0) diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h index b7bdbb44e29..a6cdc4eb00d 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h @@ -70,41 +70,27 @@ public: virtual void report_made_deadline (RtecScheduler::handle_t handle - ) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_0)); + ); // Reports a successful upcall. virtual void - report_missed_deadline (RtecScheduler::handle_t handle - ) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_1)); + report_missed_deadline (RtecScheduler::handle_t handle); // Reports an unsuccessful upcall. virtual void get_aggregate_QoS (RtecScheduler::handle_t handle, Metrics::QoSParameter_t_out qos - ) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_2, - Metrics::INTERNAL_3)); + ); // Get the aggregate QoS statistics collected for the passed handle. virtual void get_aggregate_QoS_set ( const Metrics::Handle_Set_t & handle_set, - Metrics::QoSParameter_Set_out qos_set) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_4, - Metrics::INTERNAL_5)); + Metrics::QoSParameter_Set_out qos_set); // Get the aggregate QoS statistics collected for each handle in the // passed set. virtual void - reset_statistics (RtecScheduler::handle_t handle) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_7, - Metrics::INTERNAL_8)); + reset_statistics (RtecScheduler::handle_t handle); // Resets the aggregate QoS information for the given operation. MONITOR_MAP &missed_map (); @@ -166,47 +152,31 @@ public: // Destructor. virtual void - report_made_deadline (RtecScheduler::handle_t handle) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_0)); + report_made_deadline (RtecScheduler::handle_t handle); // Reports a successful upcall. virtual void - report_missed_deadline (RtecScheduler::handle_t handle) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_1)); + report_missed_deadline (RtecScheduler::handle_t handle); // Reports an unsuccessful upcall. virtual void get_aggregate_QoS (RtecScheduler::handle_t handle, - Metrics::QoSParameter_t_out qos) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_2, - Metrics::INTERNAL_3)); + Metrics::QoSParameter_t_out qos); // Get the aggregate QoS statistics collected for the passed handle. virtual void get_aggregate_QoS_set ( const Metrics::Handle_Set_t & handle_set, - Metrics::QoSParameter_Set_out qos_set) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_4, - Metrics::INTERNAL_5)); + Metrics::QoSParameter_Set_out qos_set); // Get the aggregate QoS statistics collected for each handle in the // passed set. virtual void report_aggregate_QoS ( Metrics::QoSLogger_ptr logger, - Metrics::Time interval) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::NIL_LOGGER, - Metrics::INTERNAL_6)); + Metrics::Time interval); // Report the aggregate QoS statistics to the logger. virtual void - reset_statistics (RtecScheduler::handle_t handle) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_7, - Metrics::INTERNAL_8)); + reset_statistics (RtecScheduler::handle_t handle); // Resets the aggregate QoS information for the given operation. private: diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.inl b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.inl index 2dedbc81e8f..cc46a4b9ad3 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.inl +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.inl @@ -40,8 +40,6 @@ TAO_Metrics_UpcallMonitor::~TAO_Metrics_UpcallMonitor () ACE_INLINE void TAO_Metrics_UpcallMonitor:: report_made_deadline (RtecScheduler::handle_t handle) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_0)) { CORBA::ULong count = 0; MONITOR_MAP_ENTRY *entry; @@ -61,8 +59,6 @@ report_made_deadline (RtecScheduler::handle_t handle) ACE_INLINE void TAO_Metrics_UpcallMonitor:: report_missed_deadline (RtecScheduler::handle_t handle) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_1)) { CORBA::ULong count = 0; MONITOR_MAP_ENTRY *entry; @@ -83,9 +79,6 @@ report_missed_deadline (RtecScheduler::handle_t handle) ACE_INLINE void TAO_Metrics_UpcallMonitor::get_aggregate_QoS (RtecScheduler::handle_t handle, Metrics::QoSParameter_t_out qos) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_2, - Metrics::INTERNAL_3)) { CORBA::ULong made_count = 0; CORBA::ULong missed_count = 0; @@ -125,9 +118,6 @@ ACE_INLINE void TAO_Metrics_UpcallMonitor::get_aggregate_QoS_set ( const Metrics::Handle_Set_t & handle_set, Metrics::QoSParameter_Set_out qos_set) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_4, - Metrics::INTERNAL_5)) { CORBA::ULong made_count = 0; CORBA::ULong missed_count = 0; @@ -179,9 +169,6 @@ TAO_Metrics_UpcallMonitor::get_aggregate_QoS_set ( ACE_INLINE void TAO_Metrics_UpcallMonitor::reset_statistics (RtecScheduler::handle_t handle) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_7, - Metrics::INTERNAL_8)) { CORBA::ULong count = 0; @@ -238,8 +225,6 @@ TAO_Metrics_ReportingUpcallMonitor::~TAO_Metrics_ReportingUpcallMonitor () ACE_INLINE void TAO_Metrics_ReportingUpcallMonitor:: report_made_deadline (RtecScheduler::handle_t handle) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_0)) { monitor_.report_made_deadline (handle); } @@ -249,8 +234,6 @@ report_made_deadline (RtecScheduler::handle_t handle) ACE_INLINE void TAO_Metrics_ReportingUpcallMonitor:: report_missed_deadline (RtecScheduler::handle_t handle) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_1)) { monitor_.report_missed_deadline (handle); } @@ -261,9 +244,6 @@ report_missed_deadline (RtecScheduler::handle_t handle) ACE_INLINE void TAO_Metrics_ReportingUpcallMonitor::get_aggregate_QoS (RtecScheduler::handle_t handle, Metrics::QoSParameter_t_out qos) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_2, - Metrics::INTERNAL_3)) { monitor_.get_aggregate_QoS (handle, qos); @@ -277,9 +257,6 @@ ACE_INLINE void TAO_Metrics_ReportingUpcallMonitor::get_aggregate_QoS_set ( const Metrics::Handle_Set_t & handle_set, Metrics::QoSParameter_Set_out qos_set) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_4, - Metrics::INTERNAL_5)) { monitor_.get_aggregate_QoS_set (handle_set, qos_set); @@ -291,9 +268,6 @@ TAO_Metrics_ReportingUpcallMonitor::get_aggregate_QoS_set ( ACE_INLINE void TAO_Metrics_ReportingUpcallMonitor::reset_statistics (RtecScheduler::handle_t handle) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::INTERNAL_7, - Metrics::INTERNAL_8)) { monitor_.reset_statistics (handle); } @@ -305,9 +279,6 @@ ACE_INLINE void TAO_Metrics_ReportingUpcallMonitor::report_aggregate_QoS ( Metrics::QoSLogger_ptr logger, Metrics::Time interval) - ACE_THROW_SPEC ((CORBA::SystemException, - Metrics::NIL_LOGGER, - Metrics::INTERNAL_6)) { if (CORBA::is_nil (logger)) { diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp index 09b5527d02b..f0f87db670a 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp @@ -46,7 +46,6 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::_default_POA () template <class ITERATOR, class TABLE_ENTRY> CORBA::Boolean TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one ( CosNaming::Binding_out b) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosNaming::Binding *binding = 0; @@ -101,7 +100,6 @@ template <class ITERATOR, class TABLE_ENTRY> CORBA::Boolean TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n ( CORBA::ULong how_many, CosNaming::BindingList_out bl) - ACE_THROW_SPEC ((CORBA::SystemException)) { // We perform an allocation before obtaining the lock so that an out // parameter is allocated in case we fail to obtain the lock. @@ -164,7 +162,6 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n ( template <class ITERATOR, class TABLE_ENTRY> void TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h index d5ad7132c66..7321c810da7 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h @@ -73,8 +73,7 @@ public: /// This operation passes back the next unseen binding. True is /// returned if a binding is passed back, and false is returned otherwise. - CORBA::Boolean next_one (CosNaming::Binding_out b) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean next_one (CosNaming::Binding_out b); /** * This operation passes back at most <how_many> unseen bindings. @@ -82,12 +81,10 @@ public: * returned if no bindings were passed back. */ CORBA::Boolean next_n (CORBA::ULong how_many, - CosNaming::BindingList_out bl) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosNaming::BindingList_out bl); /// This operation destroys the iterator. - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); // = Helper method. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp index b160d18eaa1..ef305c81948 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp @@ -38,21 +38,12 @@ TAO_Naming_Context::_default_POA (/*env*/) void TAO_Naming_Context::bind (const CosNaming::Name &n, CORBA::Object_ptr obj) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNaming::NamingContext::NotFound, - CosNaming::NamingContext::CannotProceed, - CosNaming::NamingContext::InvalidName, - CosNaming::NamingContext::AlreadyBound)) { impl_->bind (n, obj); } void TAO_Naming_Context::rebind (const CosNaming::Name &n, CORBA::Object_ptr obj) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNaming::NamingContext::NotFound, - CosNaming::NamingContext::CannotProceed, - CosNaming::NamingContext::InvalidName)) { impl_->rebind (n, obj); } @@ -60,11 +51,6 @@ TAO_Naming_Context::rebind (const CosNaming::Name &n, CORBA::Object_ptr obj) void TAO_Naming_Context::bind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNaming::NamingContext::NotFound, - CosNaming::NamingContext::CannotProceed, - CosNaming::NamingContext::InvalidName, - CosNaming::NamingContext::AlreadyBound)) { impl_->bind_context (n, nc); } @@ -72,56 +58,36 @@ TAO_Naming_Context::bind_context (const CosNaming::Name &n, void TAO_Naming_Context::rebind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNaming::NamingContext::NotFound, - CosNaming::NamingContext::CannotProceed, - CosNaming::NamingContext::InvalidName)) { impl_->rebind_context (n, nc); } CORBA::Object_ptr TAO_Naming_Context::resolve (const CosNaming::Name &n) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNaming::NamingContext::NotFound, - CosNaming::NamingContext::CannotProceed, - CosNaming::NamingContext::InvalidName)) { return impl_->resolve (n); } void TAO_Naming_Context::unbind (const CosNaming::Name &n) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNaming::NamingContext::NotFound, - CosNaming::NamingContext::CannotProceed, - CosNaming::NamingContext::InvalidName)) { impl_->unbind (n); } CosNaming::NamingContext_ptr TAO_Naming_Context::new_context (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return impl_->new_context (); } CosNaming::NamingContext_ptr TAO_Naming_Context::bind_new_context (const CosNaming::Name &n) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNaming::NamingContext::NotFound, - CosNaming::NamingContext::AlreadyBound, - CosNaming::NamingContext::CannotProceed, - CosNaming::NamingContext::InvalidName)) { return impl_->bind_new_context (n); } void TAO_Naming_Context::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNaming::NamingContext::NotEmpty)) { impl_->destroy (); } @@ -130,7 +96,6 @@ void TAO_Naming_Context::list (CORBA::ULong how_many, CosNaming::BindingList_out bl, CosNaming::BindingIterator_out bi) - ACE_THROW_SPEC ((CORBA::SystemException)) { impl_->list (how_many, bl, bi); } @@ -168,8 +133,6 @@ to_string_helper_assign (char * &k, const char * &src) char * TAO_Naming_Context::to_string (const CosNaming::Name &n) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNaming::NamingContext::InvalidName)) { // Accepts a Name and returns a stringified name. @@ -281,8 +244,6 @@ to_name_helper (char *dest, const char*& src, Hint hint) CosNaming::Name * TAO_Naming_Context::to_name (const char *sn) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNaming::NamingContext::InvalidName)) { // Returns the Name from its stringified form. CosNaming::Name n; @@ -427,9 +388,6 @@ TAO_Naming_Context::to_url_validate_and_compute_size ( char * TAO_Naming_Context::to_url (const char * addr, const char * sn) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNaming::NamingContextExt::InvalidAddress, - CosNaming::NamingContext::InvalidName)) { /// Compute how many characters will be required for the URL size_t no_char = @@ -495,11 +453,6 @@ TAO_Naming_Context::to_url (const char * addr, CORBA::Object_ptr TAO_Naming_Context::resolve_str (const char * n) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNaming::NamingContext::NotFound, - CosNaming::NamingContext::CannotProceed, - CosNaming::NamingContext::InvalidName - )) { // Similar to <resolve> above. It accepts a strigified name as an // argument instead of a Name. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h index 586c06bea3b..27d907e5f36 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h @@ -67,12 +67,7 @@ public: * participate in name resolution later. */ virtual void bind (const CosNaming::Name &n, - CORBA::Object_ptr obj) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNaming::NamingContext::NotFound, - CosNaming::NamingContext::CannotProceed, - CosNaming::NamingContext::InvalidName, - CosNaming::NamingContext::AlreadyBound)); + CORBA::Object_ptr obj); /** * This is similar to <bind> operation above, except for when the @@ -81,11 +76,7 @@ public: * new one. */ virtual void rebind (const CosNaming::Name &n, - CORBA::Object_ptr obj) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNaming::NamingContext::NotFound, - CosNaming::NamingContext::CannotProceed, - CosNaming::NamingContext::InvalidName)); + CORBA::Object_ptr obj); /** * This is the version of <bind> specifically for binding naming @@ -93,12 +84,7 @@ public: * compound names are passed to be resolved. */ virtual void bind_context (const CosNaming::Name &n, - CosNaming::NamingContext_ptr nc) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNaming::NamingContext::NotFound, - CosNaming::NamingContext::CannotProceed, - CosNaming::NamingContext::InvalidName, - CosNaming::NamingContext::AlreadyBound)); + CosNaming::NamingContext_ptr nc); /** * This is a version of <rebind> specifically for naming contexts, @@ -106,11 +92,7 @@ public: * names are passed. */ virtual void rebind_context (const CosNaming::Name &n, - CosNaming::NamingContext_ptr nc) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNaming::NamingContext::NotFound, - CosNaming::NamingContext::CannotProceed, - CosNaming::NamingContext::InvalidName)); + CosNaming::NamingContext_ptr nc); /** * Return object reference that is bound to the name. Compound name @@ -119,22 +101,14 @@ public: * does not return the type of the object. Clients are responsible * for "narrowing" the object to the appropriate type. */ - virtual CORBA::Object_ptr resolve (const CosNaming::Name &n) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNaming::NamingContext::NotFound, - CosNaming::NamingContext::CannotProceed, - CosNaming::NamingContext::InvalidName)); + virtual CORBA::Object_ptr resolve (const CosNaming::Name &n); /** * Remove the name binding from the context. When compound names * are used, unbind is defined as follows: ctx->unbind (<c1; c2; * cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>) */ - virtual void unbind (const CosNaming::Name &n) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNaming::NamingContext::NotFound, - CosNaming::NamingContext::CannotProceed, - CosNaming::NamingContext::InvalidName)); + virtual void unbind (const CosNaming::Name &n); /** @@ -142,8 +116,7 @@ public: * same naming server in which the operation was invoked. The * context is not bound. */ - virtual CosNaming::NamingContext_ptr new_context () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosNaming::NamingContext_ptr new_context (); /** * This operation creates a new context and binds it to the name @@ -152,12 +125,7 @@ public: * bound (the name argument excluding the last component). */ virtual CosNaming::NamingContext_ptr bind_new_context ( - const CosNaming::Name &n) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNaming::NamingContext::NotFound, - CosNaming::NamingContext::AlreadyBound, - CosNaming::NamingContext::CannotProceed, - CosNaming::NamingContext::InvalidName)); + const CosNaming::Name &n); /** * Delete the naming context. The user should take care to <unbind> any @@ -167,9 +135,7 @@ public: * NOTE: after <destroy> is invoked on a Naming Context, all * BindingIterators associated with that Naming Context are also destroyed. */ - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNaming::NamingContext::NotEmpty)); + virtual void destroy (void); /** * Returns at most the requested number of bindings <how_many> in @@ -179,8 +145,7 @@ public: */ virtual void list (CORBA::ULong how_many, CosNaming::BindingList_out bl, - CosNaming::BindingIterator_out bi) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosNaming::BindingIterator_out bi); /** * Stringify the name using '\' as the escape character. The @@ -188,18 +153,14 @@ public: * is invalid i.e. if the number of characters in the name is zero, * an InvalidName exception is to be raised. */ - virtual char * to_string (const CosNaming::Name &n) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNaming::NamingContext::InvalidName)); + virtual char * to_string (const CosNaming::Name &n); /** * The in parameter is an stringified name. This function removes the * escape character '\' and destringifies the stringified name and returns * it. */ - virtual CosNaming::Name * to_name (const char *sn) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNaming::NamingContext::InvalidName)); + virtual CosNaming::Name * to_name (const char *sn); /** * The in parameter addr refers to the address of the naming context @@ -208,24 +169,13 @@ public: * iiopname://1.1@myhost.555xyz.com:9999/a/b/c */ virtual char * to_url ( const char * addr, - const char * sn) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNaming::NamingContextExt::InvalidAddress, - CosNaming::NamingContext::InvalidName - )); + const char * sn); /** * Similar to <resolve> as in the CosNaming::NamingContext interface. * It accepts a strigified name as an argument instead of a Name. */ - virtual CORBA::Object_ptr resolve_str (const char * n) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNaming::NamingContext::NotFound, - CosNaming::NamingContext::CannotProceed, - CosNaming::NamingContext::InvalidName - )); + virtual CORBA::Object_ptr resolve_str (const char * n); /// Returns the Default POA of this Servant object virtual PortableServer::POA_ptr _default_POA (void); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp index 27bc4e91147..a2b9f923827 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp @@ -71,7 +71,6 @@ CORBA::Object_ptr TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb, int argc, ACE_TCHAR *argv[]) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Initializes the Naming Service. Returns -1 // on an error. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h index 967fdc302fc..9e5ba0f03b8 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h @@ -50,8 +50,7 @@ public: /// ORB and the command line parameters. virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, - ACE_TCHAR *argv[]) - ACE_THROW_SPEC ((CORBA::SystemException)); + ACE_TCHAR *argv[]); protected: diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp index 731f1a8cdd5..462f76ea5be 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp @@ -43,8 +43,6 @@ PortableServer::Servant TAO_Storable_Naming_Context_Activator::incarnate ( const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)) { // Make sure complete initialization has been done @@ -108,7 +106,6 @@ TAO_Storable_Naming_Context_Activator::etherealize ( PortableServer::Servant servant, CORBA::Boolean /*cleanup_in_progress*/, CORBA::Boolean remaining_activations) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (!remaining_activations) { delete servant; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h index 3a7034bbbf2..190ca8ce865 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h @@ -59,9 +59,7 @@ public: * and the servant implementing this reference does not yet exist. */ virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, - PortableServer::POA_ptr poa) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)); + PortableServer::POA_ptr poa); /** * Used by the POA to delete the servant created from a call to incarnate. @@ -70,8 +68,7 @@ public: PortableServer::POA_ptr adapter, PortableServer::Servant servant, CORBA::Boolean cleanup_in_progress, - CORBA::Boolean remaining_activations) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean remaining_activations); private: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp index 75a8fc7f028..0e8748971d8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp @@ -30,10 +30,6 @@ TAO_Notify_CosEC_ProxyPushConsumer::release (void) void TAO_Notify_CosEC_ProxyPushConsumer::push (const CORBA::Any& any) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosEventComm::Disconnected - )) { // Check if we should proceed at all. if (this->admin_properties().reject_new_events () == 1 @@ -54,10 +50,6 @@ TAO_Notify_CosEC_ProxyPushConsumer::push (const CORBA::Any& any) void TAO_Notify_CosEC_ProxyPushConsumer::connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosEventChannelAdmin::AlreadyConnected - )) { // Convert Supplier to Base Type TAO_Notify_PushSupplier *supplier; @@ -72,9 +64,6 @@ TAO_Notify_CosEC_ProxyPushConsumer::connect_push_supplier (CosEventComm::PushSup void TAO_Notify_CosEC_ProxyPushConsumer::disconnect_push_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { TAO_Notify_CosEC_ProxyPushConsumer::Ptr guard( this ); this->destroy (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h index e577ce6264e..7a29dff6ff7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h @@ -54,22 +54,11 @@ public: protected: ///= CosNotifyChannelAdmin::ProxyPushConsumer methods - virtual void push (const CORBA::Any & data) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )); - - virtual void connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected - )); - - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void push (const CORBA::Any & data); + + virtual void connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier); + + virtual void disconnect_push_consumer (void); private: /// Release virtual void release (void); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp index 8ac351b2ebd..ed6577d57fa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp @@ -27,11 +27,6 @@ TAO_Notify_CosEC_ProxyPushSupplier::release (void) void TAO_Notify_CosEC_ProxyPushSupplier::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected, - CosEventChannelAdmin::TypeError - )) { // Convert Consumer to Base Type TAO_Notify_PushConsumer* consumer; @@ -46,9 +41,6 @@ TAO_Notify_CosEC_ProxyPushSupplier::connect_push_consumer (CosEventComm::PushCon void TAO_Notify_CosEC_ProxyPushSupplier::disconnect_push_supplier (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { TAO_Notify_CosEC_ProxyPushSupplier::Ptr guard( this ); this->destroy (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h index da3bad8b1d0..0bd5b392df5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h @@ -58,18 +58,10 @@ public: // = Interface methods virtual void connect_push_consumer ( CosEventComm::PushConsumer_ptr push_consumer - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected, - CosEventChannelAdmin::TypeError - )); + ); virtual void disconnect_push_supplier ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); private: /// Release diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp index 08045f4d155..c710bc98b03 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp @@ -29,19 +29,12 @@ TAO_Notify_ProxyPushConsumer::release (void) CosNotifyChannelAdmin::ProxyType TAO_Notify_ProxyPushConsumer::MyType (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CosNotifyChannelAdmin::PUSH_ANY; } void TAO_Notify_ProxyPushConsumer::push (const CORBA::Any& any) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosEventComm::Disconnected - )) { // Check if we should proceed at all. if (this->admin_properties().reject_new_events () == 1 @@ -59,10 +52,6 @@ TAO_Notify_ProxyPushConsumer::push (const CORBA::Any& any) void TAO_Notify_ProxyPushConsumer::connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosEventChannelAdmin::AlreadyConnected - )) { // Convert Supplier to Base Type TAO_Notify_PushSupplier *supplier; @@ -77,9 +66,6 @@ TAO_Notify_ProxyPushConsumer::connect_any_push_supplier (CosEventComm::PushSuppl } void TAO_Notify_ProxyPushConsumer::disconnect_push_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { TAO_Notify_ProxyPushConsumer::Ptr guard( this ); this->destroy (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h index b4361e2b400..b5b91809589 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h @@ -59,27 +59,13 @@ public: protected: ///= CosNotifyChannelAdmin::ProxyPushConsumer methods - virtual CosNotifyChannelAdmin::ProxyType MyType (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void push (const CORBA::Any & data) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )); - - virtual void connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected - )); - - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual CosNotifyChannelAdmin::ProxyType MyType (void); + + virtual void push (const CORBA::Any & data); + + virtual void connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier); + + virtual void disconnect_push_consumer (void); private: /// Release diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp index 93774bb543a..02cb590b026 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp @@ -27,11 +27,6 @@ TAO_Notify_ProxyPushSupplier::release (void) void TAO_Notify_ProxyPushSupplier::connect_any_push_consumer (CosEventComm::PushConsumer_ptr push_consumer) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected, - CosEventChannelAdmin::TypeError - )) { // Convert Consumer to Base Type TAO_Notify_PushConsumer* consumer; @@ -47,9 +42,6 @@ TAO_Notify_ProxyPushSupplier::connect_any_push_consumer (CosEventComm::PushConsu void TAO_Notify_ProxyPushSupplier::disconnect_push_supplier (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { TAO_Notify_ProxyPushSupplier::Ptr guard( this ); this->destroy (); @@ -58,9 +50,6 @@ TAO_Notify_ProxyPushSupplier::disconnect_push_supplier (void) CosNotifyChannelAdmin::ProxyType TAO_Notify_ProxyPushSupplier::MyType (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CosNotifyChannelAdmin::PUSH_ANY; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h index 415db2a8d6d..b6eac56762c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h @@ -60,25 +60,14 @@ public: virtual void load_attrs (const TAO_Notify::NVPList& attrs); // = Interface methods - virtual CosNotifyChannelAdmin::ProxyType MyType (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual CosNotifyChannelAdmin::ProxyType MyType (void); virtual void connect_any_push_consumer ( CosEventComm::PushConsumer_ptr push_consumer - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected, - CosEventChannelAdmin::TypeError - )); + ); virtual void disconnect_push_supplier ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); private: /// TAO_Notify_Destroy_Callback methods diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp index 31a2b3b4845..0edf95664e5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp @@ -86,9 +86,6 @@ TAO_Notify_ConsumerAdmin::release (void) void TAO_Notify_ConsumerAdmin::destroy (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { int result = this->shutdown (); if ( result == 1) @@ -164,10 +161,6 @@ CosNotifyChannelAdmin::ProxySupplier_ptr TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id ) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyChannelAdmin::AdminLimitExceeded - )) { CosNotification::QoSProperties initial_qos; @@ -185,11 +178,6 @@ TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier_with_qos (CosNotifyC CosNotifyChannelAdmin::ProxyID_out proxy_id, const CosNotification::QoSProperties & initial_qos ) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyChannelAdmin::AdminLimitExceeded - , CosNotification::UnsupportedQoS - )) { CosNotifyChannelAdmin::ProxySupplier_var proxy = TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this @@ -202,9 +190,6 @@ TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier_with_qos (CosNotifyC CosEventChannelAdmin::ProxyPushSupplier_ptr TAO_Notify_ConsumerAdmin::obtain_push_supplier (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { CosEventChannelAdmin::ProxyPushSupplier_var proxy = TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this); @@ -214,36 +199,24 @@ TAO_Notify_ConsumerAdmin::obtain_push_supplier (void) CosNotifyChannelAdmin::AdminID TAO_Notify_ConsumerAdmin::MyID (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->id (); } CosNotifyChannelAdmin::EventChannel_ptr TAO_Notify_ConsumerAdmin::MyChannel (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->ec_->_this (); } ::CosNotifyChannelAdmin::InterFilterGroupOperator TAO_Notify_ConsumerAdmin::MyOperator (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->filter_operator_; } CosNotifyChannelAdmin::ProxyIDSeq* TAO_Notify_ConsumerAdmin::push_suppliers (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { TAO_Notify_Proxy_Seq_Worker seq_worker; @@ -252,10 +225,6 @@ TAO_Notify_ConsumerAdmin::push_suppliers (void) CosNotifyChannelAdmin::ProxySupplier_ptr TAO_Notify_ConsumerAdmin::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyChannelAdmin::ProxyNotFound - )) { TAO_Notify_ProxySupplier_Find_Worker find_worker; @@ -263,10 +232,6 @@ TAO_Notify_ConsumerAdmin::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID pro } void TAO_Notify_ConsumerAdmin::set_qos (const CosNotification::QoSProperties & qos) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotification::UnsupportedQoS - )) { this->TAO_Notify_Object::set_qos (qos); } @@ -274,9 +239,6 @@ void TAO_Notify_ConsumerAdmin::set_qos (const CosNotification::QoSProperties & q CosNotification::QoSProperties* TAO_Notify_ConsumerAdmin::get_qos (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->TAO_Notify_Object::get_qos (); } @@ -285,10 +247,6 @@ void TAO_Notify_ConsumerAdmin::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyComm::InvalidEventType - )) { TAO_Notify_EventTypeSeq seq_added (added); TAO_Notify_EventTypeSeq seq_removed (removed); @@ -308,9 +266,6 @@ TAO_Notify_ConsumerAdmin::subscription_change (const CosNotification::EventTypeS CosNotifyFilter::FilterID TAO_Notify_ConsumerAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { CosNotifyFilter::FilterID fid = this->filter_admin_.add_filter (new_filter); @@ -320,38 +275,24 @@ TAO_Notify_ConsumerAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter) void TAO_Notify_ConsumerAdmin::remove_filter (CosNotifyFilter::FilterID filter) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyFilter::FilterNotFound - )) { this->filter_admin_.remove_filter (filter); } ::CosNotifyFilter::Filter_ptr TAO_Notify_ConsumerAdmin::get_filter (CosNotifyFilter::FilterID filter) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyFilter::FilterNotFound - )) { return this->filter_admin_.get_filter (filter); } ::CosNotifyFilter::FilterIDSeq* TAO_Notify_ConsumerAdmin::get_all_filters (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->filter_admin_.get_all_filters (); } void TAO_Notify_ConsumerAdmin::remove_all_filters (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { this->filter_admin_.remove_all_filters (); } @@ -360,18 +301,12 @@ TAO_Notify_ConsumerAdmin::remove_all_filters (void) CosNotifyFilter::MappingFilter_ptr TAO_Notify_ConsumerAdmin::priority_filter (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { throw CORBA::NO_IMPLEMENT (); } void TAO_Notify_ConsumerAdmin::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { throw CORBA::NO_IMPLEMENT (); @@ -379,9 +314,6 @@ TAO_Notify_ConsumerAdmin::priority_filter (CosNotifyFilter::MappingFilter_ptr /* CosNotifyFilter::MappingFilter_ptr TAO_Notify_ConsumerAdmin::lifetime_filter (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { throw CORBA::NO_IMPLEMENT (); @@ -389,18 +321,12 @@ TAO_Notify_ConsumerAdmin::lifetime_filter (void) void TAO_Notify_ConsumerAdmin::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { throw CORBA::NO_IMPLEMENT (); } ::CosNotifyChannelAdmin::ProxyIDSeq* TAO_Notify_ConsumerAdmin::pull_suppliers (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { throw CORBA::NO_IMPLEMENT (); } @@ -408,10 +334,6 @@ TAO_Notify_ConsumerAdmin::pull_suppliers (void) CosNotifyChannelAdmin::ProxySupplier_ptr TAO_Notify_ConsumerAdmin::obtain_notification_pull_supplier (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyChannelAdmin::AdminLimitExceeded - )) { throw CORBA::NO_IMPLEMENT (); @@ -421,19 +343,12 @@ void TAO_Notify_ConsumerAdmin::validate_qos (const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/ ) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotification::UnsupportedQoS - )) { throw CORBA::NO_IMPLEMENT (); } CosEventChannelAdmin::ProxyPullSupplier_ptr TAO_Notify_ConsumerAdmin::obtain_pull_supplier (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h index 41f573aef56..4befc319e3c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h @@ -80,151 +80,66 @@ protected: obtain_notification_push_supplier_with_qos (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id, const CosNotification::QoSProperties & initial_qos - ) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyChannelAdmin::AdminLimitExceeded - , CosNotification::UnsupportedQoS - )); + ); /// = CosNotifyChannelAdmin::ConsumerAdmin methods - virtual CosNotifyChannelAdmin::AdminID MyID (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual CosNotifyChannelAdmin::AdminID MyID (void); virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); - virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (void); virtual ::CosNotifyFilter::MappingFilter_ptr priority_filter ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void priority_filter (CosNotifyFilter::MappingFilter_ptr priority_filter) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual ::CosNotifyFilter::MappingFilter_ptr lifetime_filter (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void lifetime_filter (CosNotifyFilter::MappingFilter_ptr lifetime_filter) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_suppliers (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_suppliers (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyChannelAdmin::ProxyNotFound - )); + ); + + virtual void priority_filter (CosNotifyFilter::MappingFilter_ptr priority_filter); + + virtual ::CosNotifyFilter::MappingFilter_ptr lifetime_filter (void); + + virtual void lifetime_filter (CosNotifyFilter::MappingFilter_ptr lifetime_filter); + + virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_suppliers (void); + + virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_suppliers (void); + + virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id); virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_pull_supplier (CosNotifyChannelAdmin::ClientType ctype, - CosNotifyChannelAdmin::ProxyID_out proxy_id) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyChannelAdmin::AdminLimitExceeded - )); + CosNotifyChannelAdmin::ProxyID_out proxy_id); virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype, - CosNotifyChannelAdmin::ProxyID_out proxy_id) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyChannelAdmin::AdminLimitExceeded - )); - - virtual void destroy (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual ::CosNotification::QoSProperties * get_qos (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void set_qos (const CosNotification::QoSProperties & qos) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotification::UnsupportedQoS - )); + CosNotifyChannelAdmin::ProxyID_out proxy_id); + + virtual void destroy (void); + + virtual ::CosNotification::QoSProperties * get_qos (void); + + virtual void set_qos (const CosNotification::QoSProperties & qos); virtual void validate_qos (const CosNotification::QoSProperties & required_qos, - CosNotification::NamedPropertyRangeSeq_out available_qos) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotification::UnsupportedQoS - )); + CosNotification::NamedPropertyRangeSeq_out available_qos); virtual void subscription_change (const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyComm::InvalidEventType - )); - - virtual CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr new_filter) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void remove_filter (CosNotifyFilter::FilterID filter) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyFilter::FilterNotFound - )); - - virtual ::CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID filter) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyFilter::FilterNotFound - )); - - virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void remove_all_filters (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual ::CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual ::CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + const CosNotification::EventTypeSeq & removed); + + virtual CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr new_filter); + + virtual void remove_filter (CosNotifyFilter::FilterID filter); + + virtual ::CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID filter); + + virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters (void); + + virtual void remove_all_filters (void); + + virtual ::CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (void); + + virtual ::CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (void); private: diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp index 1659d21c9aa..a6549b1eace 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp @@ -37,9 +37,6 @@ TAO_Notify_ETCL_Filter::~TAO_Notify_ETCL_Filter () char* TAO_Notify_ETCL_Filter::constraint_grammar (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CORBA::string_dup ("ETCL"); } @@ -47,10 +44,6 @@ TAO_Notify_ETCL_Filter::constraint_grammar (void) void TAO_Notify_ETCL_Filter::add_constraints_i (const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::InvalidConstraint - )) { for (CORBA::ULong index = 0; index < constraint_info_seq.length (); ++index) { @@ -84,10 +77,6 @@ TAO_Notify_ETCL_Filter::add_constraints_i (const CosNotifyFilter::ConstraintInfo CosNotifyFilter::ConstraintInfoSeq* TAO_Notify_ETCL_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq& constraint_list ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::InvalidConstraint - )) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -131,11 +120,6 @@ void TAO_Notify_ETCL_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDSeq & del_list, const CosNotifyFilter::ConstraintInfoSeq & modify_list ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::InvalidConstraint, - CosNotifyFilter::ConstraintNotFound - )) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -215,8 +199,6 @@ TAO_Notify_ETCL_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDS CosNotifyFilter::ConstraintInfoSeq* TAO_Notify_ETCL_Filter::get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyFilter::ConstraintNotFound)) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -249,7 +231,6 @@ TAO_Notify_ETCL_Filter::get_constraints (const CosNotifyFilter::ConstraintIDSeq CosNotifyFilter::ConstraintInfoSeq * TAO_Notify_ETCL_Filter::get_all_constraints (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -289,7 +270,6 @@ TAO_Notify_ETCL_Filter::get_all_constraints (void) void TAO_Notify_ETCL_Filter::remove_all_constraints (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -299,7 +279,6 @@ TAO_Notify_ETCL_Filter::remove_all_constraints (void) void TAO_Notify_ETCL_Filter::remove_all_constraints_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CONSTRAINT_EXPR_LIST::ITERATOR iter (this->constraint_expr_list_); CONSTRAINT_EXPR_LIST::ENTRY *entry; @@ -320,7 +299,6 @@ TAO_Notify_ETCL_Filter::remove_all_constraints_i (void) void TAO_Notify_ETCL_Filter::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -336,8 +314,6 @@ TAO_Notify_ETCL_Filter::destroy (void) CORBA::Boolean TAO_Notify_ETCL_Filter::match (const CORBA::Any & /*filterable_data */) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyFilter::UnsupportedFilterableData)) { throw CORBA::NO_IMPLEMENT (); } @@ -345,8 +321,6 @@ TAO_Notify_ETCL_Filter::match (const CORBA::Any & /*filterable_data */) CORBA::Boolean TAO_Notify_ETCL_Filter::match_structured (const CosNotification::StructuredEvent & filterable_data ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyFilter::UnsupportedFilterableData)) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -381,8 +355,6 @@ CORBA::Boolean TAO_Notify_ETCL_Filter::match_typed ( const CosNotification::PropertySeq & /* filterable_data */ ) - ACE_THROW_SPEC (( CORBA::SystemException, - CosNotifyFilter::UnsupportedFilterableData)) { throw CORBA::NO_IMPLEMENT (); } @@ -391,7 +363,6 @@ CosNotifyFilter::CallbackID TAO_Notify_ETCL_Filter::attach_callback ( CosNotifyComm::NotifySubscribe_ptr /* callback */ ) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } @@ -400,15 +371,12 @@ void TAO_Notify_ETCL_Filter::detach_callback ( CosNotifyFilter::CallbackID /* callback */ ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyFilter::CallbackNotFound)) { throw CORBA::NO_IMPLEMENT (); } CosNotifyFilter::CallbackIDSeq * TAO_Notify_ETCL_Filter::get_callbacks (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h index bbc47b4ec6f..a5014412d7e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h @@ -50,92 +50,38 @@ public: virtual ~TAO_Notify_ETCL_Filter (); protected: - virtual char * constraint_grammar (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual char * constraint_grammar (void); - virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::InvalidConstraint - )); + virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list); virtual void modify_constraints (const CosNotifyFilter::ConstraintIDSeq & del_list, const CosNotifyFilter::ConstraintInfoSeq & modify_list - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::InvalidConstraint, - CosNotifyFilter::ConstraintNotFound - )); - - virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::ConstraintNotFound - )); - - virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void remove_all_constraints (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void destroy (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual CORBA::Boolean match (const CORBA::Any & filterable_data) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::UnsupportedFilterableData - )); - - virtual CORBA::Boolean match_structured (const CosNotification::StructuredEvent & filterable_data) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::UnsupportedFilterableData - )); - - virtual CORBA::Boolean match_typed (const CosNotification::PropertySeq & filterable_data) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::UnsupportedFilterableData - )); - - virtual CosNotifyFilter::CallbackID attach_callback (CosNotifyComm::NotifySubscribe_ptr callback) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void detach_callback (CosNotifyFilter::CallbackID callback) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::CallbackNotFound - )); - - virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); + + virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list); + + virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (void); + + virtual void remove_all_constraints (void); + + virtual void destroy (void); + + virtual CORBA::Boolean match (const CORBA::Any & filterable_data); + + virtual CORBA::Boolean match_structured (const CosNotification::StructuredEvent & filterable_data); + + virtual CORBA::Boolean match_typed (const CosNotification::PropertySeq & filterable_data); + + virtual CosNotifyFilter::CallbackID attach_callback (CosNotifyComm::NotifySubscribe_ptr callback); + + virtual void detach_callback (CosNotifyFilter::CallbackID callback); + + virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (void); private: - void add_constraints_i (const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::InvalidConstraint - )); - - void remove_all_constraints_i (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + void add_constraints_i (const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq); + + void remove_all_constraints_i (void); struct TAO_Notify_Constraint_Expr { diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp index 16aa8eb680e..1475f2b0851 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp @@ -28,10 +28,6 @@ TAO_Notify_ETCL_FilterFactory::create (PortableServer::POA_var& filter_poa) CosNotifyFilter::Filter_ptr TAO_Notify_ETCL_FilterFactory::create_filter (const char *constraint_grammar) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::InvalidGrammar - )) { // @@: change to "ExTCL" later. if (ACE_OS::strcmp (constraint_grammar, "TCL") != 0 && @@ -62,10 +58,6 @@ CosNotifyFilter::MappingFilter_ptr TAO_Notify_ETCL_FilterFactory::create_mapping_filter (const char * /*constraint_grammar*/, const CORBA::Any & /*default_value*/ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::InvalidGrammar - )) { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h index 68da8ccda35..55871ecd0ca 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h @@ -58,20 +58,12 @@ public: virtual CosNotifyFilter::Filter_ptr create_filter ( const char * constraint_grammar - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::InvalidGrammar - )); + ); virtual CosNotifyFilter::MappingFilter_ptr create_mapping_filter ( const char * constraint_grammar, const CORBA::Any & default_value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::InvalidGrammar - )); + ); protected: /// The POA in which to activate the Filters. diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp index 8cbe6377a3f..f47eb75e50a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp @@ -206,9 +206,6 @@ TAO_Notify_EventChannel::shutdown (void) void TAO_Notify_EventChannel::destroy (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { TAO_Notify_EventChannel::Ptr guard( this ); @@ -236,37 +233,24 @@ TAO_Notify_EventChannel::remove (TAO_Notify_SupplierAdmin* supplier_admin) void TAO_Notify_EventChannel::set_qos (const CosNotification::QoSProperties & qos) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotification::UnsupportedQoS - )) { this->TAO_Notify_Object::set_qos (qos); } CosNotification::QoSProperties* TAO_Notify_EventChannel::get_qos (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->TAO_Notify_Object::get_qos (); } CosNotifyChannelAdmin::EventChannelFactory_ptr TAO_Notify_EventChannel::MyFactory (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->ecf_->_this (); } CosNotifyChannelAdmin::ConsumerAdmin_ptr TAO_Notify_EventChannel::default_consumer_admin (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (CORBA::is_nil (default_consumer_admin_.in ())) { @@ -292,9 +276,6 @@ TAO_Notify_EventChannel::default_consumer_admin (void) CosNotifyChannelAdmin::SupplierAdmin_ptr TAO_Notify_EventChannel::default_supplier_admin (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (CORBA::is_nil (default_supplier_admin_.in ())) { @@ -318,9 +299,6 @@ TAO_Notify_EventChannel::default_supplier_admin (void) } ::CosNotifyFilter::FilterFactory_ptr TAO_Notify_EventChannel::default_filter_factory (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->ecf_->get_default_filter_factory (); } @@ -329,9 +307,6 @@ TAO_Notify_EventChannel::default_supplier_admin (void) TAO_Notify_EventChannel::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ::CosNotifyChannelAdmin::ConsumerAdmin_var ca = @@ -344,9 +319,6 @@ TAO_Notify_EventChannel::new_for_consumers (CosNotifyChannelAdmin::InterFilterGr TAO_Notify_EventChannel::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ::CosNotifyChannelAdmin::SupplierAdmin_var sa = TAO_Notify_PROPERTIES::instance()->builder()->build_supplier_admin (this, op, id); @@ -356,10 +328,6 @@ TAO_Notify_EventChannel::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGr CosNotifyChannelAdmin::ConsumerAdmin_ptr TAO_Notify_EventChannel::get_consumeradmin (CosNotifyChannelAdmin::AdminID id) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyChannelAdmin::AdminNotFound - )) { TAO_Notify_ConsumerAdmin_Find_Worker find_worker; @@ -368,10 +336,6 @@ TAO_Notify_EventChannel::get_consumeradmin (CosNotifyChannelAdmin::AdminID id) CosNotifyChannelAdmin::SupplierAdmin_ptr TAO_Notify_EventChannel::get_supplieradmin (CosNotifyChannelAdmin::AdminID id) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyChannelAdmin::AdminNotFound - )) { TAO_Notify_SupplierAdmin_Find_Worker find_worker; @@ -380,9 +344,6 @@ TAO_Notify_EventChannel::get_supplieradmin (CosNotifyChannelAdmin::AdminID id) CosNotifyChannelAdmin::AdminIDSeq* TAO_Notify_EventChannel::get_all_consumeradmins (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { TAO_Notify_ConsumerAdmin_Seq_Worker seq_worker; @@ -391,9 +352,6 @@ TAO_Notify_EventChannel::get_all_consumeradmins (void) CosNotifyChannelAdmin::AdminIDSeq* TAO_Notify_EventChannel::get_all_supplieradmins (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { TAO_Notify_SupplierAdmin_Seq_Worker seq_worker; @@ -402,19 +360,12 @@ TAO_Notify_EventChannel::get_all_supplieradmins (void) void TAO_Notify_EventChannel::set_admin (const CosNotification::AdminProperties & admin) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotification::UnsupportedAdmin - )) { this->admin_properties().init (admin); } CosNotification::AdminProperties* TAO_Notify_EventChannel::get_admin (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { CosNotification::AdminProperties_var properties; @@ -429,18 +380,12 @@ TAO_Notify_EventChannel::get_admin (void) CosEventChannelAdmin::ConsumerAdmin_ptr TAO_Notify_EventChannel::for_consumers (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->default_consumer_admin(); } CosEventChannelAdmin::SupplierAdmin_ptr TAO_Notify_EventChannel::for_suppliers (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->default_supplier_admin (); } @@ -449,10 +394,6 @@ void TAO_Notify_EventChannel::validate_qos (const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/ ) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotification::UnsupportedQoS - )) { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h index f9abd36b7b1..81529e63ef4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h @@ -117,108 +117,49 @@ private: /// =CosNotifyChannelAdmin::EventChannel methods - virtual void destroy (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void destroy (void); virtual ::CosNotifyChannelAdmin::EventChannelFactory_ptr MyFactory ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr default_consumer_admin ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr default_supplier_admin ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); - virtual ::CosNotifyFilter::FilterFactory_ptr default_filter_factory (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual ::CosNotifyFilter::FilterFactory_ptr default_filter_factory (void); virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op, - CosNotifyChannelAdmin::AdminID_out id) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + CosNotifyChannelAdmin::AdminID_out id); virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op, - CosNotifyChannelAdmin::AdminID_out id) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr get_consumeradmin (CosNotifyChannelAdmin::AdminID id) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyChannelAdmin::AdminNotFound - )); - - virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr get_supplieradmin (CosNotifyChannelAdmin::AdminID id) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyChannelAdmin::AdminNotFound - )); - - virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_consumeradmins (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_supplieradmins (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual ::CosNotification::QoSProperties * get_qos (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void set_qos (const CosNotification::QoSProperties & qos) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotification::UnsupportedQoS - )); + CosNotifyChannelAdmin::AdminID_out id); + + virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr get_consumeradmin (CosNotifyChannelAdmin::AdminID id); + + virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr get_supplieradmin (CosNotifyChannelAdmin::AdminID id); + + virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_consumeradmins (void); + + virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_supplieradmins (void); + + virtual ::CosNotification::QoSProperties * get_qos (void); + + virtual void set_qos (const CosNotification::QoSProperties & qos); virtual void validate_qos (const CosNotification::QoSProperties & required_qos, - CosNotification::NamedPropertyRangeSeq_out available_qos) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotification::UnsupportedQoS - )); - - virtual ::CosNotification::AdminProperties * get_admin (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void set_admin (const CosNotification::AdminProperties & admin) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotification::UnsupportedAdmin - )); - - virtual ::CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual ::CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + CosNotification::NamedPropertyRangeSeq_out available_qos); + + virtual ::CosNotification::AdminProperties * get_admin (void); + + virtual void set_admin (const CosNotification::AdminProperties & admin); + + virtual ::CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void); + + virtual ::CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void); private: TAO_Notify_ConsumerAdmin_Container& ca_container(); diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp index 26812db99ae..c3685075726 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp @@ -61,9 +61,6 @@ TAO_Notify_EventChannelFactory::~TAO_Notify_EventChannelFactory () void TAO_Notify_EventChannelFactory::destroy (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { int result = this->shutdown (); if ( result == 1) @@ -168,11 +165,6 @@ TAO_Notify_EventChannelFactory::get_default_filter_factory (void) const CosNotification::AdminProperties & initial_admin, CosNotifyChannelAdmin::ChannelID_out id ) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotification::UnsupportedQoS - , CosNotification::UnsupportedAdmin - )) { CosNotifyChannelAdmin::EventChannel_var ec = TAO_Notify_PROPERTIES::instance()->builder()->build_event_channel (this @@ -185,9 +177,6 @@ TAO_Notify_EventChannelFactory::get_default_filter_factory (void) CosNotifyChannelAdmin::ChannelIDSeq* TAO_Notify_EventChannelFactory::get_all_channels (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { TAO_Notify_EventChannel_Seq_Worker seq_worker; @@ -196,10 +185,6 @@ TAO_Notify_EventChannelFactory::get_all_channels (void) CosNotifyChannelAdmin::EventChannel_ptr TAO_Notify_EventChannelFactory::get_event_channel (CosNotifyChannelAdmin::ChannelID id) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyChannelAdmin::ChannelNotFound - )) { TAO_Notify_EventChannel_Find_Worker find_worker; @@ -400,7 +385,6 @@ TAO_Notify_EventChannelFactory::reconnect (void) NotifyExt::ReconnectionRegistry::ReconnectionID TAO_Notify_EventChannelFactory::register_callback ( NotifyExt::ReconnectionCallback_ptr reconnection) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->reconnect_registry_.register_callback ( reconnection); @@ -409,7 +393,6 @@ TAO_Notify_EventChannelFactory::register_callback ( void TAO_Notify_EventChannelFactory::unregister_callback ( NotifyExt::ReconnectionRegistry::ReconnectionID id) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->reconnect_registry_.unregister_callback ( id); @@ -417,14 +400,12 @@ TAO_Notify_EventChannelFactory::unregister_callback ( CORBA::Boolean TAO_Notify_EventChannelFactory::is_alive (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::Boolean (1); } void TAO_Notify_EventChannelFactory::save_topology (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->self_change (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h index 4f87d5f8e18..6557a411a31 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h @@ -106,8 +106,7 @@ public: void load_event_persistence (void); - virtual void save_topology (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void save_topology (void); TAO_Notify_ProxyConsumer * find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position); TAO_Notify_ProxySupplier * find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position); @@ -123,25 +122,19 @@ public: CosNotifyFilter::FilterFactory_var default_filter_factory_; /// = NotifyExt methods - virtual void destroy (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void destroy (void); /// shutdown virtual int shutdown (void); virtual NotifyExt::ReconnectionRegistry::ReconnectionID register_callback ( - NotifyExt::ReconnectionCallback_ptr reconnection) - ACE_THROW_SPEC ((CORBA::SystemException)); + NotifyExt::ReconnectionCallback_ptr reconnection); virtual void unregister_callback ( - NotifyExt::ReconnectionRegistry::ReconnectionID id) - ACE_THROW_SPEC ((CORBA::SystemException)); + NotifyExt::ReconnectionRegistry::ReconnectionID id); - virtual CORBA::Boolean is_alive (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean is_alive (void); /// = CosNotifyChannelAdmin Methods @@ -149,20 +142,14 @@ public: const CosNotification::QoSProperties & initial_qos, const CosNotification::AdminProperties & initial_admin, CosNotifyChannelAdmin::ChannelID_out id - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotification::UnsupportedQoS, - CosNotification::UnsupportedAdmin)); + ); virtual ::CosNotifyChannelAdmin::ChannelIDSeq * get_all_channels ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual ::CosNotifyChannelAdmin::EventChannel_ptr get_event_channel ( CosNotifyChannelAdmin::ChannelID id - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyChannelAdmin::ChannelNotFound)); + ); private: typedef TAO_Notify_Container_T<TAO_Notify_EventChannel> TAO_Notify_EventChannel_Container; diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp index b4306279eb0..462c6469ed0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp @@ -36,8 +36,8 @@ TAO_Notify_EventType::init_i (const char* domain_name, const char* type_name) if (this->is_special () == 1) { - this->event_type_.domain_name = (const char* )"*"; - this->event_type_.type_name = (const char* )"%ALL"; + this->event_type_.domain_name = CORBA::string_dup ("*"); + this->event_type_.type_name = CORBA::string_dup ("%ALL"); } this->recompute_hash (); @@ -130,9 +130,9 @@ TAO_Notify_EventType::is_special (void) const ACE_OS::strcmp (this->event_type_.type_name, "") == 0 || ACE_OS::strcmp (this->event_type_.type_name, "*") == 0 || ACE_OS::strcmp (this->event_type_.type_name, "%ALL") == 0)) - return 1; + return true; else - return 0; + return false; } void diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp index a318fcdd198..d309deb5b96 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp @@ -66,7 +66,7 @@ TAO_Notify_EventTypeSeq::populate_no_special (CosNotification::EventTypeSeq& eve inherited::CONST_ITERATOR iter (*this); - TAO_Notify_EventType* event_type; + TAO_Notify_EventType* event_type = 0; CORBA::ULong i = 0; for (iter.first (); iter.next (event_type); iter.advance (), ++i) diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp index 3b0556e1c22..f556ddaebec 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp @@ -26,7 +26,6 @@ TAO_Notify_FilterAdmin::~TAO_Notify_FilterAdmin (void) CosNotifyFilter::FilterID TAO_Notify_FilterAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (new_filter)) throw CORBA::BAD_PARAM (); @@ -47,10 +46,6 @@ TAO_Notify_FilterAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter) void TAO_Notify_FilterAdmin::remove_filter (CosNotifyFilter::FilterID filter_id) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::FilterNotFound - )) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -61,10 +56,6 @@ TAO_Notify_FilterAdmin::remove_filter (CosNotifyFilter::FilterID filter_id) CosNotifyFilter::Filter_ptr TAO_Notify_FilterAdmin::get_filter (CosNotifyFilter::FilterID filter_id) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::FilterNotFound - )) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -80,9 +71,6 @@ TAO_Notify_FilterAdmin::get_filter (CosNotifyFilter::FilterID filter_id) CosNotifyFilter::FilterIDSeq* TAO_Notify_FilterAdmin::get_all_filters (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -116,7 +104,6 @@ TAO_Notify_FilterAdmin::get_all_filters (void) void TAO_Notify_FilterAdmin::remove_all_filters (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h index d332011a4f4..45114b2879f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h @@ -46,44 +46,21 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin // = match operation on all the filters /// See if any of the filters match. - CORBA::Boolean match (const TAO_Notify_Event::Ptr &event) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::UnsupportedFilterableData - )); + CORBA::Boolean match (const TAO_Notify_Event::Ptr &event); // = match operation on all the filters /// See if any of the filters match. - CORBA::Boolean match (const TAO_Notify_Event* event) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::UnsupportedFilterableData - )); - - virtual CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr new_filter) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void remove_filter (CosNotifyFilter::FilterID filter) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::FilterNotFound - )); - - virtual CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID filter) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::FilterNotFound - )); - - virtual CosNotifyFilter::FilterIDSeq * get_all_filters (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void remove_all_filters (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + CORBA::Boolean match (const TAO_Notify_Event* event); + + virtual CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr new_filter); + + virtual void remove_filter (CosNotifyFilter::FilterID filter); + + virtual CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID filter); + + virtual CosNotifyFilter::FilterIDSeq * get_all_filters (void); + + virtual void remove_all_filters (void); // TAO_Notify::Topology_Object diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl index 7fd08855554..d036dd2d16b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl @@ -6,10 +6,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::Boolean TAO_Notify_FilterAdmin::match (const TAO_Notify_Event* event) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::UnsupportedFilterableData - )) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp index 12ca5cabb5a..01a08c99064 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp @@ -20,8 +20,6 @@ void TAO_Notify_Constraint_Interpreter::build_tree ( const char *constraints ) - ACE_THROW_SPEC ((CosNotifyFilter::InvalidConstraint, - CORBA::NO_MEMORY)) { if (TAO_ETCL_Interpreter::is_empty_string (constraints)) { diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h index 3d2414adbf5..632e77f348f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h @@ -49,9 +49,7 @@ public: * Constraint exception if the constraint given has syntax errors or * semantic errors, such as mismatched types. */ - void build_tree (const char* constraints) - ACE_THROW_SPEC ((CosNotifyFilter::InvalidConstraint, - CORBA::NO_MEMORY)); + void build_tree (const char* constraints); /// Returns true if the constraint is evaluated successfully by /// the evaluator. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp index 02632dce402..1e8638a4b15 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp @@ -83,9 +83,6 @@ TAO_Notify_Proxy::types_changed (const TAO_Notify_EventTypeSeq& added, const TAO CosNotification::EventTypeSeq* TAO_Notify_Proxy::obtain_types (CosNotifyChannelAdmin::ObtainInfoMode mode, const TAO_Notify_EventTypeSeq& types) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { CosNotification::EventTypeSeq_var event_type_seq; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h index 357c9868ced..ae45e97b14e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h @@ -89,8 +89,7 @@ public: virtual CosNotification::EventTypeSeq* obtain_types ( CosNotifyChannelAdmin::ObtainInfoMode mode, const TAO_Notify_EventTypeSeq& types - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); /// Notification of subscriptions/offers set at the admin. virtual void admin_types_changed (const CosNotification::EventTypeSeq & added, diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp index 614157337c1..568a1133aa3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp @@ -66,10 +66,6 @@ TAO_Notify_ProxyConsumer::init (TAO_Notify::Topology_Parent* topology_parent) void TAO_Notify_ProxyConsumer::connect (TAO_Notify_Supplier *supplier) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosEventChannelAdmin::AlreadyConnected - )) { // Adopt the supplier ACE_Auto_Ptr< TAO_Notify_Supplier > auto_supplier (supplier); diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h index 7e2f2e4564f..70b27ab1022 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h @@ -51,11 +51,7 @@ public: virtual void init (TAO_Notify::Topology_Parent * topology_parent); /// Connect - void connect (TAO_Notify_Supplier* supplier) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosEventChannelAdmin::AlreadyConnected - )); + void connect (TAO_Notify_Supplier* supplier); /// Disconnect void disconnect (void); diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp index bd274580332..7765c5c7ff4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp @@ -29,9 +29,6 @@ TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::admin_types_changed (const CosNotifica template <class SERVANT_TYPE> CosNotifyChannelAdmin::SupplierAdmin_ptr TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::MyAdmin (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { CosNotifyChannelAdmin::SupplierAdmin_var ret; @@ -44,10 +41,6 @@ TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::MyAdmin (void) template <class SERVANT_TYPE> void TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )) { TAO_Notify_EventTypeSeq seq_added (added); TAO_Notify_EventTypeSeq seq_removed (removed); @@ -67,7 +60,6 @@ TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::offer_change (const CosNotification::E template <class SERVANT_TYPE> CosNotification::EventTypeSeq* TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::obtain_subscription_types ( CosNotifyChannelAdmin::ObtainInfoMode mode) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->obtain_types (mode, this->event_manager().subscription_types ()); diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h index 0d38ba6b19b..8ef90f4116c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h @@ -46,26 +46,16 @@ public: virtual void admin_types_changed (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed); - virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (void); virtual CosNotification::EventTypeSeq * obtain_subscription_types ( CosNotifyChannelAdmin::ObtainInfoMode mode - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )); + ); }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp index f65d85abe56..ec8b8f5ea9b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp @@ -55,10 +55,6 @@ TAO_Notify_ProxySupplier:: peer (void) void TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosEventChannelAdmin::AlreadyConnected - )) { // Adopt the consumer ACE_Auto_Ptr< TAO_Notify_Consumer > auto_consumer (consumer); diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h index f038e2c2c66..f56d8412c8a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h @@ -50,11 +50,7 @@ public: virtual void init (TAO_Notify_ConsumerAdmin* consumer_admin); /// Connect - void connect (TAO_Notify_Consumer* consumer) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosEventChannelAdmin::AlreadyConnected - )); + void connect (TAO_Notify_Consumer* consumer); /// Disconnect void disconnect (void); diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp index a45fcbfb5e3..af9dfa473e1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp @@ -36,9 +36,6 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::admin_types_changed (const CosNotifica template <class SERVANT_TYPE> void TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_structured (const CosNotification::StructuredEvent& notification) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { TAO_Notify_StructuredEvent_No_Copy event (notification); @@ -49,9 +46,6 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_structured (const CosNotificat template <class SERVANT_TYPE> void TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_structured_no_filtering (const CosNotification::StructuredEvent& notification) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { TAO_Notify_StructuredEvent_No_Copy event(notification); @@ -62,9 +56,6 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_structured_no_filtering (const template <class SERVANT_TYPE> void TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_any (const CORBA::Any & any) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { TAO_Notify_AnyEvent_No_Copy event (any); @@ -75,9 +66,6 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_any (const CORBA::Any & any) template <class SERVANT_TYPE> void TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_any_no_filtering (const CORBA::Any& any) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { TAO_Notify_AnyEvent_No_Copy event(any); @@ -88,9 +76,6 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_any_no_filtering (const CORBA: template <class SERVANT_TYPE> CosNotification::EventTypeSeq* TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannelAdmin::ObtainInfoMode mode) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->obtain_types (mode, this->event_manager().offered_types ()); } @@ -98,8 +83,6 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannel template <class SERVANT_TYPE> void TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyComm::InvalidEventType)) { TAO_Notify_EventTypeSeq seq_added (added); TAO_Notify_EventTypeSeq seq_removed (removed); @@ -116,11 +99,6 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::subscription_change (const CosNotifica template <class SERVANT_TYPE> void TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::suspend_connection (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyChannelAdmin::ConnectionAlreadyInactive, - CosNotifyChannelAdmin::NotConnected - )) { { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -138,11 +116,6 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::suspend_connection (void) template <class SERVANT_TYPE> void TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::resume_connection (void) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyChannelAdmin::ConnectionAlreadyActive, - CosNotifyChannelAdmin::NotConnected - )) { { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -159,9 +132,6 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::resume_connection (void) template <class SERVANT_TYPE> CosNotifyChannelAdmin::ConsumerAdmin_ptr TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::MyAdmin (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { CosNotifyChannelAdmin::ConsumerAdmin_var ret; @@ -176,36 +146,24 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::MyAdmin (void) template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { throw CORBA::NO_IMPLEMENT (); } template <class SERVANT_TYPE> void TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { throw CORBA::NO_IMPLEMENT (); } template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { throw CORBA::NO_IMPLEMENT (); } template <class SERVANT_TYPE> void TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h index 75b800ede14..461acbf9461 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h @@ -45,96 +45,52 @@ public: ///= POA_Notify_Internal methods /// POA_Notify_Internal::Event_Forwarder method - virtual void forward_structured (const CosNotification::StructuredEvent & event) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void forward_structured (const CosNotification::StructuredEvent & event); /// POA_Notify_Internal::Event_Forwarder method - virtual void forward_structured_no_filtering (const CosNotification::StructuredEvent & event) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void forward_structured_no_filtering (const CosNotification::StructuredEvent & event); /// POA_Notify_Internal::Event_Forwarder method - virtual void forward_any (const CORBA::Any & event) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void forward_any (const CORBA::Any & event); /// POA_Notify_Internal::Event_Forwarder method - virtual void forward_any_no_filtering (const CORBA::Any & event) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void forward_any_no_filtering (const CORBA::Any & event); protected: //= Data Members CORBA::Boolean is_suspended_; // = Interface methods virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr MyAdmin ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void suspend_connection ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyChannelAdmin::ConnectionAlreadyInactive, - CosNotifyChannelAdmin::NotConnected - )); + ); virtual void resume_connection ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyChannelAdmin::ConnectionAlreadyActive, - CosNotifyChannelAdmin::NotConnected - )); + ); virtual CosNotifyFilter::MappingFilter_ptr priority_filter ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void priority_filter ( CosNotifyFilter::MappingFilter_ptr priority_filter - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual CosNotifyFilter::MappingFilter_ptr lifetime_filter ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void lifetime_filter ( CosNotifyFilter::MappingFilter_ptr lifetime_filter - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual CosNotification::EventTypeSeq * obtain_offered_types ( CosNotifyChannelAdmin::ObtainInfoMode mode - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )); + ); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp index 009a4a9b70a..5896124519f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp @@ -39,19 +39,12 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::_remove_ref (void) template <class SERVANT_TYPE> void TAO_Notify_Proxy_T<SERVANT_TYPE>::validate_event_qos (const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotification::UnsupportedQoS - )) { throw CORBA::NO_IMPLEMENT (); } template <class SERVANT_TYPE> CosNotification::QoSProperties* TAO_Notify_Proxy_T<SERVANT_TYPE>::get_qos (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -61,10 +54,6 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::get_qos (void) template <class SERVANT_TYPE> void TAO_Notify_Proxy_T<SERVANT_TYPE>::set_qos (const CosNotification::QoSProperties & qos) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotification::UnsupportedQoS - )) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -77,19 +66,12 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::validate_qos ( const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotification::UnsupportedQoS - )) { throw CORBA::NO_IMPLEMENT (); } template <class SERVANT_TYPE> CosNotifyFilter::FilterID TAO_Notify_Proxy_T<SERVANT_TYPE>::add_filter (CosNotifyFilter::Filter_ptr new_filter) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -104,10 +86,6 @@ template <class SERVANT_TYPE> void TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_filter ( CosNotifyFilter::FilterID filter ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::FilterNotFound - )) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -117,10 +95,6 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_filter ( template <class SERVANT_TYPE> CosNotifyFilter::Filter_ptr TAO_Notify_Proxy_T<SERVANT_TYPE>::get_filter (CosNotifyFilter::FilterID filter) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::FilterNotFound - )) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -130,9 +104,6 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::get_filter (CosNotifyFilter::FilterID filter) template <class SERVANT_TYPE> CosNotifyFilter::FilterIDSeq* TAO_Notify_Proxy_T<SERVANT_TYPE>::get_all_filters (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -142,9 +113,6 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::get_all_filters (void) template <class SERVANT_TYPE> void TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_all_filters (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h index 7e24ca1b8ff..df3b7910444 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h @@ -54,69 +54,37 @@ public: virtual void validate_event_qos ( const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotification::UnsupportedQoS - )); + ); virtual CosNotification::QoSProperties * get_qos ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void set_qos ( const CosNotification::QoSProperties & qos - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotification::UnsupportedQoS - )); + ); virtual void validate_qos ( const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotification::UnsupportedQoS - )); + ); virtual CosNotifyFilter::FilterID add_filter ( CosNotifyFilter::Filter_ptr new_filter - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void remove_filter ( CosNotifyFilter::FilterID filter - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::FilterNotFound - )); + ); virtual CosNotifyFilter::Filter_ptr get_filter ( CosNotifyFilter::FilterID filter - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::FilterNotFound - )); + ); virtual CosNotifyFilter::FilterIDSeq * get_all_filters ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void remove_all_filters ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); }; #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp index c1bed4b9a60..1aa065a1b62 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp @@ -30,19 +30,12 @@ TAO_Notify_SequenceProxyPushConsumer::release (void) CosNotifyChannelAdmin::ProxyType TAO_Notify_SequenceProxyPushConsumer::MyType (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CosNotifyChannelAdmin::PUSH_SEQUENCE; } void TAO_Notify_SequenceProxyPushConsumer::connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosEventChannelAdmin::AlreadyConnected - )) { // Convert Supplier to Base Type TAO_Notify_SequencePushSupplier *supplier; @@ -58,10 +51,6 @@ TAO_Notify_SequenceProxyPushConsumer::connect_sequence_push_supplier (CosNotifyC void TAO_Notify_SequenceProxyPushConsumer::push_structured_events (const CosNotification::EventBatch& event_batch) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosEventComm::Disconnected - )) { // Check if we should proceed at all. if (this->admin_properties().reject_new_events () == 1 && this->admin_properties().queue_full ()) @@ -83,9 +72,6 @@ TAO_Notify_SequenceProxyPushConsumer::push_structured_events (const CosNotificat void TAO_Notify_SequenceProxyPushConsumer::disconnect_sequence_push_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { TAO_Notify_SequenceProxyPushConsumer::Ptr guard( this ); this->destroy (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h index 373a3389297..04e21d518dd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h @@ -60,29 +60,15 @@ protected: ///= Protected Methods //= interface methods - virtual CosNotifyChannelAdmin::ProxyType MyType (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual CosNotifyChannelAdmin::ProxyType MyType (void); virtual void connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected - )); + ); virtual void push_structured_events (const CosNotification::EventBatch & notifications - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )); - - virtual void disconnect_sequence_push_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); + + virtual void disconnect_sequence_push_consumer (void); private: /// TAO_Notify_Destroy_Callback methods diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp index 0a258fecdf5..95d19c94875 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp @@ -27,11 +27,6 @@ TAO_Notify_SequenceProxyPushSupplier::release (void) void TAO_Notify_SequenceProxyPushSupplier::connect_sequence_push_consumer (CosNotifyComm::SequencePushConsumer_ptr push_consumer) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosEventChannelAdmin::AlreadyConnected - , CosEventChannelAdmin::TypeError - )) { // Convert Consumer to Base Type TAO_Notify_SequencePushConsumer* consumer; @@ -47,9 +42,6 @@ TAO_Notify_SequenceProxyPushSupplier::connect_sequence_push_consumer (CosNotifyC void TAO_Notify_SequenceProxyPushSupplier::disconnect_sequence_push_supplier (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { TAO_Notify_SequenceProxyPushSupplier::Ptr guard( this ); @@ -59,9 +51,6 @@ TAO_Notify_SequenceProxyPushSupplier::disconnect_sequence_push_supplier (void) CosNotifyChannelAdmin::ProxyType TAO_Notify_SequenceProxyPushSupplier::MyType (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CosNotifyChannelAdmin::PUSH_SEQUENCE; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h index 3b5e76b8cde..e75aa763791 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h @@ -62,25 +62,14 @@ public: virtual void load_attrs (const TAO_Notify::NVPList& attrs); /// = Servant methods - virtual CosNotifyChannelAdmin::ProxyType MyType (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual CosNotifyChannelAdmin::ProxyType MyType (void); virtual void connect_sequence_push_consumer ( CosNotifyComm::SequencePushConsumer_ptr push_consumer - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected, - CosEventChannelAdmin::TypeError - )); + ); virtual void disconnect_sequence_push_supplier ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); /// TAO_Notify_Destroy_Callback methods virtual void release (void); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp index df4b9ac9aca..b45f79230dd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp @@ -31,19 +31,12 @@ TAO_Notify_StructuredProxyPushConsumer::release (void) CosNotifyChannelAdmin::ProxyType TAO_Notify_StructuredProxyPushConsumer::MyType (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CosNotifyChannelAdmin::PUSH_STRUCTURED; } void TAO_Notify_StructuredProxyPushConsumer::connect_structured_push_supplier (CosNotifyComm::StructuredPushSupplier_ptr push_supplier) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosEventChannelAdmin::AlreadyConnected - )) { // Convert Supplier to Base Type TAO_Notify_StructuredPushSupplier * supplier; @@ -58,10 +51,6 @@ TAO_Notify_StructuredProxyPushConsumer::connect_structured_push_supplier (CosNot void TAO_Notify_StructuredProxyPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosEventComm::Disconnected - )) { // Check if we should proceed at all. if (this->admin_properties().reject_new_events () == 1 @@ -79,9 +68,6 @@ TAO_Notify_StructuredProxyPushConsumer::push_structured_event (const CosNotifica void TAO_Notify_StructuredProxyPushConsumer::disconnect_structured_push_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { TAO_Notify_StructuredProxyPushConsumer::Ptr guard( this ); this->destroy (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h index 24c6a667cf1..e8dd900b03f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h @@ -56,32 +56,18 @@ public: protected: // = interface methods - virtual CosNotifyChannelAdmin::ProxyType MyType (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual CosNotifyChannelAdmin::ProxyType MyType (void); virtual void connect_structured_push_supplier ( CosNotifyComm::StructuredPushSupplier_ptr push_supplier - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected - )); + ); virtual void push_structured_event ( const CosNotification::StructuredEvent & notification - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )); + ); virtual void disconnect_structured_push_consumer ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual const char * get_proxy_type_name (void) const; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp index 2f7147a5078..ffa1c18c045 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp @@ -30,20 +30,12 @@ TAO_Notify_StructuredProxyPushSupplier::release (void) CosNotifyChannelAdmin::ProxyType TAO_Notify_StructuredProxyPushSupplier::MyType (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CosNotifyChannelAdmin::PUSH_STRUCTURED; } void TAO_Notify_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNotifyComm::StructuredPushConsumer_ptr push_consumer) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosEventChannelAdmin::AlreadyConnected - , CosEventChannelAdmin::TypeError - )) { // Convert Consumer to Base Type TAO_Notify_StructuredPushConsumer* consumer; @@ -59,9 +51,6 @@ TAO_Notify_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNot void TAO_Notify_StructuredProxyPushSupplier::disconnect_structured_push_supplier (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { TAO_Notify_StructuredProxyPushSupplier::Ptr guard( this ); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h index 068e3e5a09e..84cd3372f94 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h @@ -62,25 +62,14 @@ public: /// = Servant methods // = interface methods - virtual CosNotifyChannelAdmin::ProxyType MyType (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual CosNotifyChannelAdmin::ProxyType MyType (void); virtual void connect_structured_push_consumer ( CosNotifyComm::StructuredPushConsumer_ptr push_consumer - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected, - CosEventChannelAdmin::TypeError - )); + ); virtual void disconnect_structured_push_supplier ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual const char * get_proxy_type_name (void) const; diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp index 52f29971be4..bbbc12149c3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp @@ -80,9 +80,6 @@ TAO_Notify_SupplierAdmin::release (void) void TAO_Notify_SupplierAdmin::destroy (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { int result = this->shutdown (); if ( result == 1) @@ -146,19 +143,12 @@ TAO_Notify_SupplierAdmin::load_proxy ( void TAO_Notify_SupplierAdmin::set_qos (const CosNotification::QoSProperties & qos) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotification::UnsupportedQoS - )) { this->TAO_Notify_Object::set_qos (qos); } CosNotification::QoSProperties* TAO_Notify_SupplierAdmin::get_qos (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->TAO_Notify_Object::get_qos (); } @@ -166,10 +156,6 @@ TAO_Notify_SupplierAdmin::get_qos (void) CosNotifyChannelAdmin::ProxyConsumer_ptr TAO_Notify_SupplierAdmin::obtain_notification_push_consumer (CosNotifyChannelAdmin::ClientType ctype , CosNotifyChannelAdmin::ProxyID_out proxy_id) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyChannelAdmin::AdminLimitExceeded - )) { CosNotification::QoSProperties initial_qos; @@ -188,11 +174,6 @@ TAO_Notify_SupplierAdmin::obtain_notification_push_consumer_with_qos (CosNotifyC CosNotifyChannelAdmin::ProxyID_out proxy_id, const CosNotification::QoSProperties & initial_qos ) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyChannelAdmin::AdminLimitExceeded - , CosNotification::UnsupportedQoS - )) { CosNotifyChannelAdmin::ProxyConsumer_var proxy = TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this @@ -206,9 +187,6 @@ TAO_Notify_SupplierAdmin::obtain_notification_push_consumer_with_qos (CosNotifyC CosEventChannelAdmin::ProxyPushConsumer_ptr TAO_Notify_SupplierAdmin::obtain_push_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { CosEventChannelAdmin::ProxyPushConsumer_var proxy = TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this); @@ -218,36 +196,24 @@ TAO_Notify_SupplierAdmin::obtain_push_consumer (void) CosNotifyChannelAdmin::AdminID TAO_Notify_SupplierAdmin::MyID (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->id (); } CosNotifyChannelAdmin::EventChannel_ptr TAO_Notify_SupplierAdmin::MyChannel (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->ec_->_this (); } ::CosNotifyChannelAdmin::InterFilterGroupOperator TAO_Notify_SupplierAdmin::MyOperator (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->filter_operator_; } CosNotifyChannelAdmin::ProxyIDSeq* TAO_Notify_SupplierAdmin::push_consumers (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { TAO_Notify_Proxy_Seq_Worker seq_worker; @@ -256,10 +222,6 @@ TAO_Notify_SupplierAdmin::push_consumers (void) CosNotifyChannelAdmin::ProxyConsumer_ptr TAO_Notify_SupplierAdmin::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID proxy_id) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyChannelAdmin::ProxyNotFound - )) { TAO_Notify_ProxyConsumer_Find_Worker find_worker; @@ -270,10 +232,6 @@ void TAO_Notify_SupplierAdmin::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyComm::InvalidEventType - )) { TAO_Notify_EventTypeSeq seq_added (added); @@ -293,9 +251,6 @@ TAO_Notify_SupplierAdmin::offer_change (const CosNotification::EventTypeSeq & ad CosNotifyFilter::FilterID TAO_Notify_SupplierAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { CosNotifyFilter::FilterID fid = this->filter_admin_.add_filter (new_filter); @@ -305,38 +260,24 @@ TAO_Notify_SupplierAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter) void TAO_Notify_SupplierAdmin::remove_filter (CosNotifyFilter::FilterID filter) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyFilter::FilterNotFound - )) { this->filter_admin_.remove_filter (filter); } ::CosNotifyFilter::Filter_ptr TAO_Notify_SupplierAdmin::get_filter (CosNotifyFilter::FilterID filter) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyFilter::FilterNotFound - )) { return this->filter_admin_.get_filter (filter); } ::CosNotifyFilter::FilterIDSeq* TAO_Notify_SupplierAdmin::get_all_filters (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return this->filter_admin_.get_all_filters (); } void TAO_Notify_SupplierAdmin::remove_all_filters (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { this->filter_admin_.remove_all_filters (); } @@ -345,18 +286,12 @@ TAO_Notify_SupplierAdmin::remove_all_filters (void) CosEventChannelAdmin::ProxyPullConsumer_ptr TAO_Notify_SupplierAdmin::obtain_pull_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { throw CORBA::NO_IMPLEMENT (); } CosNotifyChannelAdmin::ProxyIDSeq* TAO_Notify_SupplierAdmin::pull_consumers (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { throw CORBA::NO_IMPLEMENT (); } @@ -365,10 +300,6 @@ TAO_Notify_SupplierAdmin::pull_consumers (void) void TAO_Notify_SupplierAdmin::validate_qos (const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotification::UnsupportedQoS - )) { throw CORBA::NO_IMPLEMENT (); } @@ -376,10 +307,6 @@ TAO_Notify_SupplierAdmin::validate_qos (const CosNotification::QoSProperties & / CosNotifyChannelAdmin::ProxyConsumer_ptr TAO_Notify_SupplierAdmin::obtain_notification_pull_consumer (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyChannelAdmin::AdminLimitExceeded - )) { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h index e8495c124e8..c864babaf33 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h @@ -82,108 +82,75 @@ protected: CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id, const CosNotification::QoSProperties & initial_qos - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyChannelAdmin::AdminLimitExceeded, - CosNotification::UnsupportedQoS)); + ); /// = CosNotifyChannelAdmin::SupplierAdmin methods - virtual CosNotifyChannelAdmin::AdminID MyID (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosNotifyChannelAdmin::AdminID MyID (void); virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_consumers ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_consumers ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual ::CosNotifyChannelAdmin::ProxyConsumer_ptr get_proxy_consumer ( CosNotifyChannelAdmin::ProxyID proxy_id - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyChannelAdmin::ProxyNotFound)); + ); virtual ::CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_pull_consumer ( CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyChannelAdmin::AdminLimitExceeded)); + ); virtual ::CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_push_consumer ( CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyChannelAdmin::AdminLimitExceeded)); + ); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual ::CosNotification::QoSProperties* get_qos (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual ::CosNotification::QoSProperties* get_qos (void); - virtual void set_qos (const CosNotification::QoSProperties& qos) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotification::UnsupportedQoS)); + virtual void set_qos (const CosNotification::QoSProperties& qos); virtual void validate_qos ( const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotification::UnsupportedQoS)); + ); virtual void offer_change (const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyComm::InvalidEventType - )); + const CosNotification::EventTypeSeq & removed); virtual CosNotifyFilter::FilterID add_filter ( CosNotifyFilter::Filter_ptr new_filter - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void remove_filter ( CosNotifyFilter::FilterID filter - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyFilter::FilterNotFound)); + ); virtual ::CosNotifyFilter::Filter_ptr get_filter ( CosNotifyFilter::FilterID filter - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyFilter::FilterNotFound)); + ); virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); - virtual void remove_all_filters (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void remove_all_filters (void); virtual ::CosEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual ::CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); private: /// Release diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp index 336b06d11da..beff88eeb36 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp @@ -173,7 +173,6 @@ namespace TAO_Notify const ACEXML_Char*, const ACEXML_Char* name, ACEXML_Attributes* xml_attrs ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ( (ACEXML_SAXException)) { ACE_ASSERT (name != 0); ACE_ASSERT (xml_attrs != 0); @@ -211,7 +210,6 @@ namespace TAO_Notify XML_Loader::endElement (const ACEXML_Char*, const ACEXML_Char*, const ACEXML_Char* name ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ( (ACEXML_SAXException)) { ACE_UNUSED_ARG (name); if (this->live_) diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h index b90799d8f20..bbc4ed16e34 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h @@ -58,13 +58,11 @@ public: virtual void startElement (const ACEXML_Char* namespaceURI, const ACEXML_Char* localName, const ACEXML_Char* qName, - ACEXML_Attributes* atts ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + ACEXML_Attributes* atts ACEXML_ENV_ARG_DECL); virtual void endElement (const ACEXML_Char*, const ACEXML_Char*, - const ACEXML_Char* name ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)); + const ACEXML_Char* name ACEXML_ENV_ARG_DECL_NOT_USED); private: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp index 2705c6ae78e..74563633343 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp @@ -20,10 +20,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL PortableServer::ObjectId * TAO_GOA::create_id_for_reference (CORBA::Object_ptr the_ref) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::NotAGroupObject - )) { // Get the RepositoryId from the Group reference so // we know what kind of reference to make. @@ -45,10 +41,6 @@ TAO_GOA::create_id_for_reference (CORBA::Object_ptr the_ref) PortableGroup::IDs * TAO_GOA::reference_to_ids (CORBA::Object_ptr the_ref) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::NotAGroupObject - )) { ACE_UNUSED_ARG (the_ref); @@ -58,10 +50,6 @@ TAO_GOA::reference_to_ids (CORBA::Object_ptr the_ref) void TAO_GOA::associate_reference_with_id (CORBA::Object_ptr ref, const PortableServer::ObjectId & oid) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::NotAGroupObject - )) { // Create a reference for the specified ObjectId, since // it is much easier to extract the object key from the @@ -76,10 +64,6 @@ TAO_GOA::associate_reference_with_id (CORBA::Object_ptr ref, void TAO_GOA::disassociate_reference_with_id (CORBA::Object_ptr ref, const PortableServer::ObjectId & oid) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::NotAGroupObject - )) { ACE_UNUSED_ARG (ref); ACE_UNUSED_ARG (oid); @@ -140,9 +124,6 @@ PortableServer::POA_ptr TAO_GOA::create_POA (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::AdapterAlreadyExists, - PortableServer::POA::InvalidPolicy)) { PortableServer::POA_ptr poa = this->TAO_Regular_POA::create_POA (adapter_name, poa_manager, @@ -153,8 +134,6 @@ TAO_GOA::create_POA (const char *adapter_name, PortableServer::POA_ptr TAO_GOA::find_POA (const char *adapter_name, CORBA::Boolean activate_it) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::AdapterNonExistent)) { PortableServer::POA_ptr poa = this->TAO_Regular_POA::find_POA (adapter_name, activate_it); @@ -164,7 +143,6 @@ TAO_GOA::find_POA (const char *adapter_name, void TAO_GOA::destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->TAO_Regular_POA::destroy (etherealize_objects, wait_for_completion); @@ -175,7 +153,6 @@ TAO_GOA::destroy (CORBA::Boolean etherealize_objects, PortableServer::ThreadPolicy_ptr TAO_GOA::create_thread_policy (PortableServer::ThreadPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ThreadPolicy_ptr policy = this->TAO_Regular_POA::create_thread_policy (value); @@ -186,7 +163,6 @@ TAO_GOA::create_thread_policy (PortableServer::ThreadPolicyValue value) PortableServer::LifespanPolicy_ptr TAO_GOA::create_lifespan_policy (PortableServer::LifespanPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::LifespanPolicy_ptr policy = this->TAO_Regular_POA::create_lifespan_policy (value); @@ -195,7 +171,6 @@ TAO_GOA::create_lifespan_policy (PortableServer::LifespanPolicyValue value) PortableServer::IdUniquenessPolicy_ptr TAO_GOA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::IdUniquenessPolicy_ptr policy = this->TAO_Regular_POA::create_id_uniqueness_policy (value); @@ -205,7 +180,6 @@ TAO_GOA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue va PortableServer::IdAssignmentPolicy_ptr TAO_GOA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::IdAssignmentPolicy_ptr policy = this->TAO_Regular_POA::create_id_assignment_policy (value); @@ -217,7 +191,6 @@ TAO_GOA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue va PortableServer::ImplicitActivationPolicy_ptr TAO_GOA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ImplicitActivationPolicy_ptr policy = this->TAO_Regular_POA::create_implicit_activation_policy (value); @@ -226,7 +199,6 @@ TAO_GOA::create_implicit_activation_policy (PortableServer::ImplicitActivationPo PortableServer::ServantRetentionPolicy_ptr TAO_GOA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ServantRetentionPolicy_ptr policy = this->TAO_Regular_POA::create_servant_retention_policy (value); @@ -236,7 +208,6 @@ TAO_GOA::create_servant_retention_policy (PortableServer::ServantRetentionPolicy PortableServer::RequestProcessingPolicy_ptr TAO_GOA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::RequestProcessingPolicy_ptr policy = this->TAO_Regular_POA::create_request_processing_policy (value); @@ -248,7 +219,6 @@ TAO_GOA::create_request_processing_policy (PortableServer::RequestProcessingPoli char * TAO_GOA::the_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { char * name = this->TAO_Regular_POA::the_name (); @@ -257,7 +227,6 @@ TAO_GOA::the_name (void) PortableServer::POA_ptr TAO_GOA::the_parent (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POA_ptr parent = this->TAO_Regular_POA::the_parent (); @@ -266,7 +235,6 @@ TAO_GOA::the_parent (void) PortableServer::POAList * TAO_GOA::the_children (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POAList *children = this->TAO_Regular_POA::the_children (); @@ -275,7 +243,6 @@ TAO_GOA::the_children (void) PortableServer::POAManager_ptr TAO_GOA::the_POAManager (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POAManager_ptr poa_manager = this->TAO_Regular_POA::the_POAManager (); @@ -287,7 +254,6 @@ TAO_GOA::the_POAManager (void) PortableServer::AdapterActivator_ptr TAO_GOA::the_activator (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::AdapterActivator_ptr activator = this->TAO_Regular_POA::the_activator (); @@ -296,15 +262,12 @@ TAO_GOA::the_activator (void) void TAO_GOA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->TAO_Regular_POA::the_activator (adapter_activator); } PortableServer::ServantManager_ptr TAO_GOA::get_servant_manager (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { PortableServer::ServantManager_ptr servant_manager = this->TAO_Regular_POA::get_servant_manager (); @@ -313,17 +276,12 @@ TAO_GOA::get_servant_manager (void) void TAO_GOA::set_servant_manager (PortableServer::ServantManager_ptr imgr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { this->TAO_Regular_POA::set_servant_manager (imgr); } PortableServer::Servant TAO_GOA::get_servant (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::NoServant, - PortableServer::POA::WrongPolicy)) { PortableServer::Servant servant = this->TAO_Regular_POA::get_servant (); @@ -332,8 +290,6 @@ TAO_GOA::get_servant (void) void TAO_GOA::set_servant (PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { this->TAO_Regular_POA::set_servant (servant); } @@ -342,9 +298,6 @@ TAO_GOA::set_servant (PortableServer::Servant servant) PortableServer::ObjectId * TAO_GOA::activate_object (PortableServer::Servant p_servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::WrongPolicy)) { PortableServer::ObjectId *object_id = this->TAO_Regular_POA::activate_object (p_servant); @@ -354,10 +307,6 @@ TAO_GOA::activate_object (PortableServer::Servant p_servant) void TAO_GOA::activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::ObjectAlreadyActive, - PortableServer::POA::WrongPolicy)) { this->TAO_Regular_POA::activate_object_with_id (id, p_servant); @@ -365,17 +314,12 @@ TAO_GOA::activate_object_with_id (const PortableServer::ObjectId &id, void TAO_GOA::deactivate_object (const PortableServer::ObjectId &oid) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) { this->TAO_Regular_POA::deactivate_object (oid); } CORBA::Object_ptr TAO_GOA::create_reference (const char *intf) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { CORBA::Object_ptr obj = this->TAO_Regular_POA::create_reference (intf); @@ -385,7 +329,6 @@ TAO_GOA::create_reference (const char *intf) CORBA::Object_ptr TAO_GOA::create_reference_with_id (const PortableServer::ObjectId &oid, const char *intf) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_ptr obj = this->TAO_Regular_POA::create_reference_with_id (oid, @@ -395,9 +338,6 @@ TAO_GOA::create_reference_with_id (const PortableServer::ObjectId &oid, PortableServer::ObjectId * TAO_GOA::servant_to_id (PortableServer::Servant p_servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)) { PortableServer::ObjectId *object_id = this->TAO_Regular_POA::servant_to_id (p_servant); @@ -406,9 +346,6 @@ TAO_GOA::servant_to_id (PortableServer::Servant p_servant) CORBA::Object_ptr TAO_GOA::servant_to_reference (PortableServer::Servant p_servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)) { CORBA::Object_ptr obj = this->TAO_Regular_POA::servant_to_reference (p_servant); @@ -418,10 +355,6 @@ TAO_GOA::servant_to_reference (PortableServer::Servant p_servant) PortableServer::Servant TAO_GOA::reference_to_servant (CORBA::Object_ptr reference) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy)) { PortableServer::Servant servant = this->TAO_Regular_POA::reference_to_servant (reference); @@ -430,9 +363,6 @@ TAO_GOA::reference_to_servant (CORBA::Object_ptr reference) PortableServer::ObjectId * TAO_GOA::reference_to_id (CORBA::Object_ptr reference) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy)) { PortableServer::ObjectId *object_id = this->TAO_Regular_POA::reference_to_id (reference); @@ -441,9 +371,6 @@ TAO_GOA::reference_to_id (CORBA::Object_ptr reference) PortableServer::Servant TAO_GOA::id_to_servant (const PortableServer::ObjectId &oid) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) { PortableServer::Servant servant = this->TAO_Regular_POA::id_to_servant (oid); @@ -452,9 +379,6 @@ TAO_GOA::id_to_servant (const PortableServer::ObjectId &oid) CORBA::Object_ptr TAO_GOA::id_to_reference (const PortableServer::ObjectId &oid) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) { CORBA::Object_ptr obj = this->TAO_Regular_POA::id_to_reference (oid); @@ -463,7 +387,6 @@ TAO_GOA::id_to_reference (const PortableServer::ObjectId &oid) CORBA::OctetSeq * TAO_GOA::id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->TAO_Regular_POA::id (); } @@ -558,8 +481,6 @@ void TAO_GOA::associate_group_with_ref ( CORBA::Object_ptr group_ref, CORBA::Object_ptr obj_ref) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::NotAGroupObject)) { // Find the Group Component so that we can extract the Group ID. PortableGroup::TagGroupTaggedComponent *tmp_group_id; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h index 42a20bdbd8f..9ade43a0f85 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h @@ -55,183 +55,106 @@ public: //@{ virtual PortableServer::ObjectId * create_id_for_reference ( CORBA::Object_ptr the_ref - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::NotAGroupObject - )); + ); virtual PortableGroup::IDs * reference_to_ids ( CORBA::Object_ptr the_ref - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::NotAGroupObject - )); + ); virtual void associate_reference_with_id ( CORBA::Object_ptr ref, const PortableServer::ObjectId & oid - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::NotAGroupObject - )); + ); virtual void disassociate_reference_with_id ( CORBA::Object_ptr ref, const PortableServer::ObjectId & oid - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::NotAGroupObject - )); + ); //@} // Standard POA interface methods PortableServer::POA_ptr create_POA (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, - const CORBA::PolicyList &policies) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::AdapterAlreadyExists, - PortableServer::POA::InvalidPolicy)); + const CORBA::PolicyList &policies); PortableServer::POA_ptr find_POA (const char *adapter_name, - CORBA::Boolean activate_it) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::AdapterNonExistent)); + CORBA::Boolean activate_it); void destroy (CORBA::Boolean etherealize_objects, - CORBA::Boolean wait_for_completion) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean wait_for_completion); #if (TAO_HAS_MINIMUM_POA == 0) - PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value); #endif /* TAO_HAS_MINIMUM_POA == 0 */ - PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value); - PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value); - PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value); #if (TAO_HAS_MINIMUM_POA == 0) - PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value); - PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value); - PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value); #endif /* TAO_HAS_MINIMUM_POA == 0 */ - char * the_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + char * the_name (void); - PortableServer::POA_ptr the_parent (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::POA_ptr the_parent (void); - PortableServer::POAList *the_children (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::POAList *the_children (void); - PortableServer::POAManager_ptr the_POAManager (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::POAManager_ptr the_POAManager (void); #if (TAO_HAS_MINIMUM_POA == 0) - PortableServer::AdapterActivator_ptr the_activator (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::AdapterActivator_ptr the_activator (void); - void the_activator (PortableServer::AdapterActivator_ptr adapter_activator) - ACE_THROW_SPEC ((CORBA::SystemException)); + void the_activator (PortableServer::AdapterActivator_ptr adapter_activator); - PortableServer::ServantManager_ptr get_servant_manager (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + PortableServer::ServantManager_ptr get_servant_manager (void); - void set_servant_manager (PortableServer::ServantManager_ptr imgr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + void set_servant_manager (PortableServer::ServantManager_ptr imgr); - PortableServer::Servant get_servant (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::NoServant, - PortableServer::POA::WrongPolicy)); + PortableServer::Servant get_servant (void); - void set_servant (PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + void set_servant (PortableServer::Servant servant); #endif /* TAO_HAS_MINIMUM_POA == 0 */ - PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::WrongPolicy)); + PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant); void activate_object_with_id (const PortableServer::ObjectId &id, - PortableServer::Servant p_servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::ObjectAlreadyActive, - PortableServer::POA::WrongPolicy)); + PortableServer::Servant p_servant); - void deactivate_object (const PortableServer::ObjectId &oid) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); + void deactivate_object (const PortableServer::ObjectId &oid); - CORBA::Object_ptr create_reference (const char *intf) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + CORBA::Object_ptr create_reference (const char *intf); CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid, - const char *intf) - ACE_THROW_SPEC ((CORBA::SystemException)); - - PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)); - - CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)); - - PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy)); - - PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy)); - - PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); - - CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); - - CORBA::OctetSeq *id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *intf); + + PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant); + + CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant); + + PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference); + + PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference); + + PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid); + + CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid); + + CORBA::OctetSeq *id (void); // End standard POA interface methods. @@ -279,9 +202,7 @@ protected: /// object references. void associate_group_with_ref ( CORBA::Object_ptr group_ref, - CORBA::Object_ptr obj_ref) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::NotAGroupObject)); + CORBA::Object_ptr obj_ref); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp index 3ed2d1869a0..a7f6649c96c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp @@ -27,9 +27,6 @@ TAO_PG_Default_Property_Validator::~TAO_PG_Default_Property_Validator (void) void TAO_PG_Default_Property_Validator::validate_property ( const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { const CORBA::ULong len = props.length (); @@ -78,9 +75,6 @@ TAO_PG_Default_Property_Validator::validate_property ( void TAO_PG_Default_Property_Validator::validate_criteria ( const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidCriteria, - PortableGroup::CannotMeetCriteria)) { const CORBA::ULong len = props.length (); PortableGroup::Criteria invalid_criteria; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h index 15cf9257f0f..6d536b62078 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h @@ -46,18 +46,12 @@ public: /// Validate the given properties. Throw an exception when the /// first invalid property is encountered. The remaining properties /// will not be validated. - virtual void validate_property (const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + virtual void validate_property (const PortableGroup::Properties & props); /// Validate the given properties/criteria. All criteria /// will be validated regardless of whether or not an invalid /// property was encountered. - virtual void validate_criteria (const PortableGroup::Properties & criteria) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidCriteria, - PortableGroup::CannotMeetCriteria)); + virtual void validate_criteria (const PortableGroup::Properties & criteria); private: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp index eaba8c3012d..d938aa82e6c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp @@ -285,10 +285,6 @@ void TAO::PG_FactoryRegistry::register_factory ( const char * type_id, const PortableGroup::FactoryInfo & factory_info ) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::MemberAlreadyPresent - , PortableGroup::TypeConflict)) { METHOD_ENTRY(TAO::PG_FactoryRegistry::register_factory); @@ -357,7 +353,6 @@ void TAO::PG_FactoryRegistry::unregister_factory ( const char * role, const PortableGroup::Location & location ) - ACE_THROW_SPEC ((CORBA::SystemException, PortableGroup::MemberNotFound)) { METHOD_ENTRY(TAO::PG_FactoryRegistry::unregister_factory); @@ -446,7 +441,6 @@ void TAO::PG_FactoryRegistry::unregister_factory ( void TAO::PG_FactoryRegistry::unregister_factory_by_role ( const char * role ) - ACE_THROW_SPEC ((CORBA::SystemException)) { METHOD_ENTRY(TAO::PG_FactoryRegistry::unregister_factory_by_role); @@ -492,7 +486,6 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_role ( void TAO::PG_FactoryRegistry::unregister_factory_by_location ( const PortableGroup::Location & location ) - ACE_THROW_SPEC ((CORBA::SystemException)) { METHOD_ENTRY(TAO::PG_FactoryRegistry::unregister_factory_by_location); @@ -606,7 +599,6 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location ( const char * role, CORBA::String_out type_id ) - ACE_THROW_SPEC ((CORBA::SystemException)) { METHOD_ENTRY(TAO::PG_FactoryRegistry::list_factories_by_role); @@ -637,7 +629,6 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location ( ::PortableGroup::FactoryInfos * TAO::PG_FactoryRegistry::list_factories_by_location ( const PortableGroup::Location & location ) - ACE_THROW_SPEC ((CORBA::SystemException)) { METHOD_ENTRY(TAO::PG_FactoryRegistry::list_factories_by_location); ::PortableGroup::FactoryInfos_var result; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h index dbc93df64f7..bd1bcfe5457 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h @@ -132,39 +132,30 @@ namespace TAO const char * role, const char * type_id, const PortableGroup::FactoryInfo & factory_info - ) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::MemberAlreadyPresent - , PortableGroup::TypeConflict)); + ); virtual void unregister_factory ( const char * role, const PortableGroup::Location & location - ) - ACE_THROW_SPEC ((CORBA::SystemException, PortableGroup::MemberNotFound)); + ); virtual void unregister_factory_by_role ( const char * role - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void unregister_factory_by_location ( const PortableGroup::Location & location - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual ::PortableGroup::FactoryInfos * list_factories_by_role ( const char * role, CORBA::String_out type_id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual ::PortableGroup::FactoryInfos * list_factories_by_location ( const PortableGroup::Location & location - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); ///////////////////////// // Implementation methods diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp index 74bdc8574dd..0b3fc40b9db 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp @@ -58,12 +58,6 @@ TAO_PG_GenericFactory::create_object ( const char * type_id, const PortableGroup::Criteria & the_criteria, PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::InvalidProperty, - PortableGroup::CannotMeetCriteria)) { PortableGroup::Properties_var properties = this->property_manager_.get_type_properties (type_id); @@ -190,8 +184,6 @@ void TAO_PG_GenericFactory::delete_object ( const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectNotFound)) { CORBA::ULong fcid = 0; @@ -654,13 +646,6 @@ TAO_PG_GenericFactory::create_member ( const PortableGroup::FactoryInfo & factory_info, const char * type_id, const CORBA::Boolean propagate_member_already_present) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::InvalidProperty, - PortableGroup::CannotMeetCriteria, - PortableGroup::MemberAlreadyPresent)) { PortableGroup::GenericFactory::FactoryCreationId_var fcid; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h index 9d01a0cfc25..b5e0df56cb8 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h @@ -74,13 +74,7 @@ public: const char * type_id, const PortableGroup::Criteria & the_criteria, PortableGroup::GenericFactory::FactoryCreationId_out - factory_creation_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::InvalidProperty, - PortableGroup::CannotMeetCriteria)); + factory_creation_id); /** * Delete the object corresponding to the provided @@ -90,9 +84,7 @@ public: */ virtual void delete_object ( const PortableGroup::GenericFactory::FactoryCreationId & - factory_creation_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectNotFound)); + factory_creation_id); //@} @@ -142,14 +134,7 @@ public: PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::FactoryInfo & factory_info, const char * type_id, - const CORBA::Boolean propagate_member_already_present) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::InvalidProperty, - PortableGroup::CannotMeetCriteria, - PortableGroup::MemberAlreadyPresent)); + const CORBA::Boolean propagate_member_already_present); private: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp index 0d02a65db04..dbcc166adf9 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp @@ -72,12 +72,6 @@ TAO::PG_Object_Group * TAO::PG_Group_Factory::create_group ( const char * type_id, const PortableGroup::Criteria & the_criteria, TAO::PG_Property_Set * typeid_properties) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::InvalidProperty, - PortableGroup::CannotMeetCriteria)) { /////////////////////////////////// // Create an empty group reference @@ -123,8 +117,6 @@ TAO::PG_Object_Group * TAO::PG_Group_Factory::create_group ( } void TAO::PG_Group_Factory::delete_group (PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectNotFound)) { if (! destroy_group (object_group)) { @@ -134,8 +126,6 @@ void TAO::PG_Group_Factory::delete_group (PortableGroup::ObjectGroup_ptr object_ void TAO::PG_Group_Factory::delete_group (PortableGroup::ObjectGroupId group_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectNotFound)) { if (! destroy_group (group_id)) { @@ -193,7 +183,6 @@ int TAO::PG_Group_Factory::destroy_group (PortableGroup::ObjectGroup_ptr object_ PortableGroup::ObjectGroups * TAO::PG_Group_Factory::groups_at_location ( const PortableGroup::Location & the_location) - ACE_THROW_SPEC ( (CORBA::SystemException)) { size_t upper_limit = this->group_map_.current_size (); PortableGroup::ObjectGroups * result = 0; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h index a42ba34d67a..950513257e7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h @@ -86,28 +86,17 @@ namespace TAO TAO::PG_Object_Group * create_group ( const char * type_id, const PortableGroup::Criteria & the_criteria, - TAO::PG_Property_Set * typeid_properties) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::InvalidProperty, - PortableGroup::CannotMeetCriteria)); + TAO::PG_Property_Set * typeid_properties); - void delete_group (PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectNotFound)); + void delete_group (PortableGroup::ObjectGroup_ptr object_group); - void delete_group (PortableGroup::ObjectGroupId group_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectNotFound)); + void delete_group (PortableGroup::ObjectGroupId group_id); PortableGroup::ObjectGroups * groups_at_location ( - const PortableGroup::Location & the_location) - ACE_THROW_SPEC ( (CORBA::SystemException)); + const PortableGroup::Location & the_location); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp index 4fd9fac28f1..ea6a1a9b6ab 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp @@ -10,18 +10,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO_PG_Null_Property_Validator::validate_property ( const PortableGroup::Properties &) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { } void TAO_PG_Null_Property_Validator::validate_criteria ( const PortableGroup::Properties &) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidCriteria, - PortableGroup::CannotMeetCriteria)) { } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h index b9f6dc18f15..c9922b98409 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h @@ -41,20 +41,14 @@ public: * This particular implementation performs no validation * whatsoever. */ - void validate_property (const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + void validate_property (const PortableGroup::Properties & props); /// Validate the given criteria. /** * This particular implementation performs no validation * whatsoever. */ - void validate_criteria (const PortableGroup::Properties & criteria) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidCriteria, - PortableGroup::CannotMeetCriteria)); + void validate_criteria (const PortableGroup::Properties & criteria); }; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp index a102044e10c..e0b7e54be74 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp @@ -52,13 +52,6 @@ TAO_PG_ObjectGroupManager::create_member ( const PortableGroup::Location & /* the_location */, const char * /* type_id */, const PortableGroup::Criteria & /* the_criteria */) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberAlreadyPresent, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::CannotMeetCriteria)) { throw CORBA::NO_IMPLEMENT (); } @@ -68,10 +61,6 @@ TAO_PG_ObjectGroupManager::add_member ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location, CORBA::Object_ptr member) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberAlreadyPresent, - PortableGroup::ObjectNotAdded)) { if (CORBA::is_nil (member)) throw CORBA::BAD_PARAM (); @@ -100,9 +89,6 @@ TAO_PG_ObjectGroupManager::_tao_add_member ( CORBA::Object_ptr member, const char * type_id, const CORBA::Boolean propagate_member_already_present) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::MemberAlreadyPresent, - PortableGroup::NoFactory)) { if (CORBA::is_nil (member)) throw CORBA::BAD_PARAM (); @@ -149,10 +135,6 @@ TAO_PG_ObjectGroupManager::add_member_i ( const PortableGroup::Location & the_location, CORBA::Object_ptr member, const CORBA::Boolean check_type_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberAlreadyPresent, - PortableGroup::ObjectNotAdded)) { TAO_PG_ObjectGroup_Map_Entry * group_entry = this->get_group_entry (object_group); @@ -221,9 +203,6 @@ PortableGroup::ObjectGroup_ptr TAO_PG_ObjectGroupManager::remove_member ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0); @@ -296,8 +275,6 @@ TAO_PG_ObjectGroupManager::remove_member ( PortableGroup::Locations * TAO_PG_ObjectGroupManager::locations_of_members ( PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0); @@ -333,7 +310,6 @@ TAO_PG_ObjectGroupManager::locations_of_members ( PortableGroup::ObjectGroups * TAO_PG_ObjectGroupManager::groups_at_location ( const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableGroup::ObjectGroups * ogs; ACE_NEW_THROW_EX (ogs, @@ -365,8 +341,6 @@ TAO_PG_ObjectGroupManager::groups_at_location ( PortableGroup::ObjectGroupId TAO_PG_ObjectGroupManager::get_object_group_id ( PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -387,8 +361,6 @@ TAO_PG_ObjectGroupManager::get_object_group_id ( PortableGroup::ObjectGroup_ptr TAO_PG_ObjectGroupManager::get_object_group_ref ( PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)) { TAO_PG_ObjectGroup_Map_Entry * entry = 0; @@ -413,9 +385,6 @@ CORBA::Object_ptr TAO_PG_ObjectGroupManager::get_member_ref ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & loc) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -457,10 +426,6 @@ PortableGroup::ObjectGroup_ptr TAO_PG_ObjectGroupManager::get_object_group_ref_from_id ( PortableGroup::ObjectGroupId group_id ) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::ObjectGroupNotFound - )) { //@@ If we change the PG's concept of ObjectGroupId from // PortableServer::ObjectId to PortableGroup::ObjectGroupId, can @@ -592,8 +557,6 @@ TAO_PG_ObjectGroupManager::object_group (const PortableServer::ObjectId & oid) CORBA::ULong TAO_PG_ObjectGroupManager::member_count ( PortableGroup::ObjectGroup_ptr group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)) { // ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, // guard, @@ -616,8 +579,6 @@ TAO_PG_ObjectGroupManager::poa (PortableServer::POA_ptr p) PortableGroup::Properties * TAO_PG_ObjectGroupManager::get_properties ( PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)) { PortableGroup::Properties * properties = 0; ACE_NEW_THROW_EX (properties, @@ -648,8 +609,6 @@ TAO_PG_ObjectGroupManager::get_properties ( TAO_PG_ObjectGroup_Map_Entry * TAO_PG_ObjectGroupManager::get_group_entry ( CORBA::Object_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)) { if (CORBA::is_nil (this->poa_.in ())) throw CORBA::INTERNAL (); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h index 2b0505f50cc..582fa5cc5d5 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h @@ -68,24 +68,13 @@ public: PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location, const char * type_id, - const PortableGroup::Criteria & the_criteria) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberAlreadyPresent, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::CannotMeetCriteria)); + const PortableGroup::Criteria & the_criteria); /// Add an existing object to the ObjectGroup. virtual PortableGroup::ObjectGroup_ptr add_member ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location, - CORBA::Object_ptr member) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberAlreadyPresent, - PortableGroup::ObjectNotAdded)); + CORBA::Object_ptr member); /** * Remove an object at a specific location from the given @@ -96,54 +85,37 @@ public: */ virtual PortableGroup::ObjectGroup_ptr remove_member ( PortableGroup::ObjectGroup_ptr object_group, - const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)); + const PortableGroup::Location & the_location); /// Return the locations of the members in the given ObjectGroup. virtual PortableGroup::Locations * locations_of_members ( - PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)); + PortableGroup::ObjectGroup_ptr object_group); /// Return the locations of the members in the given ObjectGroup. virtual PortableGroup::ObjectGroups * groups_at_location ( - const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException)); + const PortableGroup::Location & the_location); /// Return the ObjectGroupId for the given ObjectGroup. /// @note Does this method make sense for load balanced objects? virtual PortableGroup::ObjectGroupId get_object_group_id ( - PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)); + PortableGroup::ObjectGroup_ptr object_group); /// @note Does this method make sense for load balanced objects? virtual PortableGroup::ObjectGroup_ptr get_object_group_ref ( - PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)); + PortableGroup::ObjectGroup_ptr object_group); /// Return the reference corresponding to the member of a given /// ObjectGroup at the given location. virtual CORBA::Object_ptr get_member_ref ( PortableGroup::ObjectGroup_ptr object_group, - const PortableGroup::Location & loc) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)); + const PortableGroup::Location & loc); /** * TAO-specific extension. * Return the ObjectGroup reference for the given ObjectGroupId. */ virtual PortableGroup::ObjectGroup_ptr get_object_group_ref_from_id ( PortableGroup::ObjectGroupId group_id - ) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::ObjectGroupNotFound - )); + ); //@} @@ -159,10 +131,7 @@ public: const PortableGroup::Location & the_location, CORBA::Object_ptr member, const char * type_id, - const CORBA::Boolean propagate_member_already_present) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::MemberAlreadyPresent, - PortableGroup::NoFactory)); + const CORBA::Boolean propagate_member_already_present); /// Create object group hash map entry that represents an actual /// ObjectGroup. @@ -186,9 +155,7 @@ public: /// Return the properties set when the object group was created, and /// the dynamic properties that may have overridden them. PortableGroup::Properties * get_properties ( - PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)); + PortableGroup::ObjectGroup_ptr object_group); /// Return the type_id for the given object group. char * type_id (PortableGroup::ObjectGroup_ptr object_group); @@ -202,9 +169,7 @@ public: const PortableServer::ObjectId & oid); /// Return the number of members in the given object group. - CORBA::ULong member_count (PortableGroup::ObjectGroup_ptr group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)); + CORBA::ULong member_count (PortableGroup::ObjectGroup_ptr group); /// Set the POA to use when converting object group references to /// ObjectIds. @@ -228,18 +193,12 @@ protected: PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location, CORBA::Object_ptr member, - const CORBA::Boolean check_type_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberAlreadyPresent, - PortableGroup::ObjectNotAdded)); + const CORBA::Boolean check_type_id); /// Obtain the ObjectGroup hash map entry corresponding to the given /// ObjectGroup reference. TAO_PG_ObjectGroup_Map_Entry * get_group_entry ( - PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)); + PortableGroup::ObjectGroup_ptr object_group); /// Check if a member resides at the location to which the group diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp index 15ca6723cba..fce1e92db8e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp @@ -193,8 +193,6 @@ TAO::PG_Object_Group::add_member_to_iogr (CORBA::Object_ptr member) void TAO::PG_Object_Group::add_member (const PortableGroup::Location & the_location, CORBA::Object_ptr member) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectNotAdded)) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_); @@ -250,8 +248,6 @@ int TAO::PG_Object_Group::set_primary_member ( TAO_IOP::TAO_IOR_Property * prop, const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::MemberNotFound)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -325,8 +321,6 @@ TAO::PG_Object_Group::set_primary_member ( void TAO::PG_Object_Group::remove_member ( const PortableGroup::Location & the_location) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::MemberNotFound)) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_); MemberInfo * info = 0; @@ -383,9 +377,6 @@ TAO::PG_Object_Group::get_object_group_id (void) const void TAO::PG_Object_Group::set_properties_dynamically ( const PortableGroup::Properties & overrides) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_); @@ -397,7 +388,6 @@ TAO::PG_Object_Group::set_properties_dynamically ( void TAO::PG_Object_Group::get_properties ( PortableGroup::Properties_var & result) const - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_); this->properties_.export_properties(*result); @@ -506,7 +496,6 @@ TAO::PG_Object_Group::distribute_iogr (void) PortableGroup::Locations * TAO::PG_Object_Group::locations_of_members (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -539,9 +528,6 @@ TAO::PG_Object_Group::locations_of_members (void) CORBA::Object_ptr TAO::PG_Object_Group::get_member_reference ( const PortableGroup::Location & the_location) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::MemberNotFound)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -608,12 +594,6 @@ TAO::PG_Object_Group::create_member ( const PortableGroup::Location & the_location, const char * type_id, const PortableGroup::Criteria & the_criteria) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::MemberAlreadyPresent, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::CannotMeetCriteria)) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_); @@ -698,8 +678,6 @@ TAO::PG_Object_Group::create_member ( void TAO::PG_Object_Group::create_members (size_t count) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::NoFactory)) { // assume internals is locked // @@ what if factories were passed as criteria? diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h index 18c687e2012..f5b5328b68e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h @@ -176,16 +176,12 @@ namespace TAO * @@TODO DOC */ void set_properties_dynamically ( - const PortableGroup::Properties & overrides) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + const PortableGroup::Properties & overrides); /** * @@TODO DOC */ - void get_properties (PortableGroup::Properties_var & result) const - ACE_THROW_SPEC ((CORBA::SystemException)); + void get_properties (PortableGroup::Properties_var & result) const; /** * @@TODO DOC @@ -199,9 +195,7 @@ namespace TAO */ void add_member ( const PortableGroup::Location & the_location, - CORBA::Object_ptr member) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::ObjectNotAdded)); + CORBA::Object_ptr member); /** * set the replica at the given location to be primary. @@ -212,19 +206,13 @@ namespace TAO */ int set_primary_member ( TAO_IOP::TAO_IOR_Property * prop, - const PortableGroup::Location & the_location) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::MemberNotFound - )); + const PortableGroup::Location & the_location); /** * @@TODO DOC */ void remove_member ( - const PortableGroup::Location & the_location) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::MemberNotFound)); + const PortableGroup::Location & the_location); /** @@ -233,28 +221,18 @@ namespace TAO void create_member ( const PortableGroup::Location & the_location, const char * type_id, - const PortableGroup::Criteria & the_criteria) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::MemberAlreadyPresent, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::CannotMeetCriteria)); + const PortableGroup::Criteria & the_criteria); /** * @@TODO DOC */ - PortableGroup::Locations * locations_of_members (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableGroup::Locations * locations_of_members (void); /** * @@TODO DOC */ CORBA::Object_ptr get_member_reference ( - const PortableGroup::Location & the_location) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::MemberNotFound)); + const PortableGroup::Location & the_location); /** @@ -284,11 +262,7 @@ namespace TAO PortableGroup::ObjectGroup_ptr add_member_to_iogr(CORBA::Object_ptr member); - void create_members (size_t count) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::NoFactory - )); + void create_members (size_t count); ///////////////////////// diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp index 71c22906cae..9b6996230c1 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp @@ -27,23 +27,17 @@ TAO::PG_Properties_Support::~PG_Properties_Support () void TAO::PG_Properties_Support::set_default_property (const char * name, const PortableGroup::Value & value) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->default_properties_.set_property(name, value); } void TAO::PG_Properties_Support::set_default_properties (const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->default_properties_.decode (props); } PortableGroup::Properties * TAO::PG_Properties_Support::get_default_properties () - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { PortableGroup::Properties_var result; ACE_NEW_THROW_EX ( result, PortableGroup::Properties(), CORBA::NO_MEMORY()); @@ -53,7 +47,6 @@ TAO::PG_Properties_Support::get_default_properties () void TAO::PG_Properties_Support::remove_default_properties ( const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->default_properties_.remove (props); } @@ -62,9 +55,6 @@ void TAO::PG_Properties_Support::set_type_properties ( const char *type_id, const PortableGroup::Properties & overrides) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_); @@ -84,7 +74,6 @@ TAO::PG_Properties_Support::set_type_properties ( PortableGroup::Properties * TAO::PG_Properties_Support::get_type_properties ( const char *type_id) - ACE_THROW_SPEC ( (CORBA::SystemException)) { PortableGroup::Properties_var result; ACE_NEW_THROW_EX (result, PortableGroup::Properties(), CORBA::NO_MEMORY ()); @@ -103,7 +92,6 @@ void TAO::PG_Properties_Support::remove_type_properties ( const char *type_id, const PortableGroup::Properties & props) - ACE_THROW_SPEC ( (CORBA::SystemException)) { // NOTE: do not actually delete the properties for this type. // There may be object groups depending on these. @@ -123,7 +111,6 @@ TAO::PG_Properties_Support::remove_type_properties ( TAO::PG_Property_Set * TAO::PG_Properties_Support::find_typeid_properties ( const char *type_id) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->internals_, 0); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h index f3e6729c6f8..7af594f10f0 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h @@ -73,8 +73,7 @@ namespace TAO * @value an Any containing the value. */ void set_default_property (const char * name, - const PortableGroup::Value & value) - ACE_THROW_SPEC ((CORBA::SystemException)); + const PortableGroup::Value & value); /** * Update the default property set. @@ -84,8 +83,7 @@ namespace TAO * * @param props the set of properties to update the defaults. */ - void set_default_properties (const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException)); + void set_default_properties (const PortableGroup::Properties & props); /** * Export the default properties in PortableGroup::Properties format. @@ -96,10 +94,7 @@ namespace TAO * resource leaks. * @returns a newly allocated PortableGroup::Properties. */ - PortableGroup::Properties * get_default_properties (void) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + PortableGroup::Properties * get_default_properties (void); /** * Undefine default properties that appear in props. @@ -111,8 +106,7 @@ namespace TAO * @param props a set of propertys to be removed by name. */ void remove_default_properties ( - const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException)); + const PortableGroup::Properties & props); /** * Override or define properties associated with a type_id. @@ -128,11 +122,7 @@ namespace TAO */ void set_type_properties ( const char *type_id, - const PortableGroup::Properties & overrides) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + const PortableGroup::Properties & overrides); /** * Export the property set in a PortableGroup::Properties format. @@ -152,8 +142,7 @@ namespace TAO * @returns a newly allocated PortableGroup::Properties that must be released by the caller. */ PortableGroup::Properties * get_type_properties ( - const char *type_id) - ACE_THROW_SPEC ( (CORBA::SystemException)); + const char *type_id); /** * Export the property set in a PortableGroup::Properties format. @@ -169,8 +158,7 @@ namespace TAO * @returns a pointer to a Property_Set owned by this Properties_Support object. */ TAO::PG_Property_Set * find_typeid_properties ( - const char *type_id) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *type_id); /** * Undefine default properties that appear in props. @@ -183,8 +171,7 @@ namespace TAO */ void remove_type_properties ( const char *type_id, - const PortableGroup::Properties & props) - ACE_THROW_SPEC ( (CORBA::SystemException)); + const PortableGroup::Properties & props); /////////////// // Data Members diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp index 0ced0341ca0..bda9edab8c9 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp @@ -28,9 +28,6 @@ TAO_PG_PropertyManager::TAO_PG_PropertyManager ( void TAO_PG_PropertyManager::set_default_properties ( const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { // First verify that the "Factories" property is not in the // Properties sequence. According to the spec, it is not allowed to @@ -58,7 +55,6 @@ TAO_PG_PropertyManager::set_default_properties ( PortableGroup::Properties * TAO_PG_PropertyManager::get_default_properties () - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0); @@ -78,9 +74,6 @@ TAO_PG_PropertyManager::get_default_properties () void TAO_PG_PropertyManager::remove_default_properties ( const PortableGroup::Properties &props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { if (props.length () == 0) return; // @@ Throw CORBA::BAD_PARAM instead? @@ -96,9 +89,6 @@ void TAO_PG_PropertyManager::set_type_properties ( const char * type_id, const PortableGroup::Properties & overrides) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { this->property_validator_.validate_property (overrides); @@ -121,7 +111,6 @@ TAO_PG_PropertyManager::set_type_properties ( PortableGroup::Properties * TAO_PG_PropertyManager::get_type_properties ( const char * type_id) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0); @@ -168,9 +157,6 @@ void TAO_PG_PropertyManager::remove_type_properties ( const char * type_id, const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { if (props.length () == 0) return; // @@ Throw CORBA::BAD_PARAM instead? @@ -192,10 +178,6 @@ void TAO_PG_PropertyManager::set_properties_dynamically ( PortableGroup::ObjectGroup_ptr /* object_group */, const PortableGroup::Properties & /* overrides */) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { #if 0 // First verify that the "InitialNumberMembers" property is not in @@ -227,8 +209,6 @@ TAO_PG_PropertyManager::set_properties_dynamically ( PortableGroup::Properties * TAO_PG_PropertyManager::get_properties ( PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)) { CORBA::ULong properties_len = 0; @@ -296,9 +276,6 @@ void TAO_PG_PropertyManager::remove_properties ( const PortableGroup::Properties & to_be_removed, PortableGroup::Properties &properties) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { const CORBA::ULong num_removed = to_be_removed.length (); if (num_removed == 0) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h index 21b5837e4c7..33162cb722b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h @@ -65,30 +65,20 @@ public: /// Set the default properties to be used by all object groups. virtual void set_default_properties ( - const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + const PortableGroup::Properties & props); /// Get the default properties used by all object groups. - virtual PortableGroup::Properties * get_default_properties () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual PortableGroup::Properties * get_default_properties (); /// Remove default properties. virtual void remove_default_properties ( - const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + const PortableGroup::Properties & props); /// Set properties associated with a given Member type. These /// properties override the default properties. virtual void set_type_properties ( const char * type_id, - const PortableGroup::Properties & overrides) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + const PortableGroup::Properties & overrides); /** * Return the properties associated with a give Replica type. These @@ -96,16 +86,12 @@ public: * addition to the default properties that were not overridden. */ virtual PortableGroup::Properties * get_type_properties ( - const char * type_id) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char * type_id); /// Remove the given properties associated with the Replica type ID. virtual void remove_type_properties ( const char * type_id, - const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + const PortableGroup::Properties & props); /** * Dynamically set the properties associated with a given object @@ -115,11 +101,7 @@ public: */ virtual void set_properties_dynamically ( PortableGroup::ObjectGroup_ptr object_group, - const PortableGroup::Properties & overrides) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + const PortableGroup::Properties & overrides); /** * Return the properties currently in use by the given object @@ -129,9 +111,7 @@ public: * that weren't overridden. */ virtual PortableGroup::Properties * get_properties ( - PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)); + PortableGroup::ObjectGroup_ptr object_group); //@} @@ -148,10 +128,7 @@ private: /// Remove properties "to_be_removed" from the given list of /// properties. void remove_properties (const PortableGroup::Properties & to_be_removed, - PortableGroup::Properties &properties) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + PortableGroup::Properties &properties); private: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp index 90d594d80d5..07739231579 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp @@ -28,7 +28,6 @@ TAO::PG_Property_Set::PG_Property_Set() TAO::PG_Property_Set::PG_Property_Set ( const PortableGroup::Properties & property_set) - ACE_THROW_SPEC ((CORBA::SystemException)) : defaults_ (0) { this->decode (property_set); @@ -37,7 +36,6 @@ TAO::PG_Property_Set::PG_Property_Set ( TAO::PG_Property_Set::PG_Property_Set ( const PortableGroup::Properties & property_set, PG_Property_Set * defaults) - ACE_THROW_SPEC ((CORBA::SystemException)) : defaults_ (defaults) { this->decode (property_set); @@ -57,7 +55,6 @@ TAO::PG_Property_Set::~PG_Property_Set () void TAO::PG_Property_Set::decode (const PortableGroup::Properties & property_set) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_); @@ -117,7 +114,6 @@ void TAO::PG_Property_Set::clear () } void TAO::PG_Property_Set::remove (const PortableGroup::Properties & property_set) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_); size_t count = property_set.length (); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h index 50a5515baac..18d91812c72 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h @@ -70,8 +70,7 @@ namespace TAO * constructor * @param property_set the properties to be decoded */ - PG_Property_Set (const PortableGroup::Properties & property_set) - ACE_THROW_SPEC ((CORBA::SystemException)); + PG_Property_Set (const PortableGroup::Properties & property_set); /** * constructor with defaults @@ -79,8 +78,7 @@ namespace TAO * @param defaults a propert set decoder that supplies default values. */ PG_Property_Set (const PortableGroup::Properties & property_set, - PG_Property_Set * defaults) - ACE_THROW_SPEC ((CORBA::SystemException)); + PG_Property_Set * defaults); /** * constructor with defaults, but no properties (yet) @@ -110,8 +108,7 @@ namespace TAO * Duplicate values replace previous values. * @param property_set the properties to be decoded */ - void decode (const PortableGroup::Properties & property_set) - ACE_THROW_SPEC ((CORBA::SystemException)); + void decode (const PortableGroup::Properties & property_set); /** * Clear properties @@ -119,8 +116,7 @@ namespace TAO */ void clear (); - void remove (const PortableGroup::Properties & property_set) - ACE_THROW_SPEC ((CORBA::SystemException)); + void remove (const PortableGroup::Properties & property_set); /** * set or replace a single property diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp index ce55617b726..e14b009500d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp @@ -9,6 +9,7 @@ #include "tao/Endpoint.h" #include "tao/Thread_Lane_Resources.h" #include "tao/Leader_Follower.h" +#include "tao/SystemException.h" ACE_RCSID (PortableGroup, PortableGroup_Acceptor_Registry, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp index 9ac5f584dd0..5fea4c9686a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp @@ -21,7 +21,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO_PortableGroup_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Narrow to a TAO_ORBInitInfo object to get access to the // orb_core() TAO extension. @@ -59,7 +58,6 @@ TAO_PortableGroup_ORBInitializer::pre_init ( void TAO_PortableGroup_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h index 0729f32766c..78d9db559d8 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h @@ -40,11 +40,9 @@ class TAO_PortableGroup_Export TAO_PortableGroup_ORBInitializer : public virtual TAO_Local_RefCounted_Object { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp index 82f5174c71d..d939ca0a3ae 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp @@ -5,7 +5,6 @@ #include "tao/debug.h" #include "tao/ORB_Core.h" -#include "tao/Environment.h" #include "tao/Base_Transport_Property.h" #include "tao/Protocols_Hooks.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp index 31ce6b54f00..7010f88ca0b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp @@ -3,7 +3,6 @@ #include "orbsvcs/PortableGroup/UIPMC_Profile.h" #include "orbsvcs/PortableGroup/miopconf.h" #include "tao/CDR.h" -#include "tao/Environment.h" #include "tao/ORB.h" #include "tao/ORB_Core.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index 6b37fcf84d0..4219424da84 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -103,7 +103,6 @@ TAO_PropertySetFactory::~TAO_PropertySetFactory (void) CosPropertyService::PropertySet_ptr TAO_PropertySetFactory::create_propertyset (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // New a TAO_PropertySet. TAO_PropertySet *new_set; @@ -122,8 +121,6 @@ TAO_PropertySetFactory::create_propertyset (void) CosPropertyService::PropertySet_ptr TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types, const CosPropertyService::Properties &allowed_properties) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::ConstraintNotSupported)) { TAO_PropertySet *new_set = 0; CosPropertyService::PropertySet_ptr propset_ptr = 0; @@ -168,8 +165,6 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService CosPropertyService::PropertySet_ptr TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Properties &initial_properties) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::MultipleExceptions)) { TAO_PropertySet *new_set = 0; CosPropertyService::PropertySet_ptr propset_ptr = 0; @@ -232,7 +227,6 @@ TAO_PropertySetDefFactory::TAO_PropertySetDefFactory (void) CosPropertyService::PropertySetDef_ptr TAO_PropertySetDefFactory::create_propertysetdef (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // New a TAO_PropertySetDef. TAO_PropertySetDef *new_set; @@ -252,8 +246,6 @@ TAO_PropertySetDefFactory::create_propertysetdef (void) CosPropertyService::PropertySetDef_ptr TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyService::PropertyTypes &allowed_property_types, const CosPropertyService::PropertyDefs &allowed_property_defs) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::ConstraintNotSupported)) { TAO_PropertySetDef *new_set = 0; CosPropertyService::PropertySetDef_ptr propsetdef_ptr = 0; @@ -298,8 +290,6 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS CosPropertyService::PropertySetDef_ptr TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::MultipleExceptions)) { TAO_PropertySetDef *new_set = 0; CosPropertyService::PropertySetDef_ptr propsetdef_ptr = 0; @@ -425,12 +415,6 @@ TAO_PropertySet::~TAO_PropertySet (void) void TAO_PropertySet::define_property (const char *property_name, const CORBA::Any &property_value) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::InvalidPropertyName, - CosPropertyService::ConflictingProperty, - CosPropertyService::UnsupportedTypeCode, - CosPropertyService::UnsupportedProperty, - CosPropertyService::ReadOnlyProperty)) { // Check the name's validity. if (property_name == 0) @@ -570,8 +554,6 @@ TAO_PropertySet::is_property_allowed (const char* property_name) void TAO_PropertySet::define_properties (const CosPropertyService::Properties &nproperties) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::MultipleExceptions)) { // Get the length. CORBA::ULong sequence_length = nproperties.length (); @@ -649,7 +631,6 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope CORBA::ULong TAO_PropertySet::get_number_of_properties (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return static_cast<CORBA::ULong> (this->hash_table_.current_size ()); } @@ -664,7 +645,6 @@ void TAO_PropertySet::get_all_property_names (CORBA::ULong how_many, CosPropertyService::PropertyNames_out property_names, CosPropertyService::PropertyNamesIterator_out rest) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocating storage is a must. ACE_NEW (property_names, @@ -745,9 +725,6 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many, CORBA::Any * TAO_PropertySet::get_property_value (const char *property_name) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::PropertyNotFound, - CosPropertyService::InvalidPropertyName)) { // Check the name's validity. if (property_name == 0) @@ -779,7 +756,6 @@ TAO_PropertySet::get_property_value (const char *property_name) CORBA::Boolean TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &property_names, CosPropertyService::Properties_out nproperties) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocate memory for the out parameter. ACE_NEW_RETURN (nproperties, @@ -833,7 +809,6 @@ void TAO_PropertySet::get_all_properties (CORBA::ULong how_many, CosPropertyService::Properties_out nproperties, CosPropertyService::PropertiesIterator_out rest) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocate memory for the out parameter. ACE_NEW (nproperties, @@ -924,10 +899,6 @@ TAO_PropertySet::get_all_properties (CORBA::ULong how_many, void TAO_PropertySet::delete_property (const char *property_name) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::PropertyNotFound, - CosPropertyService::InvalidPropertyName, - CosPropertyService::FixedProperty)) { // Check the name's validity. if (property_name == 0) @@ -963,8 +934,6 @@ TAO_PropertySet::delete_property (const char *property_name) void TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &property_names) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::MultipleExceptions)) { // Get the length. CORBA::ULong sequence_length = property_names.length (); @@ -1029,7 +998,6 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro CORBA::Boolean TAO_PropertySet::delete_all_properties (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Get all the property names in a names' sequence. CosPropertyService::PropertyNames *names_ptr = 0; @@ -1062,8 +1030,6 @@ TAO_PropertySet::delete_all_properties (void) CORBA::Boolean TAO_PropertySet::is_property_defined (const char *property_name) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::InvalidPropertyName)) { CosProperty_Hash_Key hash_key (property_name); @@ -1130,7 +1096,6 @@ TAO_PropertySetDef::~TAO_PropertySetDef (void) // Return the sequence that is there in side. void TAO_PropertySetDef::get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Copy contents of the sequence. ACE_NEW (property_types, @@ -1139,7 +1104,6 @@ TAO_PropertySetDef::get_allowed_property_types (CosPropertyService::PropertyType void TAO_PropertySetDef::get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs) - ACE_THROW_SPEC ((CORBA::SystemException)) { // We have all the names, get the values and the modes from the Hash // Table and return. @@ -1162,13 +1126,6 @@ void TAO_PropertySetDef::define_property_with_mode (const char *property_name, const CORBA::Any &property_value, CosPropertyService::PropertyModeType property_mode) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::InvalidPropertyName, - CosPropertyService::ConflictingProperty, - CosPropertyService::UnsupportedTypeCode, - CosPropertyService::UnsupportedProperty, - CosPropertyService::UnsupportedMode, - CosPropertyService::ReadOnlyProperty)) { // Check the names validity. if (property_name == 0) @@ -1243,8 +1200,6 @@ TAO_PropertySetDef::define_property_with_mode (const char *property_name, // MultipleExceptions sequence and raise that. void TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::MultipleExceptions)) { // Get the length. CORBA::ULong sequence_length = property_defs.length (); @@ -1331,9 +1286,6 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop // PropertyNotFound exceptions. CosPropertyService::PropertyModeType TAO_PropertySetDef::get_property_mode (const char *property_name) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::PropertyNotFound, - CosPropertyService::InvalidPropertyName)) { // Check for the name's validity. if (property_name == 0) @@ -1366,7 +1318,6 @@ TAO_PropertySetDef::get_property_mode (const char *property_name) CORBA::Boolean TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames &property_names, CosPropertyService::PropertyModes_out property_modes) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocate memory for the out parameter. ACE_NEW_RETURN (property_modes, @@ -1421,10 +1372,6 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames void TAO_PropertySetDef::set_property_mode (const char *property_name, CosPropertyService::PropertyModeType property_mode) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::InvalidPropertyName, - CosPropertyService::PropertyNotFound, - CosPropertyService::UnsupportedMode)) { // Check the names validity. if (property_name == 0) @@ -1514,8 +1461,6 @@ TAO_PropertySetDef::set_property_mode (const char *property_name, void TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes &property_modes) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::MultipleExceptions)) { // Get the length of the sequence. CORBA::ULong sequence_length = property_modes.length (); @@ -1592,7 +1537,6 @@ TAO_PropertyNamesIterator::~TAO_PropertyNamesIterator (void) void TAO_PropertyNamesIterator::reset (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->iterator_ = this->iterator_.map ().begin (); } @@ -1604,7 +1548,6 @@ TAO_PropertyNamesIterator::reset (void) CORBA::Boolean TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name) - ACE_THROW_SPEC ((CORBA::SystemException)) { COSPROPERTY_HASH_ENTRY *entry_ptr; @@ -1622,7 +1565,6 @@ TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name) CORBA::Boolean TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many, CosPropertyService::PropertyNames_out property_names) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocate memory for the out parameter. ACE_NEW_RETURN (property_names, @@ -1655,7 +1597,6 @@ TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many, void TAO_PropertyNamesIterator::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Remove self from POA. Because of reference counting, the POA // will automatically delete the servant when all pending requests @@ -1681,14 +1622,12 @@ TAO_PropertiesIterator::~TAO_PropertiesIterator (void) void TAO_PropertiesIterator::reset (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->iterator_ = this->iterator_.map ().begin (); } CORBA::Boolean TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty) - ACE_THROW_SPEC ((CORBA::SystemException)) { COSPROPERTY_HASH_ENTRY *entry_ptr; @@ -1710,7 +1649,6 @@ TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty) CORBA::Boolean TAO_PropertiesIterator::next_n (CORBA::ULong how_many, CosPropertyService::Properties_out nproperties) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocate memory for the out parameter. ACE_NEW_RETURN (nproperties, @@ -1751,7 +1689,6 @@ TAO_PropertiesIterator::next_n (CORBA::ULong how_many, void TAO_PropertiesIterator::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Remove self from POA. Because of reference counting, the POA // will automatically delete the servant when all pending requests diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h index 92f370c9cf8..199152b5970 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h @@ -127,23 +127,18 @@ public: // Destructor. virtual CosPropertyService::PropertySet_ptr - create_propertyset (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + create_propertyset (void); // Returns a new TAO_PropertySet object. "The property set returned // will *not* have any initial properties." virtual CosPropertyService::PropertySet_ptr create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types, - const CosPropertyService::Properties &allowed_properties) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::ConstraintNotSupported)); + const CosPropertyService::Properties &allowed_properties); // Allows a client to create a new TAO_PropertySet with specific // constraints. "All the properties will have *fixed-normal* modes". virtual CosPropertyService::PropertySet_ptr - create_initial_propertyset (const CosPropertyService::Properties &initial_properties) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::MultipleExceptions)); + create_initial_propertyset (const CosPropertyService::Properties &initial_properties); // Allows a client to create a new TAO_PropertySet with specific // initial properties."All the properties will have *fixed-normal" // modes". @@ -178,22 +173,17 @@ public: // Destructor. virtual CosPropertyService::PropertySetDef_ptr - create_propertysetdef (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + create_propertysetdef (void); // Returns a new TAO_PropertySetDef object. virtual CosPropertyService::PropertySetDef_ptr create_constrained_propertysetdef (const CosPropertyService::PropertyTypes &allowed_property_types, - const CosPropertyService::PropertyDefs &allowed_property_defs) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::ConstraintNotSupported)); + const CosPropertyService::PropertyDefs &allowed_property_defs); // Allows a client to create a new TAO_PropertySetDef with specific // constraints. virtual CosPropertyService::PropertySetDef_ptr - create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::MultipleExceptions)); + create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs); // Allows a client to create a new TAO_PropertySetDef with specific // initial properties. @@ -237,72 +227,48 @@ public: // Destructor function. virtual void define_property (const char *property_name, - const CORBA::Any &property_value) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::InvalidPropertyName, - CosPropertyService::ConflictingProperty, - CosPropertyService::UnsupportedTypeCode, - CosPropertyService::UnsupportedProperty, - CosPropertyService::ReadOnlyProperty)); + const CORBA::Any &property_value); // Store the property in the hash after checking for validity of the // property name, duplicate name, type code over writing etc. - virtual void define_properties (const CosPropertyService::Properties &nproperties) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::MultipleExceptions)); + virtual void define_properties (const CosPropertyService::Properties &nproperties); // Define a sequence of properties at a time. - virtual CORBA::ULong get_number_of_properties (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ULong get_number_of_properties (void); // Get the number of properties that are currently defined in the // PropertySet. virtual void get_all_property_names (CORBA::ULong how_many, CosPropertyService::PropertyNames_out property_names, - CosPropertyService::PropertyNamesIterator_out rest) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosPropertyService::PropertyNamesIterator_out rest); // Get the names of all the properties that are currently defined in // the property set. - virtual CORBA::Any *get_property_value (const char *property_name) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::PropertyNotFound, - CosPropertyService::InvalidPropertyName)); + virtual CORBA::Any *get_property_value (const char *property_name); // Get the value of the property, given the name. virtual CORBA::Boolean get_properties (const CosPropertyService::PropertyNames &property_names, - CosPropertyService::Properties_out nproperties) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosPropertyService::Properties_out nproperties); // Get all names and their property values. virtual void get_all_properties (CORBA::ULong how_many, CosPropertyService::Properties_out nproperties, - CosPropertyService::PropertiesIterator_out rest) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosPropertyService::PropertiesIterator_out rest); // Returns all of the property names currently defined in the // PropertySet. If the PropertySet contains more than how_many // property names, then the remaining property names are put into the PropertyNamesIterator. - virtual void delete_property (const char *property_name) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::PropertyNotFound, - CosPropertyService::InvalidPropertyName, - CosPropertyService::FixedProperty)); + virtual void delete_property (const char *property_name); // Delete a property given a name. - virtual void delete_properties (const CosPropertyService::PropertyNames &property_names) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::MultipleExceptions)); + virtual void delete_properties (const CosPropertyService::PropertyNames &property_names); // Delete all the these properties from this property set. - virtual CORBA::Boolean delete_all_properties (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean delete_all_properties (void); // Delete everything from this property set. - virtual CORBA::Boolean is_property_defined (const char *property_name) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::InvalidPropertyName)); + virtual CORBA::Boolean is_property_defined (const char *property_name); // Tell whether this property is defined or no. Forget about the // value. @@ -378,16 +344,14 @@ public: virtual ~TAO_PropertySetDef (void); // Destructor. - virtual void get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types); // Indicates which types of properties are supported by this // PropertySet. If the output sequence is empty, then there is no // restrictions on the any TypeCode portion of the property_value // field of a Property in this PropertySet, unless the // get_allowed_properties output sequence is not empty. - virtual void get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs); // Indicates which properties are supported by this PropertySet. If // the output sequence is empty, then there is no restrictions on @@ -396,14 +360,7 @@ public: virtual void define_property_with_mode (const char *property_name, const CORBA::Any &property_value, - CosPropertyService::PropertyModeType property_mode) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::InvalidPropertyName, - CosPropertyService::ConflictingProperty, - CosPropertyService::UnsupportedTypeCode, - CosPropertyService::UnsupportedProperty, - CosPropertyService::UnsupportedMode, - CosPropertyService::ReadOnlyProperty)); + CosPropertyService::PropertyModeType property_mode); // This operation will modify or add a property to the // PropertySet. If the property already exists, then the property // type is checked before the value is overwritten. The property @@ -412,22 +369,16 @@ public: // PropertySet. If type or mode is violated, ConflictingProperty // exception is thrown. - virtual void define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::MultipleExceptions)); + virtual void define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs); // This operation will modify or add each of the properties in the // Properties parameter to the PropertySet. - virtual CosPropertyService::PropertyModeType get_property_mode (const char *property_name) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::PropertyNotFound, - CosPropertyService::InvalidPropertyName)); + virtual CosPropertyService::PropertyModeType get_property_mode (const char *property_name); // Get the mode of a property. Raises InvalidpropertyName, // PropertyNotFound exceptions. virtual CORBA::Boolean get_property_modes (const CosPropertyService::PropertyNames &property_names, - CosPropertyService::PropertyModes_out property_modes) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosPropertyService::PropertyModes_out property_modes); // Batch operation for getting the property. Invoke // get_property_mode for each name. Return value False indicates // that properties with *undefined* modes have failed due to @@ -437,11 +388,7 @@ public: // doing something with it. virtual void set_property_mode (const char *property_name, - CosPropertyService::PropertyModeType property_mode) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::InvalidPropertyName, - CosPropertyService::PropertyNotFound, - CosPropertyService::UnsupportedMode)); + CosPropertyService::PropertyModeType property_mode); // Set the mode of a property. Watch the following. The change of // mode is allowed introduce more constraints, but it should not // relax the constraints. The following decisions have been made, in @@ -453,9 +400,7 @@ public: // all illegal set_mode attempts, UnsupportedMode exception is // raised. - virtual void set_property_modes (const CosPropertyService::PropertyModes &property_modes) - ACE_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::MultipleExceptions)); + virtual void set_property_modes (const CosPropertyService::PropertyModes &property_modes); // Batch operation for setting the property. Raises // MultipleExceptions. }; @@ -483,29 +428,25 @@ public: virtual ~TAO_PropertyNamesIterator (void); // Destructor. - virtual void reset (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void reset (void); // The reset operation resets the position in an iterator to the // first property name, if one exists. - virtual CORBA::Boolean next_one (CORBA::String_out property_name) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean next_one (CORBA::String_out property_name); // The next_one operation returns true if an item exists at the // current position in the iterator with an output parameter of a // property name. A return of false signifies no more items in the iterator. virtual CORBA::Boolean next_n (CORBA::ULong how_many, - CosPropertyService::PropertyNames_out property_names) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosPropertyService::PropertyNames_out property_names); // The next_n operation returns true if an item exists at the // current position in the iterator and the how_many parameter was // set greater than zero. The output is a PropertyNames sequence // with at most the how_many number of names. A return of false // signifies no more items in the iterator. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); // Destroys the iterator. private: typedef ACE_Hash_Map_Manager<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex> @@ -544,28 +485,24 @@ public: virtual ~TAO_PropertiesIterator (void); // Destructor. - virtual void reset (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void reset (void); // Resets the position in an iterator to the first property, if one exists. - virtual CORBA::Boolean next_one (CosPropertyService::Property_out aproperty) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean next_one (CosPropertyService::Property_out aproperty); // The next_one operation returns true if an item exists at the // current position in the iterator with an output parameter of a // property. A return of false signifies no more items in the // iterator. virtual CORBA::Boolean next_n (CORBA::ULong how_many, - CosPropertyService::Properties_out nproperties) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosPropertyService::Properties_out nproperties); // The next_n operation returns true if an item exists at the // current position in the iterator and the how_many parameter was // set greater than zero. The output is a properties sequence with // at most the how_many number of properties. A return of false // signifies no more items in the iterator. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); // Destroys the iterator. private: diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp index b99b792b5dd..3eaf87a6c1f 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp @@ -147,9 +147,6 @@ RTCosScheduling_ClientScheduler_i::~RTCosScheduling_ClientScheduler_i (void) void RTCosScheduling_ClientScheduler_i::schedule_activity ( const char * activity_name) - ACE_THROW_SPEC (( - CORBA::SystemException, - RTCosScheduling::UnknownName)) { /// Look up the priority using the activity name in the activity map COS_SCHEDULER_ACTIVITY_VALUE priority = 0; @@ -400,22 +397,18 @@ RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Int char * RTCosScheduling_ClientScheduler_Interceptor::name () -ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup(this->name_); } void RTCosScheduling_ClientScheduler_Interceptor::destroy () -ACE_THROW_SPEC ((CORBA::SystemException)) { } void RTCosScheduling_ClientScheduler_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { try { @@ -448,30 +441,24 @@ RTCosScheduling_ClientScheduler_Interceptor::send_request ( void RTCosScheduling_ClientScheduler_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr) -ACE_THROW_SPEC ((CORBA::SystemException)) { } void RTCosScheduling_ClientScheduler_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr) -ACE_THROW_SPEC ((CORBA::SystemException)) { } void RTCosScheduling_ClientScheduler_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr) -ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void RTCosScheduling_ClientScheduler_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr) -ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h index 8c01a8eb91c..e25907573a6 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h @@ -85,34 +85,24 @@ public: //@{ /// Return the name of this ClientRequestInterceptor. // - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void send_poll ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ClientRequestInfo_ptr ri); //@} private: @@ -169,10 +159,7 @@ class TAO_RTCosScheduling_Export RTCosScheduling_ClientScheduler_i : * the desired priority */ virtual void schedule_activity ( - const char *activity_name) - ACE_THROW_SPEC (( - CORBA::SystemException, - RTCosScheduling::UnknownName)); + const char *activity_name); //@} private: diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp index 5943a7f0e8a..e67069e5ccd 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp @@ -143,9 +143,6 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core) const char * adapter_name, PortableServer::POAManager_ptr a_POAManager, const CORBA::PolicyList & policies) - ACE_THROW_SPEC (( CORBA::SystemException - , PortableServer::POA::AdapterAlreadyExists - , PortableServer::POA::InvalidPolicy)) { try { @@ -265,8 +262,6 @@ void RTCosScheduling_ServerScheduler_i::schedule_object ( CORBA::Object_ptr obj, const char * name) - ACE_THROW_SPEC ((CORBA::SystemException - , RTCosScheduling::UnknownName)) { /// Check and see if the object name is in the resource map, /// if it is, then there is a ceiling for it and we can add it to the @@ -380,9 +375,6 @@ RTCosScheduling_ServerScheduler_Interceptor::~RTCosScheduling_ServerScheduler_In void RTCosScheduling_ServerScheduler_Interceptor::receive_request( PortableInterceptor::ServerRequestInfo_ptr ri) -ACE_THROW_SPEC(( - CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { try { @@ -526,9 +518,6 @@ ACE_THROW_SPEC(( void RTCosScheduling_ServerScheduler_Interceptor::send_reply( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC(( - CORBA::SystemException - )) { ACE_UNUSED_ARG(ri); finish_execution(); @@ -550,23 +539,18 @@ RTCosScheduling_ServerScheduler_Interceptor::finish_execution() char* RTCosScheduling_ServerScheduler_Interceptor::name(void) - ACE_THROW_SPEC((CORBA::SystemException)) { return CORBA::string_dup(this->name_); } void RTCosScheduling_ServerScheduler_Interceptor::destroy(void) - ACE_THROW_SPEC((CORBA::SystemException)) { } void RTCosScheduling_ServerScheduler_Interceptor::receive_request_service_contexts( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC(( - CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { ACE_UNUSED_ARG(ri); } @@ -574,8 +558,6 @@ RTCosScheduling_ServerScheduler_Interceptor::receive_request_service_contexts( void RTCosScheduling_ServerScheduler_Interceptor::send_exception( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { ACE_UNUSED_ARG(ri); finish_execution(); @@ -584,9 +566,6 @@ RTCosScheduling_ServerScheduler_Interceptor::send_exception( void RTCosScheduling_ServerScheduler_Interceptor::send_other( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC(( - CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { ACE_UNUSED_ARG(ri); finish_execution(); diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h index 3a54fb5d814..f7956d37a19 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h @@ -122,40 +122,24 @@ typedef ACE_Hash_Map_Manager_Ex_Adapter< virtual ~RTCosScheduling_ServerScheduler_Interceptor(); - virtual char* name(void) - ACE_THROW_SPEC(( - CORBA::SystemException)); + virtual char* name(void); - virtual void destroy() - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void destroy(); virtual void receive_request( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC(( - CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request_service_contexts( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC(( - CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_reply( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC((CORBA::SystemException)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_exception( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC(( - CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_other( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC(( - CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); void finish_execution(); @@ -227,11 +211,7 @@ typedef ACE_Hash_Map_Manager_Ex_Adapter< PortableServer::POA_ptr parent, const char * adapter_name, PortableServer::POAManager_ptr a_POAManager, - const CORBA::PolicyList & policies) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableServer::POA::AdapterAlreadyExists - , PortableServer::POA::InvalidPolicy)); + const CORBA::PolicyList & policies); /** * This maps a CORBA::Object_var with a name. The names are @@ -242,9 +222,7 @@ typedef ACE_Hash_Map_Manager_Ex_Adapter< * @param name name to associate with the CORBA object reference */ virtual void schedule_object (CORBA::Object_ptr obj, - const char * name) - ACE_THROW_SPEC (( CORBA::SystemException - , RTCosScheduling::UnknownName)); + const char * name); private: diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp index cf28755865b..d331361bfab 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp @@ -30,8 +30,6 @@ ACE_Runtime_Scheduler (int config_count, RtecScheduler::handle_t ACE_Runtime_Scheduler::create (const char *entry_point) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::DUPLICATE_NAME)) { // Just make sure it's there and return its handle. for (int i = 0; i < entry_count_; ++i) @@ -48,7 +46,6 @@ ACE_Runtime_Scheduler::create (const char *entry_point) RtecScheduler::handle_t ACE_Runtime_Scheduler::lookup (const char * entry_point) - ACE_THROW_SPEC ((CORBA::SystemException)) { return create (entry_point); } @@ -58,8 +55,6 @@ ACE_Runtime_Scheduler::lookup (const char * entry_point) RtecScheduler::RT_Info * ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle) - ACE_THROW_SPEC((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK)) { if (handle <= 0 || handle > entry_count_) throw RtecScheduler::UNKNOWN_TASK (); @@ -106,8 +101,6 @@ ACE_Runtime_Scheduler::set (::RtecScheduler::handle_t handle, ::RtecScheduler::Quantum_t quantum, ::RtecScheduler::Threads_t threads, ::RtecScheduler::Info_Type_t info_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK)) { // We compare the values with the ones stored and print a message on // any differences. @@ -145,8 +138,6 @@ ACE_Runtime_Scheduler::reset (RtecScheduler::handle_t handle, RtecScheduler::Quantum_t quantum, RtecScheduler::Threads_t threads, RtecScheduler::Info_Type_t info_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK)) { // Just go ahead and call the set method this->set (handle, criticality, time, typical_time, cached_time, @@ -156,10 +147,6 @@ ACE_Runtime_Scheduler::reset (RtecScheduler::handle_t handle, void ACE_Runtime_Scheduler::set_seq (const RtecScheduler::RT_Info_Set& infos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)) { for (u_int i = 0; i < infos.length (); ++i) { @@ -197,10 +184,6 @@ ACE_Runtime_Scheduler::set_seq (const RtecScheduler::RT_Info_Set& infos) void ACE_Runtime_Scheduler::replace_seq (const RtecScheduler::RT_Info_Set& infos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)) { for (u_int i = 0; i < infos.length (); ++i) { @@ -239,10 +222,6 @@ ACE_Runtime_Scheduler::replace_seq (const RtecScheduler::RT_Info_Set& infos) void ACE_Runtime_Scheduler::reset_seq (const RtecScheduler::RT_Info_Set& infos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)) { // Just call the set sequence method this->set_seq (infos); @@ -257,9 +236,6 @@ ACE_Runtime_Scheduler::priority (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& subpriority, RtecScheduler::Preemption_Priority_t& p_priority) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::NOT_SCHEDULED)) { if (handle <= 0 || handle > entry_count_) throw RtecScheduler::UNKNOWN_TASK (); @@ -279,9 +255,6 @@ ACE_Runtime_Scheduler::entry_point_priority (const char * entry_point, RtecScheduler::OS_Priority& priority, RtecScheduler::Preemption_Subpriority_t& subpriority, RtecScheduler::Preemption_Priority_t& p_priority) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::NOT_SCHEDULED)) { RtecScheduler::handle_t handle = lookup (entry_point); @@ -303,8 +276,6 @@ ACE_Runtime_Scheduler::add_dependency (RtecScheduler::handle_t handle, RtecScheduler::handle_t /* dependency */, CORBA::Long /* number_of_calls */, RtecScheduler::Dependency_Type_t /* dependency_type */) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK)) { if (handle <= 0 || handle > entry_count_) throw RtecScheduler::UNKNOWN_TASK (); @@ -336,8 +307,6 @@ ACE_Runtime_Scheduler::remove_dependency (RtecScheduler::handle_t handle, RtecScheduler::handle_t /* dependency */, CORBA::Long /* number_of_calls */, RtecScheduler::Dependency_Type_t /* dependency_type */) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK)) { if (handle <= 0 || handle > entry_count_) throw RtecScheduler::UNKNOWN_TASK (); @@ -353,8 +322,6 @@ ACE_Runtime_Scheduler::set_dependency_enable_state (RtecScheduler::handle_t hand CORBA::Long /* number_of_calls */, RtecScheduler::Dependency_Type_t /* dependency_type */, RtecScheduler::Dependency_Enabled_Type_t /* enabled */) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK)) { if (handle <= 0 || handle > entry_count_) throw RtecScheduler::UNKNOWN_TASK (); @@ -367,8 +334,6 @@ ACE_Runtime_Scheduler::set_dependency_enable_state (RtecScheduler::handle_t hand void ACE_Runtime_Scheduler::set_rt_info_enable_state (RtecScheduler::handle_t handle, RtecScheduler::RT_Info_Enabled_Type_t /* enabled */) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK)) { if (handle <= 0 || handle > entry_count_) throw RtecScheduler::UNKNOWN_TASK (); @@ -376,9 +341,6 @@ ACE_Runtime_Scheduler::set_rt_info_enable_state (RtecScheduler::handle_t handle, void ACE_Runtime_Scheduler::set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::UNKNOWN_TASK)) // This method sets the enable state of a sequence of dependencies. { ACE_UNUSED_ARG (dependencies); @@ -388,9 +350,6 @@ void ACE_Runtime_Scheduler::set_dependency_enable_state_seq (const RtecScheduler void ACE_Runtime_Scheduler::set_rt_info_enable_state_seq ( const RtecScheduler::RT_Info_Enable_State_Pair_Set &) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::UNKNOWN_TASK)) // This method enables or disables a sequence of RT_Infos. { } @@ -406,10 +365,6 @@ ACE_Runtime_Scheduler::compute_scheduling (CORBA::Long /* minimum_priority */, RtecScheduler::Dependency_Set_out /*dependencies */, RtecScheduler::Config_Info_Set_out /* configs */, RtecScheduler::Scheduling_Anomaly_Set_out /* anomalies */) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UTILIZATION_BOUND_EXCEEDED, - RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, - RtecScheduler::TASK_COUNT_MISMATCH)) { // TODO: Right now just do nothing, later we could validate the // priorities (without recomputing). @@ -424,13 +379,6 @@ ACE_Runtime_Scheduler::recompute_scheduling (CORBA::Long minimum_priority, CORBA::Long maximum_priority, RtecScheduler::Scheduling_Anomaly_Set_out anomalies) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UTILIZATION_BOUND_EXCEEDED, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, - RtecScheduler::TASK_COUNT_MISMATCH, - RtecScheduler::INTERNAL, - RtecScheduler::DUPLICATE_NAME)) { // TODO: Right now just do nothing. ACE_UNUSED_ARG(minimum_priority); @@ -447,9 +395,6 @@ ACE_Runtime_Scheduler::recompute_scheduling (CORBA::Long minimum_priority, void ACE_Runtime_Scheduler::get_rt_info_set (RtecScheduler::RT_Info_Set_out infos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL)) { // TODO: Right now just do nothing. ACE_UNUSED_ARG(infos); @@ -463,9 +408,6 @@ ACE_Runtime_Scheduler::get_rt_info_set (RtecScheduler::RT_Info_Set_out infos) void ACE_Runtime_Scheduler::get_dependency_set (RtecScheduler::Dependency_Set_out dependencies) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL)) { // TODO: Right now just do nothing. ACE_UNUSED_ARG(dependencies); @@ -478,9 +420,6 @@ ACE_Runtime_Scheduler::get_dependency_set (RtecScheduler::Dependency_Set_out dep void ACE_Runtime_Scheduler::get_config_info_set (RtecScheduler::Config_Info_Set_out configs) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL)) { // TODO: Right now just do nothing. ACE_UNUSED_ARG(configs); @@ -495,9 +434,6 @@ void ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::OS_Priority& priority, RtecScheduler::Dispatching_Type_t & d_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::NOT_SCHEDULED, - RtecScheduler::UNKNOWN_PRIORITY_LEVEL)) { // Throw an exception if a valid schedule has not been loaded if (config_count_ <= 0 @@ -528,8 +464,6 @@ ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priorit RtecScheduler::Preemption_Priority_t ACE_Runtime_Scheduler::last_scheduled_priority (void) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::NOT_SCHEDULED)) { // throw an exception if a valid schedule has not been loaded if (config_count_ <= 0) @@ -541,8 +475,6 @@ ACE_Runtime_Scheduler::last_scheduled_priority (void) void ACE_Runtime_Scheduler::get_config_infos (RtecScheduler::Config_Info_Set_out /*configs */) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::NOT_SCHEDULED)) { // throw an exception if a valid schedule has not been loaded if (this->config_count_ <= 0) diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h index 0bb5f45c2d7..7327b5b7dc0 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h @@ -42,21 +42,16 @@ public: ACE_Scheduler_Factory::POD_RT_Info rt_info[]); // Constructor. Initialize the data from the POD_RT_Info array. - virtual RtecScheduler::handle_t create (const char * entry_point) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::DUPLICATE_NAME)); + virtual RtecScheduler::handle_t create (const char * entry_point); // Create an RT_Info. In the config run scheduler this actually constructs // a new RT_Info. Here, we just return its handle, or an error value if // it's not present. - virtual RtecScheduler::handle_t lookup (const char * entry_point) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual RtecScheduler::handle_t lookup (const char * entry_point); // Lookup a handle for an RT_Info, and return its handle, or an error // value if it's not present. - virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK)); + virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle); // Return a pointer to the RT_Info corresponding to the passed handle. virtual void set (::RtecScheduler::handle_t handle, @@ -68,9 +63,7 @@ public: ::RtecScheduler::Importance_t importance, ::RtecScheduler::Quantum_t quantum, ::RtecScheduler::Threads_t threads, - ::RtecScheduler::Info_Type_t info_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK)); + ::RtecScheduler::Info_Type_t info_type); // Set characteristics of the RT_Info corresponding to the passed handle. virtual void reset (RtecScheduler::handle_t handle, @@ -82,70 +75,46 @@ public: RtecScheduler::Importance_t importance, RtecScheduler::Quantum_t quantum, RtecScheduler::Threads_t threads, - RtecScheduler::Info_Type_t info_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK)); + RtecScheduler::Info_Type_t info_type); // Reset characteristics of the RT_Info corresponding to the passed handle. - virtual void set_seq (const RtecScheduler::RT_Info_Set& infos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)); + virtual void set_seq (const RtecScheduler::RT_Info_Set& infos); // Set characteristics of the RT_Infos corresponding to the passed handles. // Tuples are added in the case of existing and/or multiple definitions. - virtual void replace_seq (const RtecScheduler::RT_Info_Set& infos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)); + virtual void replace_seq (const RtecScheduler::RT_Info_Set& infos); // Replace characteristics of the RT_Infos corresponding to the // passed handles. - virtual void reset_seq (const RtecScheduler::RT_Info_Set& infos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)); + virtual void reset_seq (const RtecScheduler::RT_Info_Set& infos); // Reset characteristics of the RT_Infos corresponding to the passed handles. // Tuples are replaced in the case of existing and/or multiple definitions. virtual void priority (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, - RtecScheduler::Preemption_Priority_t& p_priority) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::NOT_SCHEDULED)); + RtecScheduler::Preemption_Priority_t& p_priority); // Returns the priority and subpriority values assigned to an RT_Info, // based on its handle. virtual void entry_point_priority (const char * entry_point, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, - RtecScheduler::Preemption_Priority_t& p_priority) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::NOT_SCHEDULED)); + RtecScheduler::Preemption_Priority_t& p_priority); // Returns the priority and subpriority values assigned to an RT_Info, // based on its entry point name. virtual void add_dependency (RtecScheduler::handle_t handle, RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, - RtecScheduler::Dependency_Type_t dependency_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK)); + RtecScheduler::Dependency_Type_t dependency_type); // In the config run scheduler, this method registers a dependency between // two RT_Infos. In the run time scheduler, this is a no-op. virtual void remove_dependency (RtecScheduler::handle_t handle, RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, - RtecScheduler::Dependency_Type_t dependency_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK)); + RtecScheduler::Dependency_Type_t dependency_type); // In the reconfig scheduler, this method removes a dependency between // two RT_Infos. In the run time scheduler, this is a no-op. @@ -153,29 +122,19 @@ public: RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type, - RtecScheduler::Dependency_Enabled_Type_t enabled) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK)); + RtecScheduler::Dependency_Enabled_Type_t enabled); // In the reconfig scheduler, this method (re)enabes a dependency between // two RT_Infos. In the run time scheduler, this is a no-op. virtual void set_rt_info_enable_state (RtecScheduler::handle_t handle, - RtecScheduler::RT_Info_Enabled_Type_t enabled) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK)); + RtecScheduler::RT_Info_Enabled_Type_t enabled); // In the reconfig scheduler, enables or disables an RT_Info. // In the run time scheduler, this is a no-op. - virtual void set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::UNKNOWN_TASK)); + virtual void set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies); // This method sets the enable state of a sequence of dependencies. - virtual void set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::UNKNOWN_TASK)); + virtual void set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set); // This method enables or disables a sequence of RT_Infos. virtual void compute_scheduling (CORBA::Long minimum_priority, @@ -183,67 +142,40 @@ public: RtecScheduler::RT_Info_Set_out infos, RtecScheduler::Dependency_Set_out deps, RtecScheduler::Config_Info_Set_out configs, - RtecScheduler::Scheduling_Anomaly_Set_out anomalies) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UTILIZATION_BOUND_EXCEEDED, - RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, - RtecScheduler::TASK_COUNT_MISMATCH)); + RtecScheduler::Scheduling_Anomaly_Set_out anomalies); // In the config run scheduler, this method causes scheduling information // to be computed for all registered RT_Infos. In the run time scheduler, // this is a no-op. virtual void recompute_scheduling (CORBA::Long minimum_priority, CORBA::Long maximum_priority, - RtecScheduler::Scheduling_Anomaly_Set_out anomalies) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UTILIZATION_BOUND_EXCEEDED, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, - RtecScheduler::TASK_COUNT_MISMATCH, - RtecScheduler::INTERNAL, - RtecScheduler::DUPLICATE_NAME)); + RtecScheduler::Scheduling_Anomaly_Set_out anomalies); // Recomputes the scheduling priorities, etc. - virtual void get_rt_info_set (RtecScheduler::RT_Info_Set_out infos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL)); + virtual void get_rt_info_set (RtecScheduler::RT_Info_Set_out infos); // Returns the set of rt_infos, with their assigned priorities (as // of the last schedule re-computation). - virtual void get_dependency_set (RtecScheduler::Dependency_Set_out dependencies) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL)); + virtual void get_dependency_set (RtecScheduler::Dependency_Set_out dependencies); // Returns the set of rt_infos, with their assigned priorities (as // of the last schedule re-computation). - virtual void get_config_info_set (RtecScheduler::Config_Info_Set_out configs) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL)); + virtual void get_config_info_set (RtecScheduler::Config_Info_Set_out configs); // Returns the set of config_infos, describing the appropriate // number, types, and priority levels for the dispatching lanes. virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::OS_Priority& o_priority, - RtecScheduler::Dispatching_Type_t & d_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::NOT_SCHEDULED, - RtecScheduler::UNKNOWN_PRIORITY_LEVEL)); + RtecScheduler::Dispatching_Type_t & d_type); // Provides the thread priority and queue type for the given priority level. - virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (void) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::NOT_SCHEDULED)); + virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (void); // Returns the last priority number assigned to an operation in the // schedule. The number returned is one less than the total number // of scheduled priorities. All scheduled priorities range from 0 // to the number returned, inclusive. - virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::NOT_SCHEDULED)); + virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs); private: int config_count_; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp index 61ae03facc1..047a7882b7f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp @@ -2,7 +2,6 @@ #include "tao/debug.h" #include "tao/ORB_Core.h" -#include "tao/Environment.h" #include "tao/IIOP_Endpoint.h" #include "tao/Transport_Cache_Manager.h" #include "tao/Thread_Lane_Resources.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp index 57d6e7f7f18..caf7948dc48 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp @@ -26,63 +26,54 @@ TAO::SSLIOP::ClientCredentials::~ClientCredentials (void) SecurityLevel3::CredentialsType TAO::SSLIOP::ClientCredentials::creds_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return SecurityLevel3::CT_ClientCredentials; } char * TAO::SSLIOP::ClientCredentials::context_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } SecurityLevel3::Principal * TAO::SSLIOP::ClientCredentials::client_principal (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } SecurityLevel3::StatementList * TAO::SSLIOP::ClientCredentials::client_supporting_statements () - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } SecurityLevel3::ResourceNameList * TAO::SSLIOP::ClientCredentials::client_restricted_resources () - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } SecurityLevel3::Principal * TAO::SSLIOP::ClientCredentials::target_principal (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } SecurityLevel3::StatementList * TAO::SSLIOP::ClientCredentials::target_supporting_statements () - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } SecurityLevel3::ResourceNameList * TAO::SSLIOP::ClientCredentials::target_restricted_resources () - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } SecurityLevel3::OwnCredentials_ptr TAO::SSLIOP::ClientCredentials::parent_credentials (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { SecurityLevel3::OwnCredentials_ptr creds = SecurityLevel3::OwnCredentials::_nil (); @@ -98,7 +89,6 @@ TAO::SSLIOP::ClientCredentials::parent_credentials (void) CORBA::Boolean TAO::SSLIOP::ClientCredentials::client_authentication () - ACE_THROW_SPEC ((CORBA::SystemException)) { // If the client presented no certificate (i.e. cert_.ptr() == 0), // the client was not authenticated. Otherwise, verify the peer's @@ -111,21 +101,18 @@ TAO::SSLIOP::ClientCredentials::client_authentication () CORBA::Boolean TAO::SSLIOP::ClientCredentials::target_authentication (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean TAO::SSLIOP::ClientCredentials::confidentiality (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean TAO::SSLIOP::ClientCredentials::integrity (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // TAO's SSLIOP pluggable transport always provides integrity. Note // that if we diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h index fd688d2dc15..4b06e86b888 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h @@ -66,8 +66,7 @@ namespace TAO * interface. */ //@{ - virtual SecurityLevel3::CredentialsType creds_type () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::CredentialsType creds_type (); //@} /** @@ -77,41 +76,29 @@ namespace TAO * interface. */ //@{ - virtual char * context_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * context_id (void); - virtual SecurityLevel3::Principal * client_principal () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::Principal * client_principal (); - virtual SecurityLevel3::StatementList * client_supporting_statements () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::StatementList * client_supporting_statements (); - virtual SecurityLevel3::ResourceNameList * client_restricted_resources () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::ResourceNameList * client_restricted_resources (); - virtual SecurityLevel3::Principal * target_principal () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::Principal * target_principal (); - virtual SecurityLevel3::StatementList * target_supporting_statements () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::StatementList * target_supporting_statements (); - virtual SecurityLevel3::ResourceNameList * target_restricted_resources () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::ResourceNameList * target_restricted_resources (); - virtual SecurityLevel3::OwnCredentials_ptr parent_credentials () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::OwnCredentials_ptr parent_credentials (); - virtual CORBA::Boolean client_authentication (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean client_authentication (void); - virtual CORBA::Boolean target_authentication (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean target_authentication (void); - virtual CORBA::Boolean confidentiality (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean confidentiality (void); - virtual CORBA::Boolean integrity (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean integrity (void); //@} protected: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index b9c7158bb91..da779e72df1 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -8,7 +8,6 @@ #include "tao/debug.h" #include "tao/ORB_Core.h" #include "tao/Client_Strategy_Factory.h" -#include "tao/Environment.h" #include "tao/Base_Transport_Property.h" #include "tao/Transport_Cache_Manager.h" #include "tao/Thread_Lane_Resources.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp index 57df3355bd6..368a8dfab51 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp @@ -83,28 +83,24 @@ TAO::SSLIOP_Credentials::~SSLIOP_Credentials (void) char * TAO::SSLIOP_Credentials::creds_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->id_.in ()); } SecurityLevel3::CredentialsUsage TAO::SSLIOP_Credentials::creds_usage (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return SecurityLevel3::CU_Indefinite; } TimeBase::UtcT TAO::SSLIOP_Credentials::expiry_time (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->expiry_time_; } SecurityLevel3::CredentialsState TAO::SSLIOP_Credentials::creds_state (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { const ::X509 *x = this->x509_.in (); @@ -150,14 +146,12 @@ TAO::SSLIOP_Credentials::creds_state (void) char * TAO::SSLIOP_Credentials::add_relinquished_listener ( SecurityLevel3::RelinquishedCredentialsListener_ptr /* listener */) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } void TAO::SSLIOP_Credentials::remove_relinquished_listener (const char * /* id */) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h index c3b94c4bf6d..c9f89d93b10 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h @@ -74,28 +74,22 @@ namespace TAO * interface. */ //@{ - virtual char * creds_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * creds_id (void); virtual SecurityLevel3::CredentialsType creds_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; - virtual SecurityLevel3::CredentialsUsage creds_usage () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::CredentialsUsage creds_usage (); - virtual TimeBase::UtcT expiry_time (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual TimeBase::UtcT expiry_time (void); - virtual SecurityLevel3::CredentialsState creds_state () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::CredentialsState creds_state (); virtual char * add_relinquished_listener ( - SecurityLevel3::RelinquishedCredentialsListener_ptr listener) - ACE_THROW_SPEC ((CORBA::SystemException)); + SecurityLevel3::RelinquishedCredentialsListener_ptr listener); - virtual void remove_relinquished_listener (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void remove_relinquished_listener (const char * id); //@} diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp index 8263bb166ec..8f80d4dfd5f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp @@ -91,7 +91,6 @@ TAO::SSLIOP::CredentialsAcquirer::~CredentialsAcquirer (void) char * TAO::SSLIOP::CredentialsAcquirer::acquisition_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -100,7 +99,6 @@ TAO::SSLIOP::CredentialsAcquirer::acquisition_method (void) SecurityLevel3::AcquisitionStatus TAO::SSLIOP::CredentialsAcquirer::current_status (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -109,7 +107,6 @@ TAO::SSLIOP::CredentialsAcquirer::current_status (void) CORBA::ULong TAO::SSLIOP::CredentialsAcquirer::nth_iteration (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -120,7 +117,6 @@ TAO::SSLIOP::CredentialsAcquirer::nth_iteration (void) CORBA::Any * TAO::SSLIOP::CredentialsAcquirer::get_continuation_data () - ACE_THROW_SPEC ((CORBA::SystemException)) { // SSL/TLS credentials acquisition does generate continuation data. throw CORBA::BAD_INV_ORDER (); @@ -129,7 +125,6 @@ TAO::SSLIOP::CredentialsAcquirer::get_continuation_data () SecurityLevel3::AcquisitionStatus TAO::SSLIOP::CredentialsAcquirer::continue_acquisition ( const CORBA::Any & /* acquisition_arguments */) - ACE_THROW_SPEC ((CORBA::SystemException)) { // SSL/TLS credentials acquisition does generate continuation data. throw CORBA::BAD_INV_ORDER (); @@ -137,7 +132,6 @@ TAO::SSLIOP::CredentialsAcquirer::continue_acquisition ( SecurityLevel3::OwnCredentials_ptr TAO::SSLIOP::CredentialsAcquirer::get_credentials (CORBA::Boolean on_list) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); @@ -186,7 +180,6 @@ TAO::SSLIOP::CredentialsAcquirer::get_credentials (CORBA::Boolean on_list) void TAO::SSLIOP::CredentialsAcquirer::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->check_validity (); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h index 910c4826c90..3cd5ecb3e5f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h @@ -75,28 +75,21 @@ namespace TAO * interface. */ //@{ - virtual char * acquisition_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * acquisition_method (void); - virtual SecurityLevel3::AcquisitionStatus current_status () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::AcquisitionStatus current_status (); - virtual CORBA::ULong nth_iteration (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ULong nth_iteration (void); - virtual CORBA::Any * get_continuation_data (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Any * get_continuation_data (void); virtual SecurityLevel3::AcquisitionStatus continue_acquisition ( - const CORBA::Any & acquisition_arguments) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CORBA::Any & acquisition_arguments); virtual SecurityLevel3::OwnCredentials_ptr get_credentials ( - CORBA::Boolean on_list) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean on_list); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); //@} protected: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp index 07d732ea5d8..ad852d19eff 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp @@ -25,8 +25,6 @@ TAO::SSLIOP::Current::~Current (void) ::SSLIOP::ASN_1_Cert * TAO::SSLIOP::Current::get_peer_certificate () - ACE_THROW_SPEC ((CORBA::SystemException, - SSLIOP::Current::NoContext)) { TAO::SSLIOP::Current_Impl *impl = this->implementation (); @@ -57,8 +55,6 @@ TAO::SSLIOP::Current::get_peer_certificate () SSLIOP::SSL_Cert * TAO::SSLIOP::Current::get_peer_certificate_chain () - ACE_THROW_SPEC ((CORBA::SystemException, - SSLIOP::Current::NoContext)) { TAO::SSLIOP::Current_Impl *impl = this->implementation (); @@ -89,7 +85,6 @@ TAO::SSLIOP::Current::get_peer_certificate_chain () CORBA::Boolean TAO::SSLIOP::Current::no_context (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return (this->implementation () == 0 ? 1 : 0); } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h index e290ca7abd5..49a777a2ff3 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h @@ -69,9 +69,7 @@ namespace TAO /// Return the peer certificate associated with the current /// request. - virtual ::SSLIOP::ASN_1_Cert * get_peer_certificate () - ACE_THROW_SPEC ((CORBA::SystemException, - ::SSLIOP::Current::NoContext)); + virtual ::SSLIOP::ASN_1_Cert * get_peer_certificate (); /** * Return the certificate chain associated with the current @@ -81,9 +79,7 @@ namespace TAO * certficate. However, the certificate chain on the server * side does NOT contain the peer (client) certificate. */ - virtual ::SSLIOP::SSL_Cert * get_peer_certificate_chain () - ACE_THROW_SPEC ((CORBA::SystemException, - ::SSLIOP::Current::NoContext)); + virtual ::SSLIOP::SSL_Cert * get_peer_certificate_chain (); /** * This method is mostly useful as an inexpensive means of @@ -92,8 +88,7 @@ namespace TAO * @return @c true if the current execution context is not * within a SSL session. */ - virtual CORBA::Boolean no_context (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean no_context (void); /// Set the TSS slot ID assigned to this object. void tss_slot (size_t slot); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp index 14feb39226f..5e31779d19a 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp @@ -27,7 +27,6 @@ TAO::SSLIOP::Current_Impl::~Current_Impl (void) SecurityLevel3::ClientCredentials_ptr TAO::SSLIOP::Current_Impl::client_credentials () - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::SSLIOP::X509_var cert = ::SSL_get_peer_certificate (this->ssl_); if (cert.ptr () == 0) @@ -49,7 +48,6 @@ TAO::SSLIOP::Current_Impl::client_credentials () CORBA::Boolean TAO::SSLIOP::Current_Impl::request_is_local (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h index 030b28d7d6d..a5d0aa1ca00 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h @@ -54,13 +54,11 @@ namespace TAO /// Implementation of the SSLIOP-specific /// SecurityLevel3::client_credentials() method. - virtual SecurityLevel3::ClientCredentials_ptr client_credentials () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::ClientCredentials_ptr client_credentials (); /// Implementation of the SSLIOP-specific /// SecurityLevel3::request_is_local() method. - virtual CORBA::Boolean request_is_local () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean request_is_local (); /// Return the SSL peer certificate associated with the /// current request as an octet sequence, i.e. a DER encoded diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp index 5ce2d53c82c..8105eea83cb 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp @@ -32,14 +32,12 @@ TAO::SSLIOP::Server_Invocation_Interceptor::~Server_Invocation_Interceptor ( char * TAO::SSLIOP::Server_Invocation_Interceptor::name () - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("TAO::SSLIOP::Server_Invocation_Interceptor"); } void TAO::SSLIOP::Server_Invocation_Interceptor::destroy () - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -47,8 +45,6 @@ TAO::SSLIOP::Server_Invocation_Interceptor::destroy () void TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr /*ri*/) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // The current upcall is not being performed through an SSL // connection. If server is configured to disallow insecure @@ -132,31 +128,24 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts ( void TAO::SSLIOP::Server_Invocation_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr /* ri */) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void TAO::SSLIOP::Server_Invocation_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr /* ri */) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO::SSLIOP::Server_Invocation_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr /* ri */) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void TAO::SSLIOP::Server_Invocation_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr /* ri */) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h index e382a2042a2..af09c09b702 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h @@ -66,35 +66,24 @@ namespace TAO * PortableInterceptor::ServerRequestInterceptor interface. */ //@{ - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); //@} protected: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp index ba53b70281c..e3f3a8cf803 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp @@ -39,7 +39,6 @@ TAO::SSLIOP::ORBInitializer::ORBInitializer ( void TAO::SSLIOP::ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info); @@ -76,7 +75,6 @@ TAO::SSLIOP::ORBInitializer::pre_init ( void TAO::SSLIOP::ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Note we do not store the SSLIOP::Current as a class member since // we need to avoid potential problems where the same diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h index f589a6a8e18..82c86738a09 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h @@ -60,11 +60,9 @@ namespace TAO CSIIOP::AssociationOptions csiv2_target_supports, CSIIOP::AssociationOptions csiv2_target_requires); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp index 5f9dceb49bb..9aa5424db18 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp @@ -44,28 +44,24 @@ TAO::SSLIOP::OwnCredentials::_nil (void) SecurityLevel3::CredentialsType TAO::SSLIOP::OwnCredentials::creds_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return SecurityLevel3::CT_OwnCredentials; } SecurityLevel3::CredsInitiator_ptr TAO::SSLIOP::OwnCredentials::creds_initiator (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } SecurityLevel3::CredsAcceptor_ptr TAO::SSLIOP::OwnCredentials::creds_acceptor (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } void TAO::SSLIOP::OwnCredentials::release_credentials () - ACE_THROW_SPEC ((CORBA::SystemException)) { this->creds_state_ = SecurityLevel3::CS_PendingRelease; } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h index 0ac90730636..4387e7d80e9 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h @@ -72,8 +72,7 @@ namespace TAO * interface. */ //@{ - SecurityLevel3::CredentialsType creds_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + SecurityLevel3::CredentialsType creds_type (void); //@} /** @@ -83,14 +82,11 @@ namespace TAO * interface. */ //@{ - virtual SecurityLevel3::CredsInitiator_ptr creds_initiator () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::CredsInitiator_ptr creds_initiator (); - virtual SecurityLevel3::CredsAcceptor_ptr creds_acceptor () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::CredsAcceptor_ptr creds_acceptor (); - virtual void release_credentials (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void release_credentials (void); //@} protected: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp index 3920b4fa110..e69f43820be 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp @@ -1,10 +1,8 @@ #include "orbsvcs/SSLIOP/SSLIOP_Profile.h" #include "orbsvcs/SSLIOP/ssl_endpointsC.h" #include "tao/CDR.h" -#include "tao/Environment.h" #include "ace/OS_NS_string.h" - ACE_RCSID (SSLIOP, SSLIOP_Profile, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp index 13b3ed1e1d8..6e5d711b3a7 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp @@ -16,112 +16,96 @@ TAO::SSLIOP::TargetCredentials::TargetCredentials (::X509 *cert, SecurityLevel3::CredentialsType TAO::SSLIOP::TargetCredentials::creds_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return SecurityLevel3::CT_TargetCredentials; } char * TAO::SSLIOP::TargetCredentials::context_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } SecurityLevel3::Principal * TAO::SSLIOP::TargetCredentials::client_principal (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } SecurityLevel3::StatementList * TAO::SSLIOP::TargetCredentials::client_supporting_statements () - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } SecurityLevel3::ResourceNameList * TAO::SSLIOP::TargetCredentials::client_restricted_resources () - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } SecurityLevel3::Principal * TAO::SSLIOP::TargetCredentials::target_principal (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } SecurityLevel3::StatementList * TAO::SSLIOP::TargetCredentials::target_supporting_statements () - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } SecurityLevel3::ResourceNameList * TAO::SSLIOP::TargetCredentials::target_restricted_resources () - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } SecurityLevel3::OwnCredentials_ptr TAO::SSLIOP::TargetCredentials::parent_credentials (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean TAO::SSLIOP::TargetCredentials::client_authentication (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean TAO::SSLIOP::TargetCredentials::target_authentication (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean TAO::SSLIOP::TargetCredentials::confidentiality (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean TAO::SSLIOP::TargetCredentials::integrity (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean TAO::SSLIOP::TargetCredentials::target_embodied (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean TAO::SSLIOP::TargetCredentials::target_endorsed (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } void TAO::SSLIOP::TargetCredentials::release (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h index 0127c1e8a77..08bd969eea4 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h @@ -53,8 +53,7 @@ namespace TAO * interface. */ //@{ - virtual SecurityLevel3::CredentialsType creds_type () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::CredentialsType creds_type (); //@} /** @@ -64,50 +63,35 @@ namespace TAO * interface. */ //@{ - virtual char * context_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * context_id (void); - virtual SecurityLevel3::Principal * client_principal () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::Principal * client_principal (); - virtual SecurityLevel3::StatementList * client_supporting_statements () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::StatementList * client_supporting_statements (); - virtual SecurityLevel3::ResourceNameList * client_restricted_resources () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::ResourceNameList * client_restricted_resources (); - virtual SecurityLevel3::Principal * target_principal () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::Principal * target_principal (); - virtual SecurityLevel3::StatementList * target_supporting_statements () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::StatementList * target_supporting_statements (); - virtual SecurityLevel3::ResourceNameList * target_restricted_resources () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::ResourceNameList * target_restricted_resources (); - virtual SecurityLevel3::OwnCredentials_ptr parent_credentials () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::OwnCredentials_ptr parent_credentials (); - virtual CORBA::Boolean client_authentication (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean client_authentication (void); - virtual CORBA::Boolean target_authentication (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean target_authentication (void); - virtual CORBA::Boolean confidentiality (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean confidentiality (void); - virtual CORBA::Boolean integrity (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean integrity (void); - virtual CORBA::Boolean target_embodied (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean target_embodied (void); - virtual CORBA::Boolean target_endorsed (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean target_endorsed (void); - virtual void release (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void release (void); //@} }; diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp index 0910e97a3df..7ec5e1de1a1 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp @@ -31,8 +31,6 @@ ACE_Config_Scheduler::~ACE_Config_Scheduler (void) RtecScheduler::handle_t ACE_Config_Scheduler::create (const char * entry_point) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::DUPLICATE_NAME)) { typedef RtecScheduler::RT_Info* RT_Info_ptr; @@ -82,7 +80,6 @@ ACE_Config_Scheduler::create (const char * entry_point) RtecScheduler::handle_t ACE_Config_Scheduler::lookup (const char * entry_point) - ACE_THROW_SPEC ((CORBA::SystemException)) { RtecScheduler::RT_Info* rt_info = 0; switch (impl->get_rt_info (entry_point, rt_info)) @@ -103,8 +100,6 @@ ACE_Config_Scheduler::lookup (const char * entry_point) RtecScheduler::RT_Info* ACE_Config_Scheduler::get (RtecScheduler::handle_t handle) - ACE_THROW_SPEC((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK)) { RtecScheduler::RT_Info* rt_info = 0; switch (impl->lookup_rt_info (handle, rt_info)) @@ -138,8 +133,6 @@ void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle, RtecScheduler::Quantum_t quantum, CORBA::Long threads, RtecScheduler::Info_Type_t info_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK)) { RtecScheduler::RT_Info* rt_info = 0; switch (impl->lookup_rt_info (handle, rt_info)) @@ -169,9 +162,6 @@ void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, RtecScheduler::Preemption_Priority_t& p_priority) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::NOT_SCHEDULED)) { if (impl->priority (handle, priority, p_subpriority, p_priority) == -1) @@ -186,9 +176,6 @@ void ACE_Config_Scheduler::entry_point_priority (const char * entry_point, RtecScheduler::OS_Priority& priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, RtecScheduler::Preemption_Priority_t& p_priority) - ACE_THROW_SPEC((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::NOT_SCHEDULED)) { this->priority (lookup (entry_point), priority, p_subpriority, p_priority); @@ -199,8 +186,6 @@ void ACE_Config_Scheduler::add_dependency (RtecScheduler::handle_t handle, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK)) { RtecScheduler::RT_Info* rt_info = 0; @@ -236,10 +221,6 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority, RtecScheduler::Dependency_Set_out dependencies, RtecScheduler::Config_Info_Set_out configs, RtecScheduler::Scheduling_Anomaly_Set_out anomalies) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UTILIZATION_BOUND_EXCEEDED, - RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, - RtecScheduler::TASK_COUNT_MISMATCH)) { // Initialize the scheduler implementation. @@ -445,9 +426,6 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority, void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::OS_Priority& priority, RtecScheduler::Dispatching_Type_t & d_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::NOT_SCHEDULED, - RtecScheduler::UNKNOWN_PRIORITY_LEVEL)) { if (impl->dispatch_configuration (p_priority, priority, d_type) == -1) @@ -463,8 +441,6 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri RtecScheduler::Preemption_Priority_t ACE_Config_Scheduler::last_scheduled_priority (void) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::NOT_SCHEDULED)) { RtecScheduler::Preemption_Priority_t priority = impl->minimum_priority_queue (); @@ -484,9 +460,6 @@ ACE_Config_Scheduler::last_scheduled_priority (void) void ACE_Config_Scheduler::get_config_infos (RtecScheduler::Config_Info_Set_out configs) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::NOT_SCHEDULED)) { ACE_UNUSED_ARG ((configs)); @@ -505,19 +478,11 @@ void ACE_Config_Scheduler::reset (RtecScheduler::handle_t, RtecScheduler::Quantum_t, CORBA::Long, RtecScheduler::Info_Type_t) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)) { throw CORBA::NO_IMPLEMENT (); } void ACE_Config_Scheduler::set_seq (const RtecScheduler::RT_Info_Set&) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)) // Set characteristics of the RT_Infos corresponding to the passed handles. // Tuples are added in the case of existing and/or multiple definitions. { @@ -525,10 +490,6 @@ void ACE_Config_Scheduler::set_seq (const RtecScheduler::RT_Info_Set&) } void ACE_Config_Scheduler::reset_seq (const RtecScheduler::RT_Info_Set&) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)) // Reset characteristics of the RT_Infos corresponding to the passed handles. // Tuples are replaced in the case of existing and/or multiple definitions. { @@ -536,10 +497,6 @@ void ACE_Config_Scheduler::reset_seq (const RtecScheduler::RT_Info_Set&) } void ACE_Config_Scheduler::replace_seq (const RtecScheduler::RT_Info_Set&) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)) // Replace all RT_Infos, resetting characteristics of the RT_Infos // corresponding to the passed handles. All other RT_Infos are // reset to their uninitialized values, i.e., the same they have @@ -552,9 +509,6 @@ void ACE_Config_Scheduler::remove_dependency (RtecScheduler::handle_t, RtecScheduler::handle_t, CORBA::Long, RtecScheduler::Dependency_Type_t) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::UNKNOWN_TASK)) // This method removes a dependency between two RT_Infos. { throw CORBA::NO_IMPLEMENT (); @@ -565,18 +519,12 @@ void ACE_Config_Scheduler::set_dependency_enable_state (RtecScheduler::handle_t, CORBA::Long, RtecScheduler::Dependency_Type_t, RtecScheduler::Dependency_Enabled_Type_t) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::UNKNOWN_TASK)) // This method sets the enable state of a dependency between two RT_Infos. { throw CORBA::NO_IMPLEMENT (); } void ACE_Config_Scheduler::set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set &) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::UNKNOWN_TASK)) // This method sets the enable state of a sequence of dependencies. { throw CORBA::NO_IMPLEMENT (); @@ -584,9 +532,6 @@ void ACE_Config_Scheduler::set_dependency_enable_state_seq (const RtecScheduler: void ACE_Config_Scheduler::set_rt_info_enable_state (RtecScheduler::handle_t, RtecScheduler::RT_Info_Enabled_Type_t) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::UNKNOWN_TASK)) // This method enables or disables an RT_Info. { throw CORBA::NO_IMPLEMENT (); @@ -594,9 +539,6 @@ void ACE_Config_Scheduler::set_rt_info_enable_state (RtecScheduler::handle_t, void ACE_Config_Scheduler::set_rt_info_enable_state_seq ( const RtecScheduler::RT_Info_Enable_State_Pair_Set &) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::UNKNOWN_TASK)) // This method enables or disables a sequence of RT_Infos. { throw CORBA::NO_IMPLEMENT (); @@ -605,22 +547,12 @@ void ACE_Config_Scheduler::set_rt_info_enable_state_seq ( void ACE_Config_Scheduler::recompute_scheduling (CORBA::Long, CORBA::Long, RtecScheduler::Scheduling_Anomaly_Set_out) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UTILIZATION_BOUND_EXCEEDED, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, - RtecScheduler::TASK_COUNT_MISMATCH, - RtecScheduler::INTERNAL, - RtecScheduler::DUPLICATE_NAME)) // Recomputes the scheduling priorities, etc. { throw CORBA::NO_IMPLEMENT (); } void ACE_Config_Scheduler::get_rt_info_set (RtecScheduler::RT_Info_Set_out) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL)) // Returns the set of rt_infos, with their assigned priorities (as // of the last schedule re-computation). { @@ -628,9 +560,6 @@ void ACE_Config_Scheduler::get_rt_info_set (RtecScheduler::RT_Info_Set_out) } void ACE_Config_Scheduler::get_dependency_set (RtecScheduler::Dependency_Set_out) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL)) // Returns the set of rt_infos, with their assigned priorities (as // of the last schedule re-computation). { @@ -638,9 +567,6 @@ void ACE_Config_Scheduler::get_dependency_set (RtecScheduler::Dependency_Set_out } void ACE_Config_Scheduler::get_config_info_set (RtecScheduler::Config_Info_Set_out) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL)) // Returns the set of config_infos, describing the appropriate // number, types, and priority levels for the dispatching lanes. { diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h index cc872ee8863..32456a27e09 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h @@ -41,14 +41,11 @@ public: ACE_Config_Scheduler (void); virtual ~ACE_Config_Scheduler (void); - virtual RtecScheduler::handle_t create (const char * entry_point) - ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME)); + virtual RtecScheduler::handle_t create (const char * entry_point); - virtual RtecScheduler::handle_t lookup (const char * entry_point) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual RtecScheduler::handle_t lookup (const char * entry_point); - virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle) - ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); + virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle); virtual void set (RtecScheduler::handle_t handle, RtecScheduler::Criticality_t criticality, @@ -59,55 +56,37 @@ public: RtecScheduler::Importance_t importance, RtecScheduler::Quantum_t quantum, CORBA::Long threads, - RtecScheduler::Info_Type_t info_type) - ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); + RtecScheduler::Info_Type_t info_type); virtual void priority (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, - RtecScheduler::Preemption_Priority_t& p_priority) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::NOT_SCHEDULED)); + RtecScheduler::Preemption_Priority_t& p_priority); virtual void entry_point_priority (const char * entry_point, RtecScheduler::OS_Priority& priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, - RtecScheduler::Preemption_Priority_t& p_priority) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::NOT_SCHEDULED)); + RtecScheduler::Preemption_Priority_t& p_priority); virtual void add_dependency (RtecScheduler::handle_t handle, RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, - RtecScheduler::Dependency_Type_t dependency_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK)); + RtecScheduler::Dependency_Type_t dependency_type); virtual void compute_scheduling (CORBA::Long minimum_priority, CORBA::Long maximum_priority, RtecScheduler::RT_Info_Set_out infos, RtecScheduler::Dependency_Set_out dependencies, RtecScheduler::Config_Info_Set_out configs, - RtecScheduler::Scheduling_Anomaly_Set_out anomalies) - ACE_THROW_SPEC((CORBA::SystemException, - RtecScheduler::UTILIZATION_BOUND_EXCEEDED, - RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, - RtecScheduler::TASK_COUNT_MISMATCH)); + RtecScheduler::Scheduling_Anomaly_Set_out anomalies); virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::OS_Priority& priority, - RtecScheduler::Dispatching_Type_t & d_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::NOT_SCHEDULED, - RtecScheduler::UNKNOWN_PRIORITY_LEVEL)); + RtecScheduler::Dispatching_Type_t & d_type); // provide the thread priority and queue type for the given priority level virtual RtecScheduler::Preemption_Priority_t - last_scheduled_priority (void) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::NOT_SCHEDULED)); + last_scheduled_priority (void); // Returns the last priority number assigned to an operation in the // schedule. // The number returned is one less than the total number of @@ -115,10 +94,7 @@ public: // All scheduled priorities range from 0 to the number returned, // inclusive. - virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::NOT_SCHEDULED)); + virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs); // Provides the set of Config_Infos associated with the current schedule. virtual void reset (RtecScheduler::handle_t handle, @@ -130,34 +106,18 @@ public: RtecScheduler::Importance_t importance, RtecScheduler::Quantum_t quantum, CORBA::Long threads, - RtecScheduler::Info_Type_t info_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)); + RtecScheduler::Info_Type_t info_type); // Reset characteristics of the RT_Info corresponding to the passed handle. - virtual void set_seq (const RtecScheduler::RT_Info_Set& infos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)); + virtual void set_seq (const RtecScheduler::RT_Info_Set& infos); // Set characteristics of the RT_Infos corresponding to the passed handles. // Tuples are added in the case of existing and/or multiple definitions. - virtual void reset_seq (const RtecScheduler::RT_Info_Set& infos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)); + virtual void reset_seq (const RtecScheduler::RT_Info_Set& infos); // Reset characteristics of the RT_Infos corresponding to the passed handles. // Tuples are replaced in the case of existing and/or multiple definitions. - virtual void replace_seq (const RtecScheduler::RT_Info_Set& infos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)); + virtual void replace_seq (const RtecScheduler::RT_Info_Set& infos); // Replace all RT_Infos, resetting characteristics of the RT_Infos // corresponding to the passed handles. All other RT_Infos are // reset to their uninitialized values, i.e., the same they have @@ -166,71 +126,40 @@ public: virtual void remove_dependency (RtecScheduler::handle_t handle, RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, - RtecScheduler::Dependency_Type_t dependency_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::UNKNOWN_TASK)); + RtecScheduler::Dependency_Type_t dependency_type); // This method removes a dependency between two RT_Infos. virtual void set_dependency_enable_state (RtecScheduler::handle_t handle, RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type, - RtecScheduler::Dependency_Enabled_Type_t enabled) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::UNKNOWN_TASK)); + RtecScheduler::Dependency_Enabled_Type_t enabled); // This method sets the enable state of a dependency between two RT_Infos. - virtual void set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::UNKNOWN_TASK)); + virtual void set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies); // This method sets the enable state of a sequence of dependencies. virtual void set_rt_info_enable_state (RtecScheduler::handle_t handle, - RtecScheduler::RT_Info_Enabled_Type_t enabled) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::UNKNOWN_TASK)); + RtecScheduler::RT_Info_Enabled_Type_t enabled); // This method enables or disables an RT_Info. - virtual void set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::UNKNOWN_TASK)); + virtual void set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set); // This method enables or disables a sequence of RT_Infos. virtual void recompute_scheduling (CORBA::Long minimum_priority, CORBA::Long maximum_priority, - RtecScheduler::Scheduling_Anomaly_Set_out anomalies) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UTILIZATION_BOUND_EXCEEDED, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, - RtecScheduler::TASK_COUNT_MISMATCH, - RtecScheduler::INTERNAL, - RtecScheduler::DUPLICATE_NAME)); + RtecScheduler::Scheduling_Anomaly_Set_out anomalies); // Recomputes the scheduling priorities, etc. - virtual void get_rt_info_set (RtecScheduler::RT_Info_Set_out infos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL)); + virtual void get_rt_info_set (RtecScheduler::RT_Info_Set_out infos); // Returns the set of rt_infos, with their assigned priorities (as // of the last schedule re-computation). - virtual void get_dependency_set (RtecScheduler::Dependency_Set_out dependencies) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL)); + virtual void get_dependency_set (RtecScheduler::Dependency_Set_out dependencies); // Returns the set of rt_infos, with their assigned priorities (as // of the last schedule re-computation). - virtual void get_config_info_set (RtecScheduler::Config_Info_Set_out configs) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL)); + virtual void get_config_info_set (RtecScheduler::Config_Info_Set_out configs); // Returns the set of config_infos, describing the appropriate // number, types, and priority levels for the dispatching lanes. diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp index 6f2b48501c6..a2353720c60 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp @@ -167,11 +167,6 @@ init (int config_count, int dependency_count, ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[], u_long stability_flags) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::DUPLICATE_NAME, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -320,10 +315,6 @@ init (int config_count, // Closes the scheduler, releasing all current resources. template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (void) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::SYNCHRONIZATION_FAILURE)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -439,10 +430,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> RtecScheduler::handle_t TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: create (const char *entry_point) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::DUPLICATE_NAME, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -470,9 +457,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> RtecScheduler::handle_t TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: lookup (const char * entry_point) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::SYNCHRONIZATION_FAILURE)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -495,9 +479,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> RtecScheduler::RT_Info * TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: get (RtecScheduler::handle_t handle) - ACE_THROW_SPEC((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::SYNCHRONIZATION_FAILURE)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -541,10 +522,6 @@ set (::RtecScheduler::handle_t handle, ::RtecScheduler::Quantum_t quantum, ::RtecScheduler::Threads_t threads, ::RtecScheduler::Info_Type_t info_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -601,10 +578,6 @@ reset (RtecScheduler::handle_t handle, RtecScheduler::Quantum_t quantum, CORBA::Long threads, RtecScheduler::Info_Type_t info_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -664,10 +637,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: set_seq (const RtecScheduler::RT_Info_Set& infos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -742,10 +711,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: reset_seq (const RtecScheduler::RT_Info_Set& infos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -843,10 +808,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: replace_seq (const RtecScheduler::RT_Info_Set& infos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -967,10 +928,6 @@ priority (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& subpriority, RtecScheduler::Preemption_Priority_t& p_priority) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::NOT_SCHEDULED)) { ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_, RtecScheduler::SYNCHRONIZATION_FAILURE ()); @@ -1008,10 +965,6 @@ entry_point_priority (const char * entry_point, RtecScheduler::OS_Priority& priority, RtecScheduler::Preemption_Subpriority_t& subpriority, RtecScheduler::Preemption_Priority_t& p_priority) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::NOT_SCHEDULED)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -1040,9 +993,6 @@ add_dependency (RtecScheduler::handle_t handle /* RT_Info that has the dependenc RtecScheduler::handle_t dependency /* RT_Info on which it depends */, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::UNKNOWN_TASK)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -1072,9 +1022,6 @@ remove_dependency (RtecScheduler::handle_t handle, RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::UNKNOWN_TASK)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -1104,9 +1051,6 @@ set_dependency_enable_state (RtecScheduler::handle_t handle, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type, RtecScheduler::Dependency_Enabled_Type_t enabled) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::UNKNOWN_TASK)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -1128,9 +1072,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::UNKNOWN_TASK)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -1159,10 +1100,6 @@ void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: set_rt_info_enable_state (RtecScheduler::handle_t handle, RtecScheduler::RT_Info_Enabled_Type_t enabled) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL, - RtecScheduler::UNKNOWN_TASK)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -1195,10 +1132,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL, - RtecScheduler::UNKNOWN_TASK)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -1242,13 +1175,6 @@ compute_scheduling (CORBA::Long minimum_priority, RtecScheduler::Dependency_Set_out dependencies, RtecScheduler::Config_Info_Set_out configs, RtecScheduler::Scheduling_Anomaly_Set_out anomalies) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UTILIZATION_BOUND_EXCEEDED, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, - RtecScheduler::TASK_COUNT_MISMATCH, - RtecScheduler::INTERNAL, - RtecScheduler::DUPLICATE_NAME)) { // Delegates to recompute_scheduling and the respective accessors. this->recompute_scheduling (minimum_priority, maximum_priority, @@ -1279,13 +1205,6 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: recompute_scheduling (CORBA::Long /* minimum_priority */, CORBA::Long /* maximum_priority */, RtecScheduler::Scheduling_Anomaly_Set_out anomalies) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UTILIZATION_BOUND_EXCEEDED, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, - RtecScheduler::TASK_COUNT_MISMATCH, - RtecScheduler::INTERNAL, - RtecScheduler::DUPLICATE_NAME)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -1438,9 +1357,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: get_rt_info_set (RtecScheduler::RT_Info_Set_out infos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL)) { // return the set of scheduled RT_Infos @@ -1473,9 +1389,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: get_dependency_set (RtecScheduler::Dependency_Set_out dependencies) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL)) { // Return the set of dependencies: just need to iterate over one of the maps. @@ -1517,9 +1430,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: get_config_info_set (RtecScheduler::Config_Info_Set_out configs) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL)) { // Return the set of scheduled Config_Infos. @@ -1554,10 +1464,6 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::OS_Priority& t_priority, RtecScheduler::Dispatching_Type_t & d_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::NOT_SCHEDULED, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::UNKNOWN_PRIORITY_LEVEL)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -1594,9 +1500,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> RtecScheduler::Preemption_Priority_t TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: last_scheduled_priority (void) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::NOT_SCHEDULED)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -1622,9 +1525,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: get_config_infos (RtecScheduler::Config_Info_Set_out configs) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::NOT_SCHEDULED)) { ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_, RtecScheduler::SYNCHRONIZATION_FAILURE ()); @@ -1668,9 +1568,6 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: create_i (const char *entry_point, RtecScheduler::handle_t handle, int ignore_duplicates) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::DUPLICATE_NAME, - RtecScheduler::INTERNAL)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -1798,8 +1695,6 @@ set_i (TAO_RT_Info_Ex *rt_info, RtecScheduler::Quantum_t quantum, CORBA::Long threads, RtecScheduler::Info_Type_t info_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -1891,8 +1786,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> RtecScheduler::handle_t TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: lookup_i (const char * entry_point) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -1918,9 +1811,6 @@ priority_i (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& subpriority, RtecScheduler::Preemption_Priority_t& p_priority) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::NOT_SCHEDULED)) { // Check stability flags. if ((this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE) @@ -1950,9 +1840,6 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type, RtecScheduler::Dependency_Enabled_Type_t enabled) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL, - RtecScheduler::UNKNOWN_TASK)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -2047,10 +1934,6 @@ remove_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depe RtecScheduler::handle_t dependency /* RT_Info on which it depends */, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL, - RtecScheduler::UNKNOWN_TASK)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -2122,10 +2005,6 @@ set_dependency_enable_state_i (RtecScheduler::handle_t handle, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type, RtecScheduler::Dependency_Enabled_Type_t enabled) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL, - RtecScheduler::UNKNOWN_TASK)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -2200,9 +2079,6 @@ map_dependency_i (RtecScheduler::handle_t key, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type, RtecScheduler::Dependency_Enabled_Type_t enabled) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL, - RtecScheduler::UNKNOWN_TASK)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -2247,9 +2123,6 @@ unmap_dependency_i (RtecScheduler::handle_t key, typename TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL, - RtecScheduler::UNKNOWN_TASK)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -2316,9 +2189,6 @@ map_dependency_enable_state_i (RtecScheduler::handle_t key, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type, RtecScheduler::Dependency_Enabled_Type_t enabled) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL, - RtecScheduler::UNKNOWN_TASK)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -2372,8 +2242,6 @@ map_dependency_enable_state_i (RtecScheduler::handle_t key, template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: dfs_traverse_i (void) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -2412,9 +2280,6 @@ dfs_traverse_i (void) template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: detect_cycles_i (void) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL, - RtecScheduler::CYCLIC_DEPENDENCIES)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -2459,9 +2324,6 @@ detect_cycles_i (void) template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: perform_admission_i (void) - ACE_THROW_SPEC ((RtecScheduler::UTILIZATION_BOUND_EXCEEDED, - CORBA::SystemException, - RtecScheduler::INTERNAL)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -2522,8 +2384,6 @@ perform_admission_i (void) template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: crit_dfs_traverse_i (void) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -2558,8 +2418,6 @@ crit_dfs_traverse_i (void) template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: propagate_criticalities_i (void) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -2602,10 +2460,6 @@ propagate_criticalities_i (void) template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: propagate_characteristics_i (void) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL, - RtecScheduler::UNRESOLVED_LOCAL_DEPENDENCIES, - RtecScheduler::THREAD_SPECIFICATION)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -2645,9 +2499,6 @@ propagate_characteristics_i (void) template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: assign_priorities_i (void) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL, - RtecScheduler::DUPLICATE_NAME)) { int i; #if defined (SCHEDULER_LOGGING) @@ -2792,8 +2643,6 @@ assign_priorities_i (void) template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: refresh_tuple_ptr_array_i (void) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL)) { #if defined (SCHEDULER_LOGGING) ACE_DEBUG ((LM_TRACE, @@ -2976,7 +2825,6 @@ template <class ARRAY_ELEMENT_TYPE> void maintain_scheduling_array (ARRAY_ELEMENT_TYPE ** & current_ptr_array, long & current_ptr_array_size, RtecScheduler::handle_t handle) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (current_ptr_array_size <= handle) { @@ -3023,8 +2871,6 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: compute_utilization_i (void) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL)) { TAO_RSE_Utilization_Visitor<RECONFIG_SCHED_STRATEGY> util_visitor; for (int i = 0; i < this->rt_info_count_; ++i) @@ -3047,7 +2893,6 @@ compute_utilization_i (void) template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::init_rt_info (RtecScheduler::RT_Info &rt_info) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Set some reasonable default values. rt_info.criticality = RtecScheduler::VERY_LOW_CRITICALITY; diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h index 4c914f8fe37..9cb301fdca8 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h @@ -107,42 +107,23 @@ public: ACE_Scheduler_Factory::POD_RT_Info rt_info[], int dependency_count, ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[], - u_long stability_flags) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::DUPLICATE_NAME, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL)); + u_long stability_flags); // Initializes the scheduler with the passed information. - void close (void) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::SYNCHRONIZATION_FAILURE)); + void close (void); // Closes the scheduler, releasing all current resources. - virtual RtecScheduler::handle_t create (const char * entry_point) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::DUPLICATE_NAME, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)); + virtual RtecScheduler::handle_t create (const char * entry_point); // Create an RT_Info. If it does not exist, a new RT_Info is // created and inserted into the schedule, and the handle of the new // RT_Info is returned. If the RT_Info already exists, an exception // is thrown. - virtual RtecScheduler::handle_t lookup (const char * entry_point) - ACE_THROW_SPEC((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::SYNCHRONIZATION_FAILURE)); + virtual RtecScheduler::handle_t lookup (const char * entry_point); // Lookup a handle for an RT_Info, and return its handle, or an error // value if it's not present. - virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::SYNCHRONIZATION_FAILURE)); + virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle); // Return a pointer to the RT_Info corresponding to the passed handle. virtual void set (::RtecScheduler::handle_t handle, @@ -154,11 +135,7 @@ public: ::RtecScheduler::Importance_t importance, ::RtecScheduler::Quantum_t quantum, ::RtecScheduler::Threads_t threads, - ::RtecScheduler::Info_Type_t info_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)); + ::RtecScheduler::Info_Type_t info_type); // Set characteristics of the RT_Info corresponding to the passed handle. virtual void reset (RtecScheduler::handle_t handle, @@ -170,34 +147,18 @@ public: RtecScheduler::Importance_t importance, RtecScheduler::Quantum_t quantum, CORBA::Long threads, - RtecScheduler::Info_Type_t info_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)); + RtecScheduler::Info_Type_t info_type); // Reset characteristics of the RT_Info corresponding to the passed handle. - virtual void set_seq (const RtecScheduler::RT_Info_Set& infos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)); + virtual void set_seq (const RtecScheduler::RT_Info_Set& infos); // Set characteristics of the RT_Infos corresponding to the passed handles. // Tuples are added in the case of existing and/or multiple definitions. - virtual void reset_seq (const RtecScheduler::RT_Info_Set& infos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)); + virtual void reset_seq (const RtecScheduler::RT_Info_Set& infos); // Reset characteristics of the RT_Infos corresponding to the passed handles. // Tuples are replaced in the case of existing and/or multiple definitions. - virtual void replace_seq (const RtecScheduler::RT_Info_Set& infos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::INTERNAL, - RtecScheduler::SYNCHRONIZATION_FAILURE)); + virtual void replace_seq (const RtecScheduler::RT_Info_Set& infos); // Replace all RT_Infos, resetting characteristics of the RT_Infos // corresponding to the passed handles. All other RT_Infos are // reset to their uninitialized values, i.e., the same they have @@ -206,72 +167,44 @@ public: virtual void priority (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, - RtecScheduler::Preemption_Priority_t& p_priority) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::NOT_SCHEDULED)); + RtecScheduler::Preemption_Priority_t& p_priority); // Returns the priority and subpriority values assigned to an RT_Info, // based on its handle. virtual void entry_point_priority (const char * entry_point, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, - RtecScheduler::Preemption_Priority_t& p_priority) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::NOT_SCHEDULED)); + RtecScheduler::Preemption_Priority_t& p_priority); // Returns the priority and subpriority values assigned to an RT_Info, // based on its entry point name. virtual void add_dependency (RtecScheduler::handle_t handle, RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, - RtecScheduler::Dependency_Type_t dependency_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::UNKNOWN_TASK)); + RtecScheduler::Dependency_Type_t dependency_type); // This method registers a dependency between two RT_Infos. virtual void remove_dependency (RtecScheduler::handle_t handle, RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, - RtecScheduler::Dependency_Type_t dependency_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::UNKNOWN_TASK)); + RtecScheduler::Dependency_Type_t dependency_type); // This method removes a dependency between two RT_Infos. virtual void set_dependency_enable_state (RtecScheduler::handle_t handle, RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type, - RtecScheduler::Dependency_Enabled_Type_t enabled) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::UNKNOWN_TASK)); + RtecScheduler::Dependency_Enabled_Type_t enabled); // This method sets the enable state of a dependency between two RT_Infos. - virtual void set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::UNKNOWN_TASK)); + virtual void set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies); // This method sets the enable state of a sequence of dependencies. virtual void set_rt_info_enable_state (RtecScheduler::handle_t handle, - RtecScheduler::RT_Info_Enabled_Type_t enabled) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL, - RtecScheduler::UNKNOWN_TASK)); + RtecScheduler::RT_Info_Enabled_Type_t enabled); // This method enables or disables an RT_Info. - virtual void set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL, - RtecScheduler::UNKNOWN_TASK)); + virtual void set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set); // This method enables or disables a sequence of RT_Infos. virtual void compute_scheduling (CORBA::Long minimum_priority, @@ -279,14 +212,7 @@ public: RtecScheduler::RT_Info_Set_out infos, RtecScheduler::Dependency_Set_out dependencies, RtecScheduler::Config_Info_Set_out configs, - RtecScheduler::Scheduling_Anomaly_Set_out anomalies) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UTILIZATION_BOUND_EXCEEDED, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, - RtecScheduler::TASK_COUNT_MISMATCH, - RtecScheduler::INTERNAL, - RtecScheduler::DUPLICATE_NAME)); + RtecScheduler::Scheduling_Anomaly_Set_out anomalies); // If information has been added or changed since the last stable // schedule was computed, this method causes scheduling information // to be computed for all registered RT_Infos. If the schedule is @@ -294,60 +220,34 @@ public: virtual void recompute_scheduling (CORBA::Long minimum_priority, CORBA::Long maximum_priority, - RtecScheduler::Scheduling_Anomaly_Set_out anomalies) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UTILIZATION_BOUND_EXCEEDED, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, - RtecScheduler::TASK_COUNT_MISMATCH, - RtecScheduler::INTERNAL, - RtecScheduler::DUPLICATE_NAME)); + RtecScheduler::Scheduling_Anomaly_Set_out anomalies); // Recomputes the scheduling priorities, etc. - virtual void get_rt_info_set (RtecScheduler::RT_Info_Set_out infos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL)); + virtual void get_rt_info_set (RtecScheduler::RT_Info_Set_out infos); // Returns the set of rt_infos, with their assigned priorities (as // of the last schedule re-computation). - virtual void get_dependency_set (RtecScheduler::Dependency_Set_out dependencies) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL)); + virtual void get_dependency_set (RtecScheduler::Dependency_Set_out dependencies); // Returns the set of rt_infos, with their assigned priorities (as // of the last schedule re-computation). - virtual void get_config_info_set (RtecScheduler::Config_Info_Set_out configs) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL)); + virtual void get_config_info_set (RtecScheduler::Config_Info_Set_out configs); // Returns the set of config_infos, describing the appropriate // number, types, and priority levels for the dispatching lanes. virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::OS_Priority& o_priority, - RtecScheduler::Dispatching_Type_t & d_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::NOT_SCHEDULED, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::UNKNOWN_PRIORITY_LEVEL)); + RtecScheduler::Dispatching_Type_t & d_type); // Provides the thread priority and queue type for the given priority level. - virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (void) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::NOT_SCHEDULED)); + virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (void); // Returns the last priority number assigned to an operation in the // schedule. The number returned is one less than the total number // of scheduled priorities. All scheduled priorities range from 0 // to the number returned, inclusive. - virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::NOT_SCHEDULED)); + virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs); // Provides the set of Config_Infos associated with the current schedule. // = Accessors that allow controlled relaxations of encapsulation. @@ -441,10 +341,7 @@ protected: TAO_RT_Info_Ex * create_i (const char * entry_point, RtecScheduler::handle_t handle, - int ignore_duplicates) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::DUPLICATE_NAME, - RtecScheduler::INTERNAL)); + int ignore_duplicates); // Internal method to create an RT_Info. If it does not exist, a // new RT_Info is created and inserted into the schedule, and the // handle of the new RT_Info is returned. If the RT_Info already @@ -460,24 +357,17 @@ protected: RtecScheduler::Importance_t importance, RtecScheduler::Quantum_t quantum, CORBA::Long threads, - RtecScheduler::Info_Type_t info_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL)); + RtecScheduler::Info_Type_t info_type); // Internal method to set characteristics of the passed RT_Info. - virtual RtecScheduler::handle_t lookup_i (const char * entry_point) - ACE_THROW_SPEC((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK)); + virtual RtecScheduler::handle_t lookup_i (const char * entry_point); // Internal method to look up a handle for an RT_Info, and return // its handle, or an exception if it's not present. virtual void priority_i (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, - RtecScheduler::Preemption_Priority_t& p_priority) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::UNKNOWN_TASK, - RtecScheduler::NOT_SCHEDULED)); + RtecScheduler::Preemption_Priority_t& p_priority); // Internal method to return the priority and subpriority // values assigned to an RT_Info, based on its handle. @@ -485,10 +375,7 @@ protected: RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type, - RtecScheduler::Dependency_Enabled_Type_t enabled) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL, - RtecScheduler::UNKNOWN_TASK)); + RtecScheduler::Dependency_Enabled_Type_t enabled); // Internal method that registers a dependency between two RT_Infos. // Assumes it is being called with all locks held, and does *not* // set any schedule stability flags. @@ -496,11 +383,7 @@ protected: virtual void remove_dependency_i (RtecScheduler::handle_t handle, RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, - RtecScheduler::Dependency_Type_t dependency_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL, - RtecScheduler::UNKNOWN_TASK)); + RtecScheduler::Dependency_Type_t dependency_type); // Internal method that removes a dependency between two RT_Infos. // Assumes it is being called with all locks held, and does *not* // set any schedule stability flags. @@ -509,11 +392,7 @@ protected: RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type, - RtecScheduler::Dependency_Enabled_Type_t enabled) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::SYNCHRONIZATION_FAILURE, - RtecScheduler::INTERNAL, - RtecScheduler::UNKNOWN_TASK)); + RtecScheduler::Dependency_Enabled_Type_t enabled); // Internal method that enables or disables a dependency between two RT_Infos. // Assumes it is being called with all locks held, and does *not* // set any schedule stability flags. @@ -525,20 +404,14 @@ protected: typename TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type, - RtecScheduler::Dependency_Enabled_Type_t enabled) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL, - RtecScheduler::UNKNOWN_TASK)); + RtecScheduler::Dependency_Enabled_Type_t enabled); // This method installs a dependency in a dependency set map. void unmap_dependency_i (RtecScheduler::handle_t key, RtecScheduler::handle_t handle, typename TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map, CORBA::Long number_of_calls, - RtecScheduler::Dependency_Type_t dependency_type) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL, - RtecScheduler::UNKNOWN_TASK)); + RtecScheduler::Dependency_Type_t dependency_type); // This method removes a dependency from a dependency set map. void map_dependency_enable_state_i (RtecScheduler::handle_t key, @@ -547,76 +420,49 @@ protected: TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type, - RtecScheduler::Dependency_Enabled_Type_t enabled) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL, - RtecScheduler::UNKNOWN_TASK)); + RtecScheduler::Dependency_Enabled_Type_t enabled); // This method updates the enable state of a dependency in a dependency set map. - virtual void dfs_traverse_i (void) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL)); + virtual void dfs_traverse_i (void); // Traverses dependency graph, assigning a topological ordering. // Resets DFS map entries, do DFS traversal, constructs DFS map. - virtual void detect_cycles_i (void) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL, - RtecScheduler::CYCLIC_DEPENDENCIES)); + virtual void detect_cycles_i (void); // Sorts an array of RT_info handles in topological order, then // checks for loops, marks unresolved remote dependencies. - void perform_admission_i (void) - ACE_THROW_SPEC ((RtecScheduler::UTILIZATION_BOUND_EXCEEDED, - CORBA::SystemException, - RtecScheduler::INTERNAL)); + void perform_admission_i (void); // Compute aggregate execution times, then performs admission over // rate tuples. - void crit_dfs_traverse_i (void) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL)); + void crit_dfs_traverse_i (void); // Traverses criticality dependency graph, assigning a topological // ordering. Resets DFS map entries, do DFS traversal, constructs // DFS map. - void propagate_criticalities_i (void) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL)); + void propagate_criticalities_i (void); // Propagates criticalities. - void propagate_characteristics_i (void) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL, - RtecScheduler::UNRESOLVED_LOCAL_DEPENDENCIES, - RtecScheduler::THREAD_SPECIFICATION)); + void propagate_characteristics_i (void); // Propagates effective execution time and period, sets total frame size. - virtual void assign_priorities_i (void) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL, - RtecScheduler::DUPLICATE_NAME)); + virtual void assign_priorities_i (void); // Sort operations by urgency (done by strategy), then assign // priorities and subpriorities in one pass. (Re)computes utilization // and sets last scheduled priority and last feasible priority. - void refresh_tuple_ptr_array_i (void) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL)); + void refresh_tuple_ptr_array_i (void); // Refreshes the array of tuple pointers, corrects the count. /* WSOA merge - commented out - virtual void compute_utilization_i (void) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecScheduler::INTERNAL)); + virtual void compute_utilization_i (void); // Compute utilization, set last feasible priority. - static void init_rt_info (RtecScheduler::RT_Info &rt_info) - ACE_THROW_SPEC ((CORBA::SystemException)); + static void init_rt_info (RtecScheduler::RT_Info &rt_info); // Helper method to give an RT_Info some reasonable default values */ // = Protected class members. @@ -721,8 +567,7 @@ protected: template <class ARRAY_ELEMENT_TYPE> void maintain_scheduling_array (ARRAY_ELEMENT_TYPE ** & current_ptr_array, long & current_ptr_array_size, - RtecScheduler::handle_t handle) - ACE_THROW_SPEC ((CORBA::SystemException)); + RtecScheduler::handle_t handle); // Helper function: makes sure there is room in the scheduling pointer // arrays. This function expands the array eagerly, to minimize time // overhead for memory allocation (at a cost of some unused space). diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp index a943d276918..c4473d5e5fa 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp @@ -24,14 +24,12 @@ TAO::Security::EstablishTrustPolicy::~EstablishTrustPolicy (void) CORBA::PolicyType TAO::Security::EstablishTrustPolicy::policy_type () - ACE_THROW_SPEC ((CORBA::SystemException)) { return ::Security::SecEstablishTrustPolicy; } CORBA::Policy_ptr TAO::Security::EstablishTrustPolicy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Security::EstablishTrustPolicy *policy = 0; ACE_NEW_THROW_EX (policy, @@ -47,13 +45,11 @@ TAO::Security::EstablishTrustPolicy::copy (void) void TAO::Security::EstablishTrustPolicy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } ::Security::EstablishTrust TAO::Security::EstablishTrustPolicy::trust (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->trust_; } diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h index fc9fa6fd086..b53f35a3582 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h @@ -64,20 +64,16 @@ namespace TAO * @name CORBA::Policy Methods */ //@{ - virtual CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyType policy_type (void); - virtual CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr copy (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); //@} /// Return the "establish trust" value associated with this /// policy. - virtual ::Security::EstablishTrust trust (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual ::Security::EstablishTrust trust (void); protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp index cf08adc0434..3d025263540 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp @@ -23,14 +23,12 @@ TAO::Security::QOPPolicy::~QOPPolicy (void) CORBA::PolicyType TAO::Security::QOPPolicy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return ::Security::SecQOPPolicy; } CORBA::Policy_ptr TAO::Security::QOPPolicy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Security::QOPPolicy * policy = 0; ACE_NEW_THROW_EX (policy, @@ -46,13 +44,11 @@ TAO::Security::QOPPolicy::copy (void) void TAO::Security::QOPPolicy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } Security::QOP TAO::Security::QOPPolicy::qop (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->qop_; } diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h index 2eb71919ffb..bd5c87416be 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h @@ -61,20 +61,16 @@ namespace TAO * @name CORBA::Policy Methods */ //@{ - virtual CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyType policy_type (void); - virtual CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr copy (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); //@} /// Return the Quality-of-Protection value associated with this /// policy. - virtual ::Security::QOP qop (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual ::Security::QOP qop (void); protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp index c3322d69bb3..0aa217de136 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp @@ -31,14 +31,12 @@ TAO::SL3::ContextEstablishmentPolicy::~ContextEstablishmentPolicy (void) SecurityLevel3::CredsDirective TAO::SL3::ContextEstablishmentPolicy::creds_directive () - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->creds_directive_; } SecurityLevel3::OwnCredentialsList * TAO::SL3::ContextEstablishmentPolicy::creds_list (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { SecurityLevel3::OwnCredentialsList * creds = 0; @@ -51,42 +49,36 @@ TAO::SL3::ContextEstablishmentPolicy::creds_list (void) SecurityLevel3::FeatureDirective TAO::SL3::ContextEstablishmentPolicy::use_client_auth () - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->use_client_auth_; } SecurityLevel3::FeatureDirective TAO::SL3::ContextEstablishmentPolicy::use_target_auth () - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->use_target_auth_; } SecurityLevel3::FeatureDirective TAO::SL3::ContextEstablishmentPolicy::use_confidentiality () - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->use_confidentiality_; } SecurityLevel3::FeatureDirective TAO::SL3::ContextEstablishmentPolicy::use_integrity () - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->use_integrity_; } CORBA::PolicyType TAO::SL3::ContextEstablishmentPolicy::policy_type () - ACE_THROW_SPEC ((CORBA::SystemException)) { return SecurityLevel3::ContextEstablishmentPolicyType; } CORBA::Policy_ptr TAO::SL3::ContextEstablishmentPolicy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Policy_ptr p = CORBA::Policy::_nil (); ACE_NEW_THROW_EX (p, @@ -104,7 +96,6 @@ TAO::SL3::ContextEstablishmentPolicy::copy (void) void TAO::SL3::ContextEstablishmentPolicy::destroy () - ACE_THROW_SPEC ((CORBA::SystemException)) { this->creds_directive_ = SecurityLevel3::CD_Default; this->creds_list_.length (0); diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h index bd664701111..74065d41b01 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h @@ -65,32 +65,23 @@ namespace TAO * SecurityLevel3::ContextEstablishmentPolicy interface. */ //@{ - virtual SecurityLevel3::CredsDirective creds_directive () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::CredsDirective creds_directive (); - virtual SecurityLevel3::OwnCredentialsList * creds_list () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::OwnCredentialsList * creds_list (); - virtual SecurityLevel3::FeatureDirective use_client_auth () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::FeatureDirective use_client_auth (); - virtual SecurityLevel3::FeatureDirective use_target_auth () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::FeatureDirective use_target_auth (); - virtual SecurityLevel3::FeatureDirective use_confidentiality () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::FeatureDirective use_confidentiality (); - virtual SecurityLevel3::FeatureDirective use_integrity () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::FeatureDirective use_integrity (); - virtual CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyType policy_type (void); - virtual CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr copy (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); //@} protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp index 51a7a41fd9d..9c89692440f 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp @@ -76,7 +76,6 @@ TAO::SL3::CredentialsCurator::_nil (void) SecurityLevel3::AcquisitionMethodList * TAO::SL3::CredentialsCurator::supported_methods (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { SecurityLevel3::AcquisitionMethodList * list; ACE_NEW_THROW_EX (list, @@ -108,7 +107,6 @@ SecurityLevel3::CredentialsAcquirer_ptr TAO::SL3::CredentialsCurator::acquire_credentials ( const char * acquisition_method, const CORBA::Any & acquisition_arguments) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::SL3::CredentialsAcquirerFactory * factory; @@ -125,7 +123,6 @@ TAO::SL3::CredentialsCurator::acquire_credentials ( SecurityLevel3::OwnCredentialsList * TAO::SL3::CredentialsCurator::default_creds_list (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { SecurityLevel3::OwnCredentialsList * list; ACE_NEW_THROW_EX (list, @@ -157,7 +154,6 @@ TAO::SL3::CredentialsCurator::default_creds_list (void) SecurityLevel3::CredentialsIdList * TAO::SL3::CredentialsCurator::default_creds_ids (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { SecurityLevel3::CredentialsIdList * list; ACE_NEW_THROW_EX (list, @@ -188,7 +184,6 @@ TAO::SL3::CredentialsCurator::default_creds_ids (void) SecurityLevel3::OwnCredentials_ptr TAO::SL3::CredentialsCurator::get_own_credentials ( const char * credentials_id) - ACE_THROW_SPEC ((CORBA::SystemException)) { Credentials_Table::ENTRY * entry; @@ -209,7 +204,6 @@ TAO::SL3::CredentialsCurator::get_own_credentials ( void TAO::SL3::CredentialsCurator::release_own_credentials ( const char * credentials_id) - ACE_THROW_SPEC ((CORBA::SystemException)) { Credentials_Table::ENTRY * entry; diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h index db6523f2948..25c932ef5e9 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h @@ -96,26 +96,20 @@ namespace TAO * interface. */ //@{ - virtual SecurityLevel3::AcquisitionMethodList * supported_methods () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::AcquisitionMethodList * supported_methods (); virtual SecurityLevel3::CredentialsAcquirer_ptr acquire_credentials ( const char * acquisition_method, - const CORBA::Any & acquisition_arguments) - ACE_THROW_SPEC ((CORBA::SystemException)); + const CORBA::Any & acquisition_arguments); - virtual SecurityLevel3::OwnCredentialsList * default_creds_list () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::OwnCredentialsList * default_creds_list (); - virtual SecurityLevel3::CredentialsIdList * default_creds_ids () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::CredentialsIdList * default_creds_ids (); virtual SecurityLevel3::OwnCredentials_ptr get_own_credentials ( - const char * credentials_id) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char * credentials_id); - virtual void release_own_credentials (const char * credentials_id) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void release_own_credentials (const char * credentials_id); //@} /// Register CredentialsAcquirer factory. diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp index 96f517b894a..b985cc3809f 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp @@ -22,7 +22,6 @@ TAO::SL3::ObjectCredentialsPolicy::~ObjectCredentialsPolicy (void) SecurityLevel3::OwnCredentialsList * TAO::SL3::ObjectCredentialsPolicy::creds_list (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { SecurityLevel3::OwnCredentialsList * creds = 0; @@ -35,14 +34,12 @@ TAO::SL3::ObjectCredentialsPolicy::creds_list (void) CORBA::PolicyType TAO::SL3::ObjectCredentialsPolicy::policy_type () - ACE_THROW_SPEC ((CORBA::SystemException)) { return SecurityLevel3::ObjectCredentialsPolicyType; } CORBA::Policy_ptr TAO::SL3::ObjectCredentialsPolicy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Policy_ptr p = CORBA::Policy::_nil (); ACE_NEW_THROW_EX (p, @@ -54,7 +51,6 @@ TAO::SL3::ObjectCredentialsPolicy::copy (void) void TAO::SL3::ObjectCredentialsPolicy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->creds_list_.length (0); } diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h index 03741cd8e89..f45f789aaaf 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h @@ -65,17 +65,13 @@ namespace TAO * SecurityLevel3::ObjectCredentialsPolicy interface. */ //@{ - virtual SecurityLevel3::OwnCredentialsList * creds_list () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::OwnCredentialsList * creds_list (); - virtual CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyType policy_type (void); - virtual CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr copy (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); //@} protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp index 46673a4f17d..5dc9964d384 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp @@ -15,8 +15,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Policy_ptr TAO::SL3::PolicyFactory::create_policy (CORBA::PolicyType type, const CORBA::Any & value) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)) { CORBA::Policy_ptr policy = CORBA::Policy::_nil (); diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h index e770e7d697b..9804c3013c5 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h @@ -61,9 +61,7 @@ namespace TAO /// Construct a Test::Policy object as a test. virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, - const CORBA::Any & value) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)); + const CORBA::Any & value); //@} diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp index b1190ade3b2..faec8ac6679 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp @@ -28,7 +28,6 @@ TAO::SL3::SecurityCurrent::~SecurityCurrent (void) SecurityLevel3::ClientCredentials_ptr TAO::SL3::SecurityCurrent::client_credentials (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::SL3::SecurityCurrent_Impl * impl = this->implementation (); @@ -43,7 +42,6 @@ TAO::SL3::SecurityCurrent::client_credentials (void) CORBA::Boolean TAO::SL3::SecurityCurrent::request_is_local (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::SL3::SecurityCurrent_Impl * impl = this->implementation (); diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h index ee33fdb8452..08bfa48a9d3 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h @@ -69,11 +69,9 @@ namespace TAO * interface. */ //@{ - virtual SecurityLevel3::ClientCredentials_ptr client_credentials () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::ClientCredentials_ptr client_credentials (); - virtual CORBA::Boolean request_is_local (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean request_is_local (void); //@} /// Return the TSS slot ID assigned to the "SecurityCurrent" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h index ab07794ba60..3ad7d0f6e0a 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h @@ -61,11 +61,11 @@ namespace TAO /// Return the Credentials received from the client associate with /// the current request. virtual SecurityLevel3::ClientCredentials_ptr client_credentials () - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; /// Is the current request local? virtual CORBA::Boolean request_is_local () - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; //@} /// Return the unique tag that identifies the concrete subclass. diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp index 4053a5c4664..bb9f8b58bbb 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp @@ -24,7 +24,6 @@ TAO::SL3::SecurityManager::~SecurityManager (void) SecurityLevel3::CredentialsCurator_ptr TAO::SL3::SecurityManager::credentials_curator () - ACE_THROW_SPEC ((CORBA::SystemException)) { return SecurityLevel3::CredentialsCurator::_duplicate ( @@ -33,7 +32,6 @@ TAO::SL3::SecurityManager::credentials_curator () SecurityLevel3::TargetCredentials_ptr TAO::SL3::SecurityManager::get_target_credentials (CORBA::Object_ptr /* the_object */) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } @@ -46,7 +44,6 @@ TAO::SL3::SecurityManager::create_context_estab_policy ( SecurityLevel3::FeatureDirective use_target_auth, SecurityLevel3::FeatureDirective use_confidentiality, SecurityLevel3::FeatureDirective use_integrity) - ACE_THROW_SPEC ((CORBA::SystemException)) { SecurityLevel3::ContextEstablishmentPolicy_ptr policy; ACE_NEW_THROW_EX (policy, @@ -64,7 +61,6 @@ TAO::SL3::SecurityManager::create_context_estab_policy ( SecurityLevel3::ObjectCredentialsPolicy_ptr TAO::SL3::SecurityManager::create_object_creds_policy ( const SecurityLevel3::OwnCredentialsList & creds_list) - ACE_THROW_SPEC ((CORBA::SystemException)) { SecurityLevel3::ObjectCredentialsPolicy_ptr policy; ACE_NEW_THROW_EX (policy, diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h index 716345d94ed..4bd46f9ea20 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h @@ -60,12 +60,10 @@ namespace TAO * interface. */ //@{ - virtual SecurityLevel3::CredentialsCurator_ptr credentials_curator () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel3::CredentialsCurator_ptr credentials_curator (); virtual SecurityLevel3::TargetCredentials_ptr get_target_credentials ( - CORBA::Object_ptr the_object) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Object_ptr the_object); virtual SecurityLevel3::ContextEstablishmentPolicy_ptr create_context_estab_policy ( @@ -74,13 +72,11 @@ namespace TAO SecurityLevel3::FeatureDirective use_client_auth, SecurityLevel3::FeatureDirective use_target_auth, SecurityLevel3::FeatureDirective use_confidentiality, - SecurityLevel3::FeatureDirective use_integrity) - ACE_THROW_SPEC ((CORBA::SystemException)); + SecurityLevel3::FeatureDirective use_integrity); virtual SecurityLevel3::ObjectCredentialsPolicy_ptr create_object_creds_policy ( - const SecurityLevel3::OwnCredentialsList & cred_list) - ACE_THROW_SPEC ((CORBA::SystemException)); + const SecurityLevel3::OwnCredentialsList & cred_list); //@} protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp index 9aa967a3dfc..32cfdbcdd66 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp @@ -28,7 +28,6 @@ TAO_Security_Current::~TAO_Security_Current (void) Security::AttributeList * TAO_Security_Current::get_attributes ( const Security::AttributeTypeList &attributes) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Security::Current_Impl *impl = this->implementation (); @@ -43,7 +42,6 @@ TAO_Security_Current::get_attributes ( SecurityLevel2::ReceivedCredentials_ptr TAO_Security_Current::received_credentials () - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Security::Current_Impl *impl = this->implementation (); diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h index eeed650d20b..847ad9a85fd 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h @@ -63,8 +63,7 @@ public: /// Return the security attributes corresponding to the types in the /// given attribute type list associated with the current request. virtual Security::AttributeList * get_attributes ( - const Security::AttributeTypeList & attributes) - ACE_THROW_SPEC ((CORBA::SystemException)); + const Security::AttributeTypeList & attributes); //@} /** @@ -76,8 +75,7 @@ public: //@{ /// Return the Credentials received from the client associate with /// the current request. - virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials (); //@} /// Return the TSS slot ID assigned to the "SecurityCurrent" object. diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h index a0cfbaccbee..3c4d5846b56 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h @@ -62,7 +62,7 @@ namespace TAO /// request. virtual ::Security::AttributeList * get_attributes ( const ::Security::AttributeTypeList & attributes) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; //@} /** @@ -75,7 +75,7 @@ namespace TAO /// Return the Credentials received from the client associate with /// the current request. virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials () - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; //@} /// Return the unique tag that identifies the concrete subclass. diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp index e7830c498cc..970aff6e1dd 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp @@ -23,7 +23,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO::Security::ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Narrow to a TAO_ORBInitInfo object to get access to the // allocate_tss_slot_id() TAO extension. @@ -129,7 +128,6 @@ TAO::Security::ORBInitializer::pre_init ( void TAO::Security::ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_policy_factories (info); } diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h index 758b02e6227..484ca9ee043 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h @@ -69,11 +69,9 @@ namespace TAO * interface. */ //@{ - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); //@} private: diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp index 13b460849a1..4d0ff92fb13 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp @@ -23,8 +23,6 @@ CORBA::Policy_ptr TAO::Security::PolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &value) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)) { // Not all security policies can be created using the // ORB::create_policy() mechanism. Only those that can be created diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h index 9d460b2998b..336d9523d21 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h @@ -53,9 +53,7 @@ namespace TAO public: virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, - const CORBA::Any & value) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)); + const CORBA::Any & value); }; } // End Security namespace diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp index 9df87c4087f..94afc1b68c8 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp @@ -21,7 +21,6 @@ TAO_TIO::~TAO_TIO (void) TimeBase::IntervalT TAO_TIO::time_interval (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return attr_time_interval; } @@ -35,7 +34,6 @@ TAO_TIO::time_interval (void) CosTime::OverlapType TAO_TIO::spans (CosTime::UTO_ptr uto, CosTime::TIO_out overlap) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TIO *tio = 0; @@ -148,7 +146,6 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, CosTime::OverlapType TAO_TIO::overlaps (CosTime::TIO_ptr tio, CosTime::TIO_out overlap) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TIO *tio_i = 0; @@ -240,7 +237,6 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio, CosTime::UTO_ptr TAO_TIO::time (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_UTO *uto = 0; diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h index fb67c5abc65..6becb566a77 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h @@ -46,8 +46,7 @@ public: ~TAO_TIO (void); /// This is the get method for the attribute time interval. - virtual TimeBase::IntervalT time_interval () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual TimeBase::IntervalT time_interval (); /** * This operation returns a value of type OverlapType depending on @@ -58,8 +57,7 @@ public: * intervals. */ virtual CosTime::OverlapType spans (CosTime::UTO_ptr time, - CosTime::TIO_out overlap) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosTime::TIO_out overlap); /** * This operation returns a value of type OverlapType depending on @@ -69,16 +67,14 @@ public: * out parameter contains the gap between the two intervals. */ virtual CosTime::OverlapType overlaps (CosTime::TIO_ptr interval, - CosTime::TIO_out overlap) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosTime::TIO_out overlap); /** * Returns a UTO in which the inaccuracy interval is equal to the * time interval in the TIO and time value is the midpoint of the * interval. */ - virtual CosTime::UTO_ptr time (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosTime::UTO_ptr time (void); private: /// This attribute returns an IntervalT structure with the values of diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp index a5beeef1071..dca1d520b5e 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp @@ -41,8 +41,6 @@ TAO_Time_Service_Clerk::~TAO_Time_Service_Clerk (void) CosTime::UTO_ptr TAO_Time_Service_Clerk::universal_time (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTime::TimeUnavailable)) { TAO_UTO *uto = 0; @@ -62,8 +60,6 @@ TAO_Time_Service_Clerk::universal_time (void) CosTime::UTO_ptr TAO_Time_Service_Clerk::secure_universal_time (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTime::TimeUnavailable)) { throw CORBA::NO_IMPLEMENT (); } @@ -74,7 +70,6 @@ CosTime::UTO_ptr TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time, TimeBase::InaccuracyT inaccuracy, TimeBase::TdfT tdf) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_UTO *uto = 0; @@ -91,7 +86,6 @@ TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time, CosTime::UTO_ptr TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_UTO *uto = 0; @@ -115,7 +109,6 @@ TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc) CosTime::TIO_ptr TAO_Time_Service_Clerk::new_interval (TimeBase::TimeT lower, TimeBase::TimeT upper) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TIO *tio = 0; diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h index b9938706055..57e2dc4e56f 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h @@ -60,9 +60,7 @@ public: /// This operation returns the global time and an estimate of /// inaccuracy in a UTO. - virtual CosTime::UTO_ptr universal_time (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTime::TimeUnavailable)); + virtual CosTime::UTO_ptr universal_time (void); /** * This operation returns the global time in a UTO only if the time @@ -70,24 +68,19 @@ public: * operation is not implemented and throws a CORBA::NO_IMPLEMENT * exception, if called. */ - virtual CosTime::UTO_ptr secure_universal_time (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTime::TimeUnavailable)); + virtual CosTime::UTO_ptr secure_universal_time (void); /// This creates a new UTO based on the given parameters. virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time, TimeBase::InaccuracyT inaccuracy, - TimeBase::TdfT tdf) - ACE_THROW_SPEC ((CORBA::SystemException)); + TimeBase::TdfT tdf); /// This creates a new UTO given a time in the UtcT form. - virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc); /// This creates a new TIO with the given parameters. virtual CosTime::TIO_ptr new_interval (TimeBase::TimeT lower, - TimeBase::TimeT upper) - ACE_THROW_SPEC ((CORBA::SystemException)); + TimeBase::TimeT upper); /// Return the globally synchronized time. virtual CORBA::ULongLong get_time (void); diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp index 3a76a856761..25cca8b0475 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp @@ -28,8 +28,6 @@ TAO_Time_Service_Server::~TAO_Time_Service_Server (void) CosTime::UTO_ptr TAO_Time_Service_Server::universal_time (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTime::TimeUnavailable)) { TAO_UTO *uto = 0; @@ -57,8 +55,6 @@ TAO_Time_Service_Server::universal_time (void) CosTime::UTO_ptr TAO_Time_Service_Server::secure_universal_time (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTime::TimeUnavailable)) { throw CORBA::NO_IMPLEMENT (); } @@ -69,7 +65,6 @@ CosTime::UTO_ptr TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time, TimeBase::InaccuracyT inaccuracy, TimeBase::TdfT tdf) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_UTO *uto = 0; @@ -86,7 +81,6 @@ TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time, CosTime::UTO_ptr TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_UTO *uto = 0; @@ -104,7 +98,6 @@ TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc) CosTime::TIO_ptr TAO_Time_Service_Server::new_interval (TimeBase::TimeT lower, TimeBase::TimeT upper) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TIO *tio = 0; diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h index 1bc33a07e4f..3fea331bbd9 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h @@ -48,33 +48,26 @@ public: /// This operation returns the current system time and an estimate of /// inaccuracy in a UTO. - virtual CosTime::UTO_ptr universal_time (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTime::TimeUnavailable)); + virtual CosTime::UTO_ptr universal_time (void); /** * This operation returns the current time in a UTO only if the time * can be guaranteed to have been obtained securely. Currently this operation * is not implemented and throws a CORBA::NO_IMPLEMENT exception, if called. */ - virtual CosTime::UTO_ptr secure_universal_time (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTime::TimeUnavailable)); + virtual CosTime::UTO_ptr secure_universal_time (void); /// This creates a new UTO based on the given parameters. virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time, TimeBase::InaccuracyT inaccuracy, - TimeBase::TdfT tdf) - ACE_THROW_SPEC ((CORBA::SystemException)); + TimeBase::TdfT tdf); /// This creates a new UTO given a time in the UtcT form. - virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc); /// This creates a new TIO with the given parameters. virtual CosTime::TIO_ptr new_interval (TimeBase::TimeT lower, - TimeBase::TimeT upper) - ACE_THROW_SPEC ((CORBA::SystemException)); + TimeBase::TimeT upper); }; diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp index 0d4f0eaefe0..1572866de25 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp @@ -48,7 +48,6 @@ TAO_UTO::~TAO_UTO (void) TimeBase::TimeT TAO_UTO::time (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return attr_utc_time_.time; } @@ -57,7 +56,6 @@ TAO_UTO::time (void) TimeBase::InaccuracyT TAO_UTO::inaccuracy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Construct the Inaccuracy from the // inacchi and inacclo. @@ -72,7 +70,6 @@ TAO_UTO::inaccuracy (void) TimeBase::TdfT TAO_UTO::tdf (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return attr_utc_time_.tdf; } @@ -81,7 +78,6 @@ TAO_UTO::tdf (void) TimeBase::UtcT TAO_UTO::utc_time (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return attr_utc_time_; } @@ -91,7 +87,6 @@ TAO_UTO::utc_time (void) CosTime::UTO_ptr TAO_UTO::absolute_time (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CosTime::UTO::_nil (); } @@ -102,7 +97,6 @@ TAO_UTO::absolute_time (void) CosTime::TimeComparison TAO_UTO::compare_time (CosTime::ComparisonType comparison_type, CosTime::UTO_ptr uto) - ACE_THROW_SPEC ((CORBA::SystemException)) { TimeBase::TimeT uto_time = uto->time (); @@ -161,7 +155,6 @@ TAO_UTO::compare_time (CosTime::ComparisonType comparison_type, CosTime::TIO_ptr TAO_UTO::time_to_interval (CosTime::UTO_ptr uto) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TIO *tio = 0; @@ -200,7 +193,6 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto) CosTime::TIO_ptr TAO_UTO::interval (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TIO *tio = 0; diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h index daa20dfffb2..312b5dad5b3 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h @@ -54,35 +54,29 @@ public: ~TAO_UTO (void); /// For the readonly attribute <time>. - virtual TimeBase::TimeT time () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual TimeBase::TimeT time (); /// For the readonly attribute <inaccuracy>. - virtual TimeBase::InaccuracyT inaccuracy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual TimeBase::InaccuracyT inaccuracy (void); /// For the readonly attribute <tdf>, which is the "time displacement /// factor". - virtual TimeBase::TdfT tdf (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual TimeBase::TdfT tdf (void); /// For the readonly attribute <utc_time>. - virtual TimeBase::UtcT utc_time (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual TimeBase::UtcT utc_time (void); /** * Absolute time = Relative time + Base time. * ?? Find out more about the Base Time, UTC and * Distributed Time Sync. Algos. [3 */ - CosTime::UTO_ptr absolute_time (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosTime::UTO_ptr absolute_time (void); /// Compares the time contained in the object with the time in the /// supplied uto according to the supplied comparison type. CosTime::TimeComparison compare_time (CosTime::ComparisonType comparison_type, - CosTime::UTO_ptr uto) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosTime::UTO_ptr uto); /** * Returns a TIO representing the time interval between the time in @@ -91,13 +85,11 @@ public: * two UTOs. Inaccuracies are ignored. Note the result of this * operation is meaningless if the base times of UTOs are different. */ - CosTime::TIO_ptr time_to_interval (CosTime::UTO_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosTime::TIO_ptr time_to_interval (CosTime::UTO_ptr); /// Returns a TIO object representing the error interval around the /// time value in the UTO. - CosTime::TIO_ptr interval (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosTime::TIO_ptr interval (void); private: /** diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp index b3bf71083c7..c36317d1a59 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp @@ -15,8 +15,6 @@ TAO_Constraint_Interpreter::TAO_Constraint_Interpreter ( const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts, const char* constraints ) - ACE_THROW_SPEC ((CosTrading::IllegalConstraint, - CORBA::NO_MEMORY)) : TAO_Interpreter () { // @@ Throwing Exception from constructor is very nasty situation to @@ -43,8 +41,6 @@ TAO_Constraint_Interpreter::TAO_Constraint_Interpreter ( TAO_Constraint_Interpreter:: TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator, const char* constraints) - ACE_THROW_SPEC ((CosTrading::IllegalConstraint, - CORBA::NO_MEMORY)) { if (TAO_Interpreter::is_empty_string (constraints)) { @@ -83,8 +79,6 @@ TAO_Preference_Interpreter::TAO_Preference_Interpreter ( const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts, const char* preference ) - ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference, - CORBA::NO_MEMORY)) : TAO_Interpreter () { TAO_Trader_Constraint_Validator type_checker (ts); @@ -108,8 +102,6 @@ TAO_Preference_Interpreter::TAO_Preference_Interpreter ( TAO_Preference_Interpreter:: TAO_Preference_Interpreter (TAO_Constraint_Validator& validator, const char* preference) - ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference, - CORBA::NO_MEMORY)) : TAO_Interpreter () { if (TAO_Interpreter::is_empty_string (preference)) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h index 32e46a62abf..4650d015089 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h @@ -48,9 +48,7 @@ class TAO_Trading_Serv_Export TAO_Constraint_Interpreter : public TAO_Interprete public: // = Initialization and termination methods. TAO_Constraint_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts, - const char* constraints) - ACE_THROW_SPEC ((CosTrading::IllegalConstraint, - CORBA::NO_MEMORY)); + const char* constraints); /** * This constructor builds an expression tree representing the @@ -59,9 +57,7 @@ public: * semantic errors, such as mismatched types. */ TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator, - const char* constraints) - ACE_THROW_SPEC ((CosTrading::IllegalConstraint, - CORBA::NO_MEMORY)); + const char* constraints); /// Destructor ~TAO_Constraint_Interpreter (void); @@ -93,9 +89,7 @@ class TAO_Trading_Serv_Export TAO_Preference_Interpreter : public TAO_Interprete public: // = Initialization and termination methods. TAO_Preference_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts, - const char* preference) - ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference, - CORBA::NO_MEMORY)); + const char* preference); /** * Parse the preference string, determining first if it's @@ -103,9 +97,7 @@ public: * doesn't conform to the BNF grammar for preferences. */ TAO_Preference_Interpreter (TAO_Constraint_Validator& validator, - const char* preference) - ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference, - CORBA::NO_MEMORY)); + const char* preference); /// Destructor ~TAO_Preference_Interpreter(void); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp index 7f3b9c5190d..6dcd797dc16 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp @@ -9,7 +9,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::TCKind TAO_Sequence_Extracter_Base:: sequence_type (CORBA::TypeCode* type_code) - ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Seth, why do you use a comma to separate the two statements? CORBA::TCKind return_value = CORBA::tk_void, diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h index fe86953e15f..7045cbc1840 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h @@ -86,8 +86,7 @@ class TAO_Sequence_Extracter_Base { public: - static CORBA::TCKind sequence_type (CORBA::TypeCode* code) - ACE_THROW_SPEC ((CORBA::SystemException)); + static CORBA::TCKind sequence_type (CORBA::TypeCode* code); // Return the sequence element type for the sequence whose typecode // is <code>. }; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp index 6120de02e60..be521123e22 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp @@ -151,8 +151,6 @@ remove_offer (const char* type, CORBA::ULong id) template <class LOCK_TYPE> int TAO_Offer_Database<LOCK_TYPE>:: remove_offer (const CosTrading::OfferId offer_id) - ACE_THROW_SPEC ((CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId)) { char* stype = 0; CORBA::ULong index; @@ -172,8 +170,6 @@ template <class LOCK_TYPE> CosTrading::Offer* TAO_Offer_Database<LOCK_TYPE>:: lookup_offer (const CosTrading::OfferId offer_id, char*& type_name) - ACE_THROW_SPEC ((CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId)) { CORBA::ULong index; CosTrading::Offer* offer = 0; @@ -189,8 +185,6 @@ lookup_offer (const CosTrading::OfferId offer_id, template <class LOCK_TYPE> CosTrading::Offer* TAO_Offer_Database<LOCK_TYPE>:: lookup_offer (const CosTrading::OfferId offer_id) - ACE_THROW_SPEC ((CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId)) { char* type_name; CORBA::ULong index; @@ -269,7 +263,6 @@ TAO_Offer_Database<LOCK_TYPE>:: parse_offer_id (const CosTrading::OfferId offer_id, char*&service_type, CORBA::ULong& id) - ACE_THROW_SPEC ((CosTrading::IllegalOfferId)) { // Get service type: it is everything from 17th character to the end. service_type = (char *) offer_id + 16; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h index 5a8f5d56395..3d5dc93fad2 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h @@ -66,15 +66,11 @@ public: CosTrading::OfferId insert_offer (const char* type, CosTrading::Offer* offer); - int remove_offer (const CosTrading::OfferId offer_id) - ACE_THROW_SPEC ((CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId)); + int remove_offer (const CosTrading::OfferId offer_id); /// Lookup an offer whose offer_id is <offer_id>, and return /// it. Otherwise, throw the appropriate exception. - CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id) - ACE_THROW_SPEC ((CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId)); + CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id); /** * Lookup an offer whose OfferId is <offer_id> and return in @@ -82,9 +78,7 @@ public: * pointer to a location in offer_id, so DON'T DELETE IT. */ CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id, - char*& type_name) - ACE_THROW_SPEC ((CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId)); + char*& type_name); /// Return an iterator that will traverse and return all the offer /// ids in the service type map. @@ -135,8 +129,7 @@ private: /// and id that were used to generate the offer id. static void parse_offer_id (const CosTrading::OfferId offer_id, char* &service_type, - CORBA::ULong& id) - ACE_THROW_SPEC ((CosTrading::IllegalOfferId)); + CORBA::ULong& id); // = Disallow these operations. ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Offer_Database<LOCK_TYPE> &)) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp index 234a828edcb..f8a41ab797b 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp @@ -17,7 +17,6 @@ TAO_Offer_Iterator::~TAO_Offer_Iterator (void) void TAO_Offer_Iterator::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Remove self from POA @@ -50,8 +49,6 @@ TAO_Query_Only_Offer_Iterator::add_offer (CosTrading::OfferId offer_id, CORBA::ULong TAO_Query_Only_Offer_Iterator::max_left (void) - ACE_THROW_SPEC((CORBA::SystemException, - CosTrading::UnknownMaxLeft)) { return static_cast<CORBA::ULong> (this->offers_.size ()); } @@ -59,7 +56,6 @@ TAO_Query_Only_Offer_Iterator::max_left (void) CORBA::Boolean TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n, CosTrading::OfferSeq_out offers) - ACE_THROW_SPEC ((CORBA::SystemException)) { offers = new CosTrading::OfferSeq; @@ -115,7 +111,6 @@ add_offer_iterator (CosTrading::OfferIterator_ptr offer_iter) CORBA::Boolean TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n, CosTrading::OfferSeq_out offers) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong offers_left = n; CORBA::Boolean return_value = 1; @@ -167,7 +162,6 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n, void TAO_Offer_Iterator_Collection::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy all iterators in the collection. for (Offer_Iters::ITERATOR iters_iter (this->iters_); @@ -193,8 +187,6 @@ TAO_Offer_Iterator_Collection::destroy (void) CORBA::ULong TAO_Offer_Iterator_Collection::max_left (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::UnknownMaxLeft)) { throw CosTrading::UnknownMaxLeft(); } @@ -220,15 +212,12 @@ TAO_Offer_Id_Iterator::~TAO_Offer_Id_Iterator (void) CORBA::ULong TAO_Offer_Id_Iterator::max_left (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::UnknownMaxLeft)) { return static_cast<CORBA::ULong> (this->ids_.size ()); } void TAO_Offer_Id_Iterator::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Remove self from POA @@ -244,7 +233,6 @@ TAO_Offer_Id_Iterator::destroy (void) CORBA::Boolean TAO_Offer_Id_Iterator::next_n (CORBA::ULong n, CosTrading::OfferIdSeq_out _ids) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Calculate the number of Ids to be returned in this. CORBA::ULong items_left = static_cast<CORBA::ULong> (this->ids_.size()); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h index a9508b81998..6b0ca4fdc7b 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h @@ -59,8 +59,7 @@ public: * destroyed. * END SPEC */ - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); /// Add an offer to the collection of offers the iterator will /// iterate over. @@ -68,8 +67,7 @@ public: const CosTrading::Offer* offer) = 0; virtual CORBA::ULong max_left (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::UnknownMaxLeft)) = 0; + = 0; // BEGIN SPEC // The max_left operation returns the number of service offers @@ -95,7 +93,7 @@ public: */ virtual CORBA::Boolean next_n (CORBA::ULong n, CosTrading::OfferSeq_out offers) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; protected: TAO_Offer_Iterator& operator=(const TAO_Offer_Iterator&); @@ -132,13 +130,10 @@ public: /// Deposit at maximum n offers into the return sequence and return 1, /// or return 0 if the iterator is done and no offers are returned. virtual CORBA::Boolean next_n (CORBA::ULong n, - CosTrading::OfferSeq_out offers) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosTrading::OfferSeq_out offers); /// Return the number of items left in the iterator. - virtual CORBA::ULong max_left (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::UnknownMaxLeft)); + virtual CORBA::ULong max_left (void); /// Add an offer the iterator should iterate over. void add_offer (CosTrading::OfferId offer_id, @@ -185,17 +180,13 @@ public: /// Retrieve n offers from the set of iterators. virtual CORBA::Boolean next_n (CORBA::ULong n, - CosTrading::OfferSeq_out offers) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosTrading::OfferSeq_out offers); /// Destroy the collection of iterators. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); /// Determine how many offers are left in the collection. - virtual CORBA::ULong max_left (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::UnknownMaxLeft)); + virtual CORBA::ULong max_left (void); /// Add an iterator to the collection. void add_offer_iterator (CosTrading::OfferIterator_ptr offer_iter); @@ -245,17 +236,14 @@ class TAO_Offer_Id_Iterator : * identifiers (e.g., if the iterator determines its set of offer * identifiers through lazy evaluation). */ - virtual CORBA::ULong max_left(void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::UnknownMaxLeft)); + virtual CORBA::ULong max_left(void); /** * The destroy operation destroys the iterator. No further * operations can be invoked on an iterator after it has been * destroyed. */ - virtual void destroy(void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy(void); /** * The next_n operation returns a set of offer identifiers in the @@ -270,8 +258,7 @@ class TAO_Offer_Id_Iterator : * further offer identifiers to be extracted. */ virtual CORBA::Boolean next_n(CORBA::ULong _n, - CosTrading::OfferIdSeq_out _ids) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosTrading::OfferIdSeq_out _ids); /// Insert a <new_id> into the contents of the iterator. void insert_id(CosTrading::OfferId new_id); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp index 1deb800e3a0..a1b62b70615 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp @@ -40,8 +40,6 @@ add_offer (CosTrading::OfferId id, template <class MAP_LOCK_TYPE> CORBA::ULong TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>:: max_left (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::UnknownMaxLeft)) { return static_cast<CORBA::ULong> (this->offer_ids_.size ()); } @@ -50,7 +48,6 @@ template <class MAP_LOCK_TYPE> CORBA::Boolean TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>:: next_n (CORBA::ULong n, CosTrading::OfferSeq_out offers) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong ret_offers = 0; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h index f988790a61f..69fdcd1403c 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h @@ -55,8 +55,7 @@ public: /// Deposit at maximum n offers into the return sequence and return 1, /// or return 0 if the iterator is done and no offers are returned. virtual CORBA::Boolean next_n (CORBA::ULong n, - CosTrading::OfferSeq_out offers) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosTrading::OfferSeq_out offers); /** * Throws CosTrading::UnknownMaxLeft since with the presence of @@ -64,9 +63,7 @@ public: * the trader will have all the offers it has now when the time * to return them comes. */ - virtual CORBA::ULong max_left (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::UnknownMaxLeft)); + virtual CORBA::ULong max_left (void); /// Add an offer the iterator should iterate over. void add_offer (CosTrading::OfferId id, diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp index 2af97d90c98..35086538dd9 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp @@ -46,7 +46,6 @@ TAO_Service_Type_Repository::~TAO_Service_Type_Repository (void) CosTradingRepos::ServiceTypeRepository::IncarnationNumber TAO_Service_Type_Repository::incarnation (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosTradingRepos::ServiceTypeRepository::IncarnationNumber inc_num; @@ -71,15 +70,6 @@ add_type (const char *name, const char *if_name, const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props, const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, - CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition, - CosTrading::UnknownServiceType, - CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName)) { Prop_Map prop_map; Service_Type_Map super_map; @@ -152,10 +142,6 @@ add_type (const char *name, void TAO_Service_Type_Repository::remove_type (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTradingRepos::ServiceTypeRepository::HasSubTypes)) { if (TAO_Trader_Base::is_valid_identifier_name (name) == 0) throw CosTrading::IllegalServiceType (name); @@ -181,7 +167,6 @@ TAO_Service_Type_Repository::remove_type (const char *name) CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq * TAO_Service_Type_Repository:: list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); @@ -225,9 +210,6 @@ list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes CosTradingRepos::ServiceTypeRepository::TypeStruct * TAO_Service_Type_Repository:: describe_type (const char * name) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType)) { if (TAO_Trader_Base::is_valid_identifier_name (name) == 0) ACE_THROW_RETURN @@ -272,9 +254,6 @@ describe_type (const char * name) CosTradingRepos::ServiceTypeRepository::TypeStruct * TAO_Service_Type_Repository:: fully_describe_type (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType)) { if (TAO_Trader_Base::is_valid_identifier_name (name) == 0) throw CosTrading::IllegalServiceType (name); @@ -314,10 +293,6 @@ fully_describe_type (const char *name) void TAO_Service_Type_Repository:: mask_type (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTradingRepos::ServiceTypeRepository::AlreadyMasked)) { if (TAO_Trader_Base::is_valid_identifier_name (name) == 0) throw CosTrading::IllegalServiceType (name); @@ -344,10 +319,6 @@ mask_type (const char *name) void TAO_Service_Type_Repository:: unmask_type (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTradingRepos::ServiceTypeRepository::NotMasked)) { if (TAO_Trader_Base::is_valid_identifier_name (name) == 0) throw CosTrading::IllegalServiceType (name); @@ -477,8 +448,6 @@ void TAO_Service_Type_Repository:: validate_properties (Prop_Map &prop_map, const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props) - ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName)) { for (CORBA::ULong i = 0; i < props.length (); @@ -504,9 +473,6 @@ void TAO_Service_Type_Repository:: validate_supertypes (Service_Type_Map &super_map, const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types) - ACE_THROW_SPEC ((CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName)) { for (CORBA::ULong i = 0; i < super_types.length (); @@ -540,7 +506,6 @@ void TAO_Service_Type_Repository:: validate_inheritance (Prop_Map &prop_map, const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types) - ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition)) { CORBA::ULong num_super_types = super_types.length (); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h index e2f1ff9de94..ab7697a9024 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h @@ -43,8 +43,7 @@ public: ~TAO_Service_Type_Repository (void); virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber - incarnation (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + incarnation (void); /** * BEGIN SPEC @@ -59,16 +58,7 @@ public: add_type (const char *name, const char *if_name, const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props, - const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, - CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition, - CosTrading::UnknownServiceType, - CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName)); + const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types); // If the type creation is successful, an incarnation number is // returned as the value of the operation. Incarnation numbers are @@ -115,15 +105,10 @@ public: * "name" has a service type which has been derived from it, then * the HasSubTypes exception is raised. END SPEC */ - virtual void remove_type (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTradingRepos::ServiceTypeRepository::HasSubTypes)); + virtual void remove_type (const char *name); virtual CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq * - list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types) - ACE_THROW_SPEC ((CORBA::SystemException)); + list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types); // BEGIN SPEC // The list_types operation permits a client to obtain the names of @@ -146,10 +131,7 @@ public: * END SPEC */ virtual CosTradingRepos::ServiceTypeRepository::TypeStruct * - describe_type (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType)); + describe_type (const char *name); /** * BEGIN SPEC @@ -165,10 +147,7 @@ public: * END SPEC */ virtual CosTradingRepos::ServiceTypeRepository::TypeStruct * - fully_describe_type (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType)); + fully_describe_type (const char *name); /** * BEGIN SPEC @@ -184,11 +163,7 @@ public: * exception is raised. * END SPEC */ - virtual void mask_type (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTradingRepos::ServiceTypeRepository::AlreadyMasked)); + virtual void mask_type (const char *name); /** * BEGIN SPEC @@ -202,11 +177,7 @@ public: * exception is raised. * END SPEC */ - virtual void unmask_type (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTradingRepos::ServiceTypeRepository::NotMasked)); + virtual void unmask_type (const char *name); private: @@ -261,22 +232,16 @@ private: /// Confirm that the properties in props have valid names, and aren't /// duplicated. Cram those properties into the prop_map. void validate_properties (Prop_Map &prop_map, - const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props) - ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName)); + const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props); /// Confirm that the each super type exists, and cram them into super_map. void validate_supertypes (Service_Type_Map &super_map, - const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types) - ACE_THROW_SPEC ((CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName)); + const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types); /// Ensure that properties of a super_type aren't having their types /// or retstrictions redefined. void validate_inheritance (Prop_Map &prop_map, - const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types) - ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition)); + const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types); // void validate_interface (const char *if_name, // Service_Type_Map &super_map, diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp index 00fee26edc4..90b09d487da 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp @@ -48,17 +48,6 @@ query (const char *type, CosTrading::OfferSeq_out returned_offers, CosTrading::OfferIterator_out returned_offer_iterator, CosTrading::PolicyNameSeq_out returned_limits_applied) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::IllegalConstraint, - CosTrading::Lookup::IllegalPreference, - CosTrading::Lookup::IllegalPolicyName, - CosTrading::Lookup::PolicyTypeMismatch, - CosTrading::Lookup::InvalidPolicyValue, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTrading::DuplicatePolicyName)) { // Instantiate a class to help interpret query policies. TAO_Policies policies (this->trader_, in_policies); @@ -333,8 +322,6 @@ fill_receptacles (const char* /* type */, TAO_Preference_Interpreter& pref_inter, CosTrading::OfferSeq& offers, CosTrading::OfferIterator_ptr& offer_itr) - ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName)) { // BEGIN SPEC // The returned offers are passed back in one of two ways (or a @@ -465,8 +452,6 @@ TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: retrieve_links (TAO_Policies& policies, CORBA::ULong offers_returned, CosTrading::LinkNameSeq_out links) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::Lookup::PolicyTypeMismatch)) { CORBA::Boolean should_follow = 0; CosTrading::FollowOption follow_rule = policies.link_follow_rule (); @@ -541,17 +526,6 @@ federated_query (const CosTrading::LinkNameSeq& links, CosTrading::OfferSeq& offers, CosTrading::OfferIterator_ptr& offer_iter, CosTrading::PolicyNameSeq& limits) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::IllegalConstraint, - CosTrading::Lookup::IllegalPreference, - CosTrading::Lookup::IllegalPolicyName, - CosTrading::Lookup::PolicyTypeMismatch, - CosTrading::Lookup::InvalidPolicyValue, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTrading::DuplicatePolicyName)) { // The general idea here is this: We've assembled a number of links // to follow, and we'll query each of them in turn. On each query we @@ -700,17 +674,6 @@ forward_query (const char* next_hop, CosTrading::OfferSeq_out offers, CosTrading::OfferIterator_out offer_itr, CosTrading::PolicyNameSeq_out limits_applied) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::IllegalConstraint, - CosTrading::Lookup::IllegalPreference, - CosTrading::Lookup::IllegalPolicyName, - CosTrading::Lookup::PolicyTypeMismatch, - CosTrading::Lookup::InvalidPolicyValue, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTrading::DuplicatePolicyName)) { // Forward this query to the next link in the starting_trader sequence. CosTrading::Link_ptr link_interface @@ -769,8 +732,6 @@ CORBA::Boolean TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: seen_request_id (TAO_Policies& policies, CosTrading::Admin::OctetSeq*& seq) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::Lookup::PolicyTypeMismatch)) { CORBA::Boolean return_value = 0; @@ -841,16 +802,6 @@ TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: _cxx_export (CORBA::Object_ptr reference, const char *type, const CosTrading::PropertySeq &properties) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::Register::InvalidObjectRef, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::Register::InterfaceTypeMismatch, - CosTrading::IllegalPropertyName, - CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::MissingMandatoryProperty, - CosTrading::DuplicatePropertyName)) { // For robustness purposes -- if (CORBA::is_nil (reference)) @@ -912,10 +863,6 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> void TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: withdraw (const char *id) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId, - CosTrading::Register::ProxyOfferId)) { // Get service type map. TAO_Offer_Database<MAP_LOCK_TYPE> &offer_database = this->trader_.offer_database (); @@ -926,10 +873,6 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::Register::OfferInfo * TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: describe (const char *id) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId, - CosTrading::Register::ProxyOfferId)) { // Get service type map. char* type = 0; @@ -959,18 +902,6 @@ TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: modify (const char *id, const CosTrading::PropertyNameSeq& del_list, const CosTrading::PropertySeq& modify_list) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::NotImplemented, - CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId, - CosTrading::Register::ProxyOfferId, - CosTrading::IllegalPropertyName, - CosTrading::Register::UnknownPropertyName, - CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::Register::MandatoryProperty, - CosTrading::Register::ReadonlyProperty, - CosTrading::DuplicatePropertyName)) { // Throw an exception if the trader is not configured // to support properties modification. @@ -1013,11 +944,6 @@ void TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: withdraw_using_constraint (const char *type, const char *constr) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::IllegalConstraint, - CosTrading::Register::NoMatchingOffers)) { TAO_Support_Attributes_i& support_attrs = this->trader_.support_attributes (); @@ -1081,10 +1007,6 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::Register_ptr TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: resolve (const CosTrading::TraderName &name) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::Register::IllegalTraderName, - CosTrading::Register::UnknownTraderName, - CosTrading::Register::RegisterNotSupported)) { // Determine if the first link is a legal link name. if (! TAO_Trader_Base::is_valid_link_name (name[0])) @@ -1139,11 +1061,6 @@ TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: validate_properties (const char* type, const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct, const CosTrading::PropertySeq& properties) - ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, - CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::MissingMandatoryProperty, - CosTrading::DuplicatePropertyName)) { CORBA::ULong length = properties.length (); const CosTradingRepos::ServiceTypeRepository::PropStructSeq& @@ -1254,7 +1171,6 @@ TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Admin (void) template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::Admin::OctetSeq * TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, 0); @@ -1277,7 +1193,6 @@ CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_def_search_card (CORBA::ULong value ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = this->trader_.import_attributes ().def_search_card (); @@ -1291,7 +1206,6 @@ CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_max_search_card (CORBA::ULong value ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = this->trader_.import_attributes ().max_search_card (); @@ -1305,7 +1219,6 @@ CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_def_match_card (CORBA::ULong value ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = this->trader_.import_attributes ().def_match_card (); @@ -1319,7 +1232,6 @@ CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_max_match_card (CORBA::ULong value ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = this->trader_.import_attributes ().max_match_card (); @@ -1333,7 +1245,6 @@ CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_def_return_card (CORBA::ULong value ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = this->trader_.import_attributes ().def_return_card (); @@ -1347,7 +1258,6 @@ CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_max_return_card (CORBA::ULong value ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = this->trader_.import_attributes ().max_return_card (); @@ -1361,7 +1271,6 @@ CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_max_list (CORBA::ULong value ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = this->trader_.import_attributes ().max_list (); @@ -1375,7 +1284,6 @@ CORBA::Boolean TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_supports_modifiable_properties (CORBA::Boolean value ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean return_value = this->trader_.support_attributes ().supports_modifiable_properties (); @@ -1389,7 +1297,6 @@ CORBA::Boolean TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_supports_dynamic_properties (CORBA::Boolean value ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean return_value = this->trader_.support_attributes ().supports_dynamic_properties (); @@ -1403,7 +1310,6 @@ CORBA::Boolean TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_supports_proxy_offers (CORBA::Boolean value ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean return_value = this->trader_.support_attributes ().supports_proxy_offers (); @@ -1417,7 +1323,6 @@ CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_def_hop_count (CORBA::ULong value ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = this->trader_.import_attributes ().def_hop_count (); @@ -1431,7 +1336,6 @@ CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_max_hop_count (CORBA::ULong value ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = this->trader_.import_attributes ().max_hop_count (); @@ -1445,7 +1349,6 @@ CosTrading::FollowOption TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_def_follow_policy (CosTrading::FollowOption policy ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosTrading::FollowOption return_value = this->trader_.import_attributes ().def_follow_policy (); @@ -1459,7 +1362,6 @@ CosTrading::FollowOption TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_max_follow_policy (CosTrading::FollowOption policy ) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosTrading::FollowOption return_value = this->trader_.import_attributes ().max_follow_policy (); @@ -1472,7 +1374,6 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::FollowOption TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_max_link_follow_policy (CosTrading::FollowOption policy) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosTrading::FollowOption return_value = this->trader_.link_attributes ().max_link_follow_policy (); @@ -1485,7 +1386,6 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::TypeRepository_ptr TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_type_repos (CosTrading::TypeRepository_ptr repository) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosTrading::TypeRepository_ptr return_value = this->trader_.support_attributes ().type_repos (); @@ -1498,7 +1398,6 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::Admin::OctetSeq* TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: set_request_id_stem (const CosTrading::Admin::OctetSeq& stem) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, &this->stem_id_); @@ -1512,7 +1411,6 @@ TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: list_offers (CORBA::ULong how_many, CosTrading::OfferIdSeq_out ids, CosTrading::OfferIdIterator_out id_itr) - ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented)) { // This method only applies when the register interface is implemented if (CORBA::is_nil (this->trader_.trading_components().register_if())) @@ -1544,8 +1442,6 @@ TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: list_proxies (CORBA::ULong, CosTrading::OfferIdSeq_out, CosTrading::OfferIdIterator_out) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::NotImplemented)) { throw CosTrading::NotImplemented (); } @@ -1571,12 +1467,6 @@ add_link (const char *name, CosTrading::Lookup_ptr target, CosTrading::FollowOption def_pass_on_follow_rule, CosTrading::FollowOption limiting_follow_rule) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::Link::IllegalLinkName, - CosTrading::Link::DuplicateLinkName, - CosTrading::InvalidLookupRef, - CosTrading::Link::DefaultFollowTooPermissive, - CosTrading::Link::LimitingFollowTooPermissive)) { // Ensure the link name is valid. if (! TAO_Trader_Base::is_valid_link_name (name)) @@ -1623,9 +1513,6 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> void TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: remove_link (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::Link::IllegalLinkName, - CosTrading::Link::UnknownLinkName)) { // Ensure the link name is valid. if (! TAO_Trader_Base::is_valid_link_name (name)) @@ -1643,9 +1530,6 @@ remove_link (const char *name) template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::Link::LinkInfo * TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::Link::IllegalLinkName, - CosTrading::Link::UnknownLinkName)) { // Ensure the link name is valid. if (! TAO_Trader_Base::is_valid_link_name (name)) @@ -1683,7 +1567,6 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name) template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::LinkNameSeq* TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocate space for the link names. size_t size = this->links_.current_size (); @@ -1707,10 +1590,6 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: modify_link (const char *name, CosTrading::FollowOption def_pass_on_follow_rule, CosTrading::FollowOption limiting_follow_rule) - ACE_THROW_SPEC ((CosTrading::Link::IllegalLinkName, - CosTrading::Link::UnknownLinkName, - CosTrading::Link::DefaultFollowTooPermissive, - CosTrading::Link::LimitingFollowTooPermissive)) { // Ensure the link name is valid. if (! TAO_Trader_Base::is_valid_link_name (name)) @@ -1768,17 +1647,6 @@ export_proxy (CosTrading::Lookup_ptr, CORBA::Boolean, const char *, const CosTrading::PolicySeq&) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::InvalidLookupRef, - CosTrading::IllegalPropertyName, - CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::MissingMandatoryProperty, - CosTrading::Proxy::IllegalRecipe, - CosTrading::DuplicatePropertyName, - CosTrading::DuplicatePolicyName)) { throw CORBA::UNKNOWN (); @@ -1789,10 +1657,6 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> void TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: withdraw_proxy (const char *) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId, - CosTrading::Proxy::NotProxyOfferId)) { throw CORBA::UNKNOWN (); } @@ -1801,10 +1665,6 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::Proxy::ProxyInfo * TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: describe_proxy (const char *) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId, - CosTrading::Proxy::NotProxyOfferId)) { throw CORBA::UNKNOWN (); @@ -1817,8 +1677,6 @@ TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: list_proxies (CORBA::ULong, CosTrading::OfferIdSeq*&, CosTrading::OfferIdIterator_ptr&) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::NotImplemented)) { throw CORBA::UNKNOWN (); } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h index 2c3f0f61288..c9c562d8d3a 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h @@ -73,18 +73,7 @@ public: CORBA::ULong how_many, CosTrading::OfferSeq_out offers, CosTrading::OfferIterator_out offer_itr, - CosTrading::PolicyNameSeq_out limits_applied) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::IllegalConstraint, - CosTrading::Lookup::IllegalPreference, - CosTrading::Lookup::IllegalPolicyName, - CosTrading::Lookup::PolicyTypeMismatch, - CosTrading::Lookup::InvalidPolicyValue, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTrading::DuplicatePolicyName)); + CosTrading::PolicyNameSeq_out limits_applied); // BEGIN SPEC // The query operation is the means by which an object can obtain @@ -202,9 +191,7 @@ private: TAO_Policies& policies, TAO_Preference_Interpreter& pref_inter, CosTrading::OfferSeq& offers, - CosTrading::OfferIterator_ptr& offer_itr) - ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName)); + CosTrading::OfferIterator_ptr& offer_itr); /// If a starting_trader policy was specfied, foward the query to the /// next link in the sequence. @@ -217,18 +204,7 @@ private: CORBA::ULong how_many, CosTrading::OfferSeq_out offers, CosTrading::OfferIterator_out offer_itr, - CosTrading::PolicyNameSeq_out limits_applied) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::IllegalConstraint, - CosTrading::Lookup::IllegalPreference, - CosTrading::Lookup::IllegalPolicyName, - CosTrading::Lookup::PolicyTypeMismatch, - CosTrading::Lookup::InvalidPolicyValue, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTrading::DuplicatePolicyName)); + CosTrading::PolicyNameSeq_out limits_applied); /** * Assemble a sequence of links that the federate_query method @@ -238,9 +214,7 @@ private: */ CORBA::Boolean retrieve_links (TAO_Policies& policies, CORBA::ULong offer_returned, - CosTrading::LinkNameSeq_out links) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::Lookup::PolicyTypeMismatch)); + CosTrading::LinkNameSeq_out links); /** * Perform and pass on a query over a set of links. Merge the @@ -258,27 +232,14 @@ private: CORBA::ULong how_many, CosTrading::OfferSeq& offers, CosTrading::OfferIterator_ptr& offer_itr, - CosTrading::PolicyNameSeq& limits_applied) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::IllegalConstraint, - CosTrading::Lookup::IllegalPreference, - CosTrading::Lookup::IllegalPolicyName, - CosTrading::Lookup::PolicyTypeMismatch, - CosTrading::Lookup::InvalidPolicyValue, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTrading::DuplicatePolicyName)); + CosTrading::PolicyNameSeq& limits_applied); /// Merge the results from a federated query into the collected results. void order_merged_sequence (TAO_Preference_Interpreter& pref_inter, CosTrading::OfferSeq& offers); CORBA::Boolean seen_request_id (TAO_Policies& policies, - CosTrading::Admin::OctetSeq*& seq) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::Lookup::PolicyTypeMismatch)); + CosTrading::Admin::OctetSeq*& seq); // = Disallow these operations. ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &)) @@ -316,17 +277,7 @@ public: virtual CosTrading::OfferId _cxx_export (CORBA::Object_ptr reference, const char *type, - const CosTrading::PropertySeq& properties) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::Register::InvalidObjectRef, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::Register::InterfaceTypeMismatch, - CosTrading::IllegalPropertyName, - CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::MissingMandatoryProperty, - CosTrading::DuplicatePropertyName)); + const CosTrading::PropertySeq& properties); // BEGIN SPEC // The export operation is the means by which a service is @@ -382,11 +333,7 @@ public: // parameter, the DuplicatePropertyName exception is raised. // END SPEC - virtual void withdraw (const char *id) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId, - CosTrading::Register::ProxyOfferId)); + virtual void withdraw (const char *id); // BEGIN SPEC // The withdraw operation removes the service offer from the trader @@ -402,11 +349,7 @@ public: // END SPEC virtual CosTrading::Register::OfferInfo* - describe (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId, - CosTrading::Register::ProxyOfferId)); + describe (const char * id); // BEGIN SPEC // The describe operation returns the information about an offered @@ -424,19 +367,7 @@ public: virtual void modify (const char * id, const CosTrading::PropertyNameSeq& del_list, - const CosTrading::PropertySeq& modify_list) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::NotImplemented, - CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId, - CosTrading::Register::ProxyOfferId, - CosTrading::IllegalPropertyName, - CosTrading::Register::UnknownPropertyName, - CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::Register::MandatoryProperty, - CosTrading::Register::ReadonlyProperty, - CosTrading::DuplicatePropertyName)); + const CosTrading::PropertySeq& modify_list); // BEGIN SPEC // The modify operation is used to change the description of a @@ -492,12 +423,7 @@ public: // END SPEC virtual void withdraw_using_constraint (const char *type, - const char *constr) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::IllegalConstraint, - CosTrading::Register::NoMatchingOffers)); + const char *constr); // BEGIN SPEC // The withdraw_using_constraint operation withdraws a set of offers @@ -523,11 +449,7 @@ public: // END SPEC virtual CosTrading::Register_ptr - resolve (const CosTrading::TraderName &name) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::Register::IllegalTraderName, - CosTrading::Register::UnknownTraderName, - CosTrading::Register::RegisterNotSupported)); + resolve (const CosTrading::TraderName &name); // BEGIN SPEC // This operation is used to resolve a context relative name for @@ -556,12 +478,7 @@ public: void validate_properties (const char* type, const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct, - const CosTrading::PropertySeq& properties) - ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, - CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::MissingMandatoryProperty, - CosTrading::DuplicatePropertyName)); + const CosTrading::PropertySeq& properties); // = Disallow these operations. ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &)) @@ -610,76 +527,56 @@ public: /// Search card is the cardinality of the offers searched for /// constraint compliance. - virtual CORBA::ULong set_def_search_card (CORBA::ULong value) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong set_max_search_card (CORBA::ULong value) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ULong set_def_search_card (CORBA::ULong value); + virtual CORBA::ULong set_max_search_card (CORBA::ULong value); /// Match card is the cardinality of offers found compliant with the /// constraints. - virtual CORBA::ULong set_def_match_card (CORBA::ULong value) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong set_max_match_card (CORBA::ULong value) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ULong set_def_match_card (CORBA::ULong value); + virtual CORBA::ULong set_max_match_card (CORBA::ULong value); /// Return card is the cardinality of the offers returned from /// Lookup. - virtual CORBA::ULong set_def_return_card (CORBA::ULong value) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong set_max_return_card (CORBA::ULong value) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ULong set_def_return_card (CORBA::ULong value); + virtual CORBA::ULong set_max_return_card (CORBA::ULong value); /// Types of offers available for consideration. Ween out those /// offers with modifiable properties - virtual CORBA::ULong set_max_list (CORBA::ULong value) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ULong set_max_list (CORBA::ULong value); virtual CORBA::Boolean - set_supports_modifiable_properties (CORBA::Boolean value) - ACE_THROW_SPEC ((CORBA::SystemException)); + set_supports_modifiable_properties (CORBA::Boolean value); virtual CORBA::Boolean - set_supports_dynamic_properties (CORBA::Boolean value) - ACE_THROW_SPEC ((CORBA::SystemException)); + set_supports_dynamic_properties (CORBA::Boolean value); virtual CORBA::Boolean - set_supports_proxy_offers (CORBA::Boolean value) - ACE_THROW_SPEC ((CORBA::SystemException)); + set_supports_proxy_offers (CORBA::Boolean value); // = Link Interface parameters - virtual CORBA::ULong set_def_hop_count (CORBA::ULong value) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong set_max_hop_count (CORBA::ULong value) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ULong set_def_hop_count (CORBA::ULong value); + virtual CORBA::ULong set_max_hop_count (CORBA::ULong value); virtual CosTrading::FollowOption - set_def_follow_policy (CosTrading::FollowOption policy) - ACE_THROW_SPEC ((CORBA::SystemException)); + set_def_follow_policy (CosTrading::FollowOption policy); virtual CosTrading::FollowOption - set_max_follow_policy (CosTrading::FollowOption policy) - ACE_THROW_SPEC ((CORBA::SystemException)); + set_max_follow_policy (CosTrading::FollowOption policy); virtual CosTrading::FollowOption - set_max_link_follow_policy (CosTrading::FollowOption policy) - ACE_THROW_SPEC ((CORBA::SystemException)); + set_max_link_follow_policy (CosTrading::FollowOption policy); // = Set Type Repository virtual CosTrading::TypeRepository_ptr - set_type_repos (CosTrading::TypeRepository_ptr repository) - ACE_THROW_SPEC ((CORBA::SystemException)); + set_type_repos (CosTrading::TypeRepository_ptr repository); virtual CosTrading::Admin::OctetSeq* - request_id_stem (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + request_id_stem (void); virtual CosTrading::Admin::OctetSeq* - set_request_id_stem (const CosTrading::Admin::OctetSeq& stem) - ACE_THROW_SPEC ((CORBA::SystemException)); + set_request_id_stem (const CosTrading::Admin::OctetSeq& stem); virtual void list_offers (CORBA::ULong how_many, CosTrading::OfferIdSeq_out ids, - CosTrading::OfferIdIterator_out id_itr) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::NotImplemented)); + CosTrading::OfferIdIterator_out id_itr); // BEGIN SPEC @@ -702,9 +599,7 @@ public: virtual void list_proxies (CORBA::ULong, CosTrading::OfferIdSeq_out, - CosTrading::OfferIdIterator_out) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::NotImplemented)); + CosTrading::OfferIdIterator_out); private: @@ -748,13 +643,7 @@ public: virtual void add_link (const char *name, CosTrading::Lookup_ptr target, CosTrading::FollowOption def_pass_on_follow_rule, - CosTrading::FollowOption limiting_follow_rule) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::Link::IllegalLinkName, - CosTrading::Link::DuplicateLinkName, - CosTrading::InvalidLookupRef, - CosTrading::Link::DefaultFollowTooPermissive, - CosTrading::Link::LimitingFollowTooPermissive)); + CosTrading::FollowOption limiting_follow_rule); // The "name" parameter is used in subsequent link management // operations to identify the intended link. If the parameter is not @@ -792,10 +681,7 @@ public: // creation of the link. // END SPEC - virtual void remove_link (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::Link::IllegalLinkName, - CosTrading::Link::UnknownLinkName)); + virtual void remove_link (const char *name); // BEGIN SPEC // The remove_link operation removes all knowledge of the target @@ -808,10 +694,7 @@ public: // not in the trader. // END SPEC - virtual CosTrading::Link::LinkInfo* describe_link (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::Link::IllegalLinkName, - CosTrading::Link::UnknownLinkName)); + virtual CosTrading::Link::LinkInfo* describe_link (const char *name); // BEGIN SPEC // The describe_link operation returns information on a link held in @@ -836,8 +719,7 @@ public: // state. // END SPEC - virtual CosTrading::LinkNameSeq* list_links (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosTrading::LinkNameSeq* list_links (void); // BEGIN SPEC // The list_links operation returns a list of the names of all @@ -848,11 +730,7 @@ public: virtual void modify_link (const char *name, CosTrading::FollowOption def_pass_on_follow_rule, - CosTrading::FollowOption limiting_follow_rule) - ACE_THROW_SPEC ((CosTrading::Link::IllegalLinkName, - CosTrading::Link::UnknownLinkName, - CosTrading::Link::DefaultFollowTooPermissive, - CosTrading::Link::LimitingFollowTooPermissive)); + CosTrading::FollowOption limiting_follow_rule); // BEGIN SPEC // The modify_link operation is used to change the existing link @@ -921,39 +799,18 @@ public: const CosTrading::PropertySeq &, CORBA::Boolean if_match_all, const char *, - const CosTrading::PolicySeq &) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::InvalidLookupRef, - CosTrading::IllegalPropertyName, - CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::MissingMandatoryProperty, - CosTrading::Proxy::IllegalRecipe, - CosTrading::DuplicatePropertyName, - CosTrading::DuplicatePolicyName)); - - virtual void withdraw_proxy (const char *) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId, - CosTrading::Proxy::NotProxyOfferId)); + const CosTrading::PolicySeq &); + + virtual void withdraw_proxy (const char *); virtual CosTrading::Proxy::ProxyInfo * - describe_proxy (const char *) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId, - CosTrading::Proxy::NotProxyOfferId)); + describe_proxy (const char *); // = CosTrading::TraderComponents methods. virtual void list_proxies (CORBA::ULong, CosTrading::OfferIdSeq *&, - CosTrading::OfferIdIterator_ptr &) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::NotImplemented)); + CosTrading::OfferIdIterator_ptr &); private: diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp index 8a7f07c85e6..4ca0685114c 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp @@ -131,35 +131,30 @@ TAO_Trader_Components (const TAO_Trading_Components_i& comps) template <class IF> CosTrading::Lookup_ptr TAO_Trader_Components<IF>::lookup_if (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CosTrading::Lookup::_duplicate (this->comps_.lookup_if ()); } template <class IF> CosTrading::Register_ptr TAO_Trader_Components<IF>::register_if (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CosTrading::Register::_duplicate (this->comps_.register_if ()); } template <class IF> CosTrading::Admin_ptr TAO_Trader_Components<IF>::admin_if (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CosTrading::Admin::_duplicate (this->comps_.admin_if ()); } template <class IF> CosTrading::Proxy_ptr TAO_Trader_Components<IF>::proxy_if (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CosTrading::Proxy::_duplicate (this->comps_.proxy_if ()); } template <class IF> CosTrading::Link_ptr TAO_Trader_Components<IF>::link_if (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CosTrading::Link::_duplicate (this->comps_.link_if ()); } @@ -172,28 +167,24 @@ TAO_Support_Attributes (const TAO_Support_Attributes_i& attrs) template <class IF> CORBA::Boolean TAO_Support_Attributes<IF>::supports_modifiable_properties (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.supports_modifiable_properties (); } template <class IF> CORBA::Boolean TAO_Support_Attributes<IF>::supports_dynamic_properties (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.supports_dynamic_properties (); } template <class IF> CORBA::Boolean TAO_Support_Attributes<IF>::supports_proxy_offers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.supports_proxy_offers (); } template <class IF> CosTrading::TypeRepository_ptr TAO_Support_Attributes<IF>::type_repos ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CosTrading::TypeRepository::_duplicate (this->attrs_.type_repos ()); } @@ -207,77 +198,66 @@ TAO_Import_Attributes (const TAO_Import_Attributes_i& attrs) template <class IF> CORBA::ULong TAO_Import_Attributes<IF>::def_search_card (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.def_search_card (); } template <class IF> CORBA::ULong TAO_Import_Attributes<IF>::max_search_card (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.max_search_card (); } template <class IF> CORBA::ULong TAO_Import_Attributes<IF>::def_match_card (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.def_match_card (); } template <class IF> CORBA::ULong TAO_Import_Attributes<IF>::max_match_card (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.max_match_card (); } template <class IF> CORBA::ULong TAO_Import_Attributes<IF>::def_return_card (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.def_return_card (); } template <class IF> CORBA::ULong TAO_Import_Attributes<IF>::max_return_card (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.max_return_card (); } template <class IF> CORBA::ULong TAO_Import_Attributes<IF>::max_list (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.max_list (); } template <class IF> CORBA::ULong TAO_Import_Attributes<IF>::def_hop_count (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.def_hop_count (); } template <class IF> CORBA::ULong TAO_Import_Attributes<IF>::max_hop_count (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.max_hop_count (); } template <class IF> CosTrading::FollowOption TAO_Import_Attributes<IF>::def_follow_policy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.def_follow_policy (); } template <class IF> CosTrading::FollowOption TAO_Import_Attributes<IF>::max_follow_policy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.max_follow_policy (); } @@ -291,7 +271,6 @@ TAO_Link_Attributes (const TAO_Link_Attributes_i& attrs) template <class IF> CosTrading::FollowOption TAO_Link_Attributes<IF>::max_link_follow_policy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.max_link_follow_policy (); } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h index 825725ee266..7aa904ffe0e 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h @@ -115,28 +115,23 @@ public: // = CosTrading::TraderComponents methods. /// Returns an object reference to the Lookup interface of the trader. /// Returns nil if the trader does not support Lookup interface. - virtual CosTrading::Lookup_ptr lookup_if (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosTrading::Lookup_ptr lookup_if (void); /// Returns object reference for the Register interface of the trader. /// Returns nil if the trader does not support Register interface. - virtual CosTrading::Register_ptr register_if (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosTrading::Register_ptr register_if (void); /// Returns object reference for the Link interface of the trader. /// Returns nil if the trader does not support Link interface. - virtual CosTrading::Link_ptr link_if (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosTrading::Link_ptr link_if (void); /// Returns object reference to the Proxy interface of the trader. /// Returns nil if the trader does not support Proxy interface. - virtual CosTrading::Proxy_ptr proxy_if (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosTrading::Proxy_ptr proxy_if (void); /// Returns object reference for the Admin interface of the trader. /// Returns nil if the trader does not support Admin interface. - virtual CosTrading::Admin_ptr admin_if (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosTrading::Admin_ptr admin_if (void); private: @@ -152,17 +147,13 @@ public: // = CosTrading::SupportAttributes methods. - virtual CORBA::Boolean supports_modifiable_properties (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean supports_modifiable_properties (void); - virtual CORBA::Boolean supports_dynamic_properties (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean supports_dynamic_properties (void); - virtual CORBA::Boolean supports_proxy_offers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean supports_proxy_offers (void); - virtual CosTrading::TypeRepository_ptr type_repos (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosTrading::TypeRepository_ptr type_repos (void); private: @@ -178,48 +169,37 @@ public: // = CosTrading::ImportAttributes methods. - virtual CORBA::ULong def_search_card (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ULong def_search_card (void); - virtual CORBA::ULong max_search_card (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ULong max_search_card (void); // Search cardinality determines the maximum number of offers searched // before not considering other offers. - virtual CORBA::ULong def_match_card (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ULong def_match_card (void); - virtual CORBA::ULong max_match_card (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ULong max_match_card (void); // Match cardinality determines the maximum number of offers // matched to the constraints before not considering other offers.. - virtual CORBA::ULong def_return_card (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ULong def_return_card (void); - virtual CORBA::ULong max_return_card (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ULong max_return_card (void); // Return cardinality determines the maximum number of offers marked // to return before not considering other offers. - virtual CORBA::ULong max_list (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ULong max_list (void); - virtual CORBA::ULong def_hop_count (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ULong def_hop_count (void); - virtual CORBA::ULong max_hop_count (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ULong max_hop_count (void); - virtual CosTrading::FollowOption def_follow_policy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosTrading::FollowOption def_follow_policy (void); - virtual CosTrading::FollowOption max_follow_policy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosTrading::FollowOption max_follow_policy (void); private: @@ -235,8 +215,7 @@ public: TAO_Link_Attributes (const TAO_Link_Attributes_i& attrs); // = CosTrading::LinkAttributes methods - virtual CosTrading::FollowOption max_link_follow_policy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosTrading::FollowOption max_link_follow_policy (void); private: diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp index 63677b80def..334f1930cd3 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp @@ -251,7 +251,6 @@ TAO_Property_Evaluator::is_dynamic_property (int index) CORBA::Any* TAO_Property_Evaluator::property_value (int index) - ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)) { CORBA::Any* prop_val = 0; CORBA::Boolean in_cache = @@ -334,8 +333,6 @@ TAO_Property_Evaluator_By_Name:: TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties , CORBA::Boolean supports_dp) - ACE_THROW_SPEC ((CosTrading::DuplicatePropertyName, - CosTrading::IllegalPropertyName)) : TAO_Property_Evaluator (properties, supports_dp) { int length = this->props_.length(); @@ -385,7 +382,6 @@ is_dynamic_property(const char* property_name) CORBA::Any* TAO_Property_Evaluator_By_Name::property_value (const char* property_name) - ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)) { int index = 0; CORBA::Any* prop_value = 0; @@ -499,8 +495,6 @@ const char* TAO_Policies::POLICY_NAMES[] = TAO_Policies::TAO_Policies (TAO_Trader_Base& trader, const CosTrading::PolicySeq& policies) - ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName, - CosTrading::DuplicatePolicyName)) : trader_ (trader) { for (int i = 0; i < TAO_NUM_POLICIES; i++) @@ -567,7 +561,6 @@ TAO_Policies::~TAO_Policies (void) CORBA::ULong TAO_Policies::ulong_prop (POLICY_TYPE pol) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { CORBA::ULong return_value = 0, max_value = 0; const TAO_Import_Attributes_i& import_attrs = @@ -620,28 +613,24 @@ TAO_Policies::ulong_prop (POLICY_TYPE pol) const CORBA::ULong TAO_Policies::search_card (void) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { return this->ulong_prop (SEARCH_CARD); } CORBA::ULong TAO_Policies::match_card (void) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { return this->ulong_prop (MATCH_CARD); } CORBA::ULong TAO_Policies::return_card (void) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { return this->ulong_prop (RETURN_CARD); } CORBA::Boolean TAO_Policies::boolean_prop (POLICY_TYPE pol) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { CORBA::Boolean def_value = 1, return_value = 1; @@ -693,28 +682,24 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol) const CORBA::Boolean TAO_Policies::use_modifiable_properties (void) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { return this->boolean_prop (USE_MODIFIABLE_PROPERTIES); } CORBA::Boolean TAO_Policies::use_dynamic_properties (void) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { return this->boolean_prop (USE_DYNAMIC_PROPERTIES); } CORBA::Boolean TAO_Policies::use_proxy_offers (void) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { return this->boolean_prop (USE_PROXY_OFFERS); } CORBA::Boolean TAO_Policies::exact_type_match (void) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { return this->boolean_prop (EXACT_TYPE_MATCH); } @@ -722,8 +707,6 @@ TAO_Policies::exact_type_match (void) const CosTrading::TraderName* TAO_Policies::starting_trader (void) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, - CosTrading::Lookup::InvalidPolicyValue)) { CosTrading::TraderName* trader_name = 0; @@ -751,7 +734,6 @@ TAO_Policies::starting_trader (void) const CosTrading::FollowOption TAO_Policies::link_follow_rule (void) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { CosTrading::FollowOption return_value = this->trader_.import_attributes ().def_follow_policy (); @@ -783,10 +765,6 @@ TAO_Policies::link_follow_rule (void) const CosTrading::FollowOption TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, - CosTrading::Lookup::InvalidPolicyValue, - CosTrading::Link::IllegalLinkName, - CosTrading::Link::UnknownLinkName)) { CosTrading::FollowOption return_value = CosTrading::local_only; CosTrading::FollowOption trader_max_follow_policy = @@ -808,14 +786,12 @@ TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info) con CORBA::ULong TAO_Policies::hop_count (void) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { return this->ulong_prop (HOP_COUNT); } CosTrading::Admin::OctetSeq* TAO_Policies::request_id (void) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { CosTrading::Admin::OctetSeq* request_id = 0; @@ -841,8 +817,6 @@ void TAO_Policies:: copy_in_follow_option (CosTrading::PolicySeq& policy_seq, const CosTrading::Link::LinkInfo& link_info) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, - CosTrading::Lookup::InvalidPolicyValue)) { CosTrading::FollowOption follow_option = CosTrading::local_only; CosTrading::FollowOption trader_max_follow_policy = @@ -1065,10 +1039,6 @@ TAO_Offer_Modifier::~TAO_Offer_Modifier (void) void TAO_Offer_Modifier:: delete_properties (const CosTrading::PropertyNameSeq& deletes) - ACE_THROW_SPEC ((CosTrading::Register::UnknownPropertyName, - CosTrading::Register::MandatoryProperty, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName)) { // Validate that the listed property names can be deleted CORBA::ULong i = 0, @@ -1104,11 +1074,6 @@ delete_properties (const CosTrading::PropertyNameSeq& deletes) void TAO_Offer_Modifier:: merge_properties (const CosTrading::PropertySeq& modifies) - ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::Register::ReadonlyProperty)) { int i = 0, length = 0; TAO_String_Set modify_me; @@ -1392,8 +1357,6 @@ TAO_Offer_Filter::limits_applied (void) TAO_Property_Filter:: TAO_Property_Filter (const SPECIFIED_PROPS& desired_props) - ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName)) : policy_ (desired_props._d ()) { if (this->policy_ == CosTrading::Lookup::some) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h index ee75b52740c..c4c2437ecbc 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h @@ -70,8 +70,7 @@ public: * CosTradingDynamic::DPEvalFailure exception on failure. If the * property index is undefined, the method returns a null pointer. */ - CORBA::Any* property_value(int index) - ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)); + CORBA::Any* property_value(int index); /** @@ -129,9 +128,7 @@ public: TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties , - CORBA::Boolean supports_dp = 1) - ACE_THROW_SPEC ((CosTrading::DuplicatePropertyName, - CosTrading::IllegalPropertyName)); + CORBA::Boolean supports_dp = 1); /** * Construct an instance of TAO_Property_Evaluator that operates on @@ -153,8 +150,7 @@ public: * TAO_Property_Evaluator, except property_value first discovers the * index through a string matching lookup. */ - CORBA::Any* property_value(const char* property_name) - ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)); + CORBA::Any* property_value(const char* property_name); /** * This method is identical to its counterpart in @@ -195,8 +191,7 @@ public: virtual CORBA::Any* evalDP(const char* name, CORBA::TypeCode_ptr returned_type, const CORBA::Any& extra_info) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTradingDynamic::DPEvalFailure)) = 0; + = 0; /// Method to construct a dynamic property structure suitable for /// exporting in a CosTrading::PropertyStruct to the Trading Service. @@ -254,9 +249,7 @@ public: static const char * POLICY_NAMES[]; TAO_Policies (TAO_Trader_Base& trader, - const CosTrading::PolicySeq& policies) - ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName, - CosTrading::DuplicatePolicyName)); + const CosTrading::PolicySeq& policies); // BEGIN SPEC // The "policies" parameter allows the importer to specify how the @@ -282,8 +275,7 @@ public: ~TAO_Policies (void); - CORBA::ULong search_card (void) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); + CORBA::ULong search_card (void) const; // BEGIN SPEC // The "search_card" policy indicates to the trader the maximum @@ -294,8 +286,7 @@ public: // trader's def_search_card attribute is used. // END SPEC - CORBA::ULong match_card (void) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); + CORBA::ULong match_card (void) const; // BEGIN SPEC // The "match_card" policy indicates to the trader the maximum @@ -306,8 +297,7 @@ public: // attribute is used. // END SPEC - CORBA::ULong return_card (void) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); + CORBA::ULong return_card (void) const; // BEGIN SPEC // The "return_card" policy indicates to the trader the maximum @@ -320,8 +310,7 @@ public: // = Offer consideration policies - CORBA::Boolean use_modifiable_properties (void) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); + CORBA::Boolean use_modifiable_properties (void) const; // BEGIN SPEC // The "use_modifiable_properties" policy indicates whether the @@ -333,8 +322,7 @@ public: // included. // END SPEC - CORBA::Boolean use_dynamic_properties (void) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); + CORBA::Boolean use_dynamic_properties (void) const; // BEGIN SPEC // The "use_dynamic_properties" policy indicates whether the trader @@ -346,8 +334,7 @@ public: // included. // END SPEC - CORBA::Boolean use_proxy_offers (void) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); + CORBA::Boolean use_proxy_offers (void) const; // BEGIN SPEC // The "use_proxy_offers" policy indicates whether the trader should @@ -358,8 +345,7 @@ public: // specified, such offers will be included. // END SPEC - CORBA::Boolean exact_type_match (void) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); + CORBA::Boolean exact_type_match (void) const; // BEGIN SPEC // The "exact_type_match" policy indicates to the trader whether the @@ -387,13 +373,10 @@ public: * "starting_trader" policy with the first component removed. * END SPEC */ - CosTrading::TraderName* starting_trader (void) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, - CosTrading::Lookup::InvalidPolicyValue)); + CosTrading::TraderName* starting_trader (void) const; /// Determine the link follow policy for this query overall. - CosTrading::FollowOption link_follow_rule (void) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); + CosTrading::FollowOption link_follow_rule (void) const; // BEGIN SPEC //The "link_follow_rule" policy indicates how the client wishes @@ -412,14 +395,9 @@ public: * else min(trader.max_follow_policy, link.limiting_follow_rule, * trader.def_follow_policy) */ - CosTrading::FollowOption link_follow_rule (const CosTrading::Link::LinkInfo& link_info) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, - CosTrading::Lookup::InvalidPolicyValue, - CosTrading::Link::IllegalLinkName, - CosTrading::Link::UnknownLinkName)); + CosTrading::FollowOption link_follow_rule (const CosTrading::Link::LinkInfo& link_info) const; - CORBA::ULong hop_count (void) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); + CORBA::ULong hop_count (void) const; // BEGIN SPEC // The "hop_count" policy indicates to the trader the maximum number @@ -435,8 +413,7 @@ public: /// Return the request_id passed to the query method across a link to /// another trader. - CosTrading::Admin::OctetSeq* request_id (void) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); + CosTrading::Admin::OctetSeq* request_id (void) const; /// Policies to forward to the next trader in a federated query. void copy_to_pass (CosTrading::PolicySeq& policy_seq, @@ -457,19 +434,15 @@ public: * trader.max_follow_policy) */ void copy_in_follow_option (CosTrading::PolicySeq& policy_seq, - const CosTrading::Link::LinkInfo& link_info) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, - CosTrading::Lookup::InvalidPolicyValue)); + const CosTrading::Link::LinkInfo& link_info) const; private: /// Reconclile a ULong property with its default. - CORBA::ULong ulong_prop (POLICY_TYPE pol) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); + CORBA::ULong ulong_prop (POLICY_TYPE pol) const; /// Reconcile a Boolean property with its debault. - CORBA::Boolean boolean_prop (POLICY_TYPE pol) const - ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); + CORBA::Boolean boolean_prop (POLICY_TYPE pol) const; TAO_Policies (const TAO_Policies&); TAO_Policies& operator= (const TAO_Policies&); @@ -584,11 +557,7 @@ public: /// Delete the properties whose names were given to the /// constructor. Ensure we don't delete mandatory properties. - void delete_properties (const CosTrading::PropertyNameSeq& deletes) - ACE_THROW_SPEC ((CosTrading::Register::UnknownPropertyName, - CosTrading::Register::MandatoryProperty, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName)); + void delete_properties (const CosTrading::PropertyNameSeq& deletes); /** * Copy to the destination the union of the source and destination @@ -596,12 +565,7 @@ public: * destination with the source's value. This class claims the memory * in the modifies sequence. */ - void merge_properties (const CosTrading::PropertySeq& modifies) - ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::Register::ReadonlyProperty)); + void merge_properties (const CosTrading::PropertySeq& modifies); /// Return a reference to the Offer with the changes affected. void affect_change (const CosTrading::PropertySeq& modifies); @@ -740,9 +704,7 @@ public: TAO_Property_Filter (void) : policy_ (CosTrading::Lookup::all) {} /// Verify that the specified properties are correct. - TAO_Property_Filter (const SPECIFIED_PROPS& desired_props) - ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName)); + TAO_Property_Filter (const SPECIFIED_PROPS& desired_props); TAO_Property_Filter (const TAO_Property_Filter& prop_filter); TAO_Property_Filter& operator= (const TAO_Property_Filter& prop_filter); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp index 2f38753092c..6e3bd4780d3 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp @@ -184,7 +184,6 @@ CORBA::Object_ptr TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr, int argc, ACE_TCHAR *argv[]) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Duplicate the ORB CORBA::ORB_var orb = CORBA::ORB::_duplicate (orb_ptr); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h index a12b8e2a3f3..53f1082de0e 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h @@ -54,8 +54,7 @@ public: CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, - ACE_TCHAR *argv[]) - ACE_THROW_SPEC ((CORBA::SystemException)); + ACE_TCHAR *argv[]); // This function call initializes the Trading Service given a reference to the // ORB and the command line parameters. |