diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-12-11 19:43:01 +0100 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-12-11 19:43:01 +0100 |
commit | eb18ae391efe2ff359ce6cdcf4ee51b637c5a607 (patch) | |
tree | a7a4f246c6f9a022515258be4704d5bb784d3f1a | |
parent | 39668e74d887084a2295d7cf3d445e7c42d7704e (diff) | |
download | ATCD-eb18ae391efe2ff359ce6cdcf4ee51b637c5a607.tar.gz |
Fixed compile errors
* TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp:
* TAO/orbsvcs/examples/ORT/Gateway_i.cpp:
* TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp:
* TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp:
* TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp:
* TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp:
* TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp:
* TAO/tests/Bug_3755_Ext_Regression/common.cpp:
* TAO/tests/Bug_3755_Regression/server.cpp:
* TAO/tests/Bug_3826_Regression/server.cpp:
* TAO/tests/Param_Test/except.cpp:
-rw-r--r-- | TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/examples/ORT/Gateway_i.cpp | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp | 20 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp | 5 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp | 10 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp | 2 | ||||
-rw-r--r-- | TAO/tests/Bug_3755_Ext_Regression/common.cpp | 2 | ||||
-rw-r--r-- | TAO/tests/Bug_3755_Regression/server.cpp | 2 | ||||
-rw-r--r-- | TAO/tests/Bug_3826_Regression/server.cpp | 2 | ||||
-rw-r--r-- | TAO/tests/Param_Test/except.cpp | 2 |
11 files changed, 22 insertions, 29 deletions
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp index 2925740e769..3f006bcf6bc 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp @@ -85,7 +85,7 @@ MIF_DT_Creator::wait (void) { (void)this->orb_->work_pending (); } - catch (const CORBA::BAD_INV_ORDER const &) + catch (const CORBA::BAD_INV_ORDER &) { // If there is BAD_INV_ORDER exception there is // no point in running this loop any more. diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp index e11e6e64d31..2f1c2b82780 100644 --- a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp +++ b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp @@ -132,7 +132,7 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request) // At this point the NVList contains all the out and inout // arguments, but we need to extract the return value... } - catch (const CORBA::UnknownUserException& user_ex) + catch (CORBA::UnknownUserException& user_ex) { // Pass the exception back to the server request... request->set_exception (user_ex.exception ()); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp index 08646ea614c..3c26d56fa2e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp @@ -116,7 +116,7 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( { control->supplier_not_exist (this); } - catch (const CORBA::SystemException& sysex) + catch (CORBA::SystemException& sysex) { control->system_exception (this, sysex); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index f0cd4b2ed20..a5a977989de 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -625,10 +625,9 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event) { control->consumer_not_exist (this); } - catch (const CORBA::SystemException& sysex) + catch (CORBA::SystemException& sysex) { - control->system_exception (this, - sysex); + control->system_exception (this, sysex); } catch (const CORBA::Exception&) { @@ -669,7 +668,7 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( } control->consumer_not_exist (this); } - catch (const CORBA::SystemException& sysex) + catch (CORBA::SystemException& sysex) { if (TAO_debug_level >= 4) { @@ -677,8 +676,7 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( "during TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer"); } - control->system_exception (this, - sysex); + control->system_exception (this, sysex); } catch (const CORBA::Exception&) { @@ -738,15 +736,14 @@ TAO_CEC_ProxyPushSupplier::invoke_to_consumer (const TAO_CEC_TypedEvent &typed_e } control->consumer_not_exist (this); } - catch (const CORBA::SystemException& sysex) + catch (CORBA::SystemException& sysex) { if (TAO_debug_level >= 4) { sysex._tao_print_exception ( "during TAO_CEC_ProxyPushSupplier::invoke_to_consumer"); } - control->system_exception (this, - sysex); + control->system_exception (this, sysex); } catch (const CORBA::Exception& ex) { @@ -813,15 +810,14 @@ TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer ( } control->consumer_not_exist (this); } - catch (const CORBA::SystemException& sysex) + catch (CORBA::SystemException& sysex) { if (TAO_debug_level >= 4) { sysex._tao_print_exception ( "during TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer"); } - control->system_exception (this, - sysex); + control->system_exception (this, sysex); } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp index e681bf7a028..f1d28246f74 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp @@ -522,10 +522,9 @@ TAO_EC_Gateway_IIOP::push_to_consumer ( { ec_control_->event_channel_not_exist (this); } - catch (const CORBA::SystemException& sysex) + catch (CORBA::SystemException& sysex) { - ec_control_->system_exception (this, - sysex); + ec_control_->system_exception (this, sysex); } catch (const CORBA::Exception&) { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp index 921fff9fd86..707dfe69374 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp @@ -352,7 +352,7 @@ TAO_EC_ProxyPushSupplier::push_to_consumer ( control->consumer_not_exist (this); } } - catch (const CORBA::SystemException& sysex) + catch (CORBA::SystemException& sysex) { // Do not report errors for old consumers // NOTE: The comparison below is not completely correct, it @@ -366,8 +366,7 @@ TAO_EC_ProxyPushSupplier::push_to_consumer ( TAO_EC_ConsumerControl *control = this->event_channel_->consumer_control (); - control->system_exception (this, - sysex); + control->system_exception (this, sysex); } } catch (const CORBA::Exception&) @@ -392,13 +391,12 @@ TAO_EC_ProxyPushSupplier::reactive_push_to_consumer ( control->consumer_not_exist (this); } - catch (const CORBA::SystemException& sysex) + catch (CORBA::SystemException& sysex) { TAO_EC_ConsumerControl *control = this->event_channel_->consumer_control (); - control->system_exception (this, - sysex); + control->system_exception (this, sysex); } catch (const CORBA::Exception&) { diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp index 6b4af0e64bd..0462946a1d4 100644 --- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp @@ -182,7 +182,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) "secure_invocation_test returned <%d>\n", status)); } - catch (const CORBA::Exception const &ex) + catch (const CORBA::Exception &ex) { if (set_cert_file) { diff --git a/TAO/tests/Bug_3755_Ext_Regression/common.cpp b/TAO/tests/Bug_3755_Ext_Regression/common.cpp index ff6d2ceca0e..1d4f5d60fb5 100644 --- a/TAO/tests/Bug_3755_Ext_Regression/common.cpp +++ b/TAO/tests/Bug_3755_Ext_Regression/common.cpp @@ -74,7 +74,7 @@ do_main (int argc, ACE_TCHAR *argv[], orbs_check_callback check) 1); } } - catch (const CORBA::Exception const &ex) + catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Caught Exception in do_main:\n"); return 1; diff --git a/TAO/tests/Bug_3755_Regression/server.cpp b/TAO/tests/Bug_3755_Regression/server.cpp index d1ecc42e681..b0c61046df8 100644 --- a/TAO/tests/Bug_3755_Regression/server.cpp +++ b/TAO/tests/Bug_3755_Regression/server.cpp @@ -198,7 +198,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // END priority mapping demonstration } - catch (const CORBA::SystemException const &sysEx) + catch (const CORBA::SystemException &sysEx) { sysEx._tao_print_exception ("Caught SystemException in main:\n"); return 1; diff --git a/TAO/tests/Bug_3826_Regression/server.cpp b/TAO/tests/Bug_3826_Regression/server.cpp index 15e8bd4e8fb..ffd0e3ce029 100644 --- a/TAO/tests/Bug_3826_Regression/server.cpp +++ b/TAO/tests/Bug_3826_Regression/server.cpp @@ -110,7 +110,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_TEXT ("'-ORBConnectionCacheMax' is applied to the first ") ACE_TEXT ("ORB only as expected.\n"))); } - catch (const CORBA::Exception const &ex) + catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Caught Exception in main:\n"); return 1; diff --git a/TAO/tests/Param_Test/except.cpp b/TAO/tests/Param_Test/except.cpp index 081c27e4a6b..decc97863f3 100644 --- a/TAO/tests/Param_Test/except.cpp +++ b/TAO/tests/Param_Test/except.cpp @@ -71,7 +71,7 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req) *o3->value () >>= this->out_; } - catch (const CORBA::UnknownUserException& user_ex) + catch (CORBA::UnknownUserException& user_ex) { Param_Test::Ooops* oops; Param_Test::BadBoy* bad_boy; |