diff options
Diffstat (limited to 'CIAO')
189 files changed, 2387 insertions, 3738 deletions
diff --git a/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.hpp b/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.hpp index ff92670ee23..1f0c850f25e 100644 --- a/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.hpp +++ b/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.hpp @@ -894,7 +894,7 @@ namespace CCF } void - set_right_node (Const& n) + set_right_node (Const&) { } diff --git a/CIAO/CCF/CCF/IDL2/SemanticGraph/Name.cpp b/CIAO/CCF/CCF/IDL2/SemanticGraph/Name.cpp index abe474dc8eb..374446661df 100644 --- a/CIAO/CCF/CCF/IDL2/SemanticGraph/Name.cpp +++ b/CIAO/CCF/CCF/IDL2/SemanticGraph/Name.cpp @@ -202,6 +202,10 @@ namespace CCF // int const name_printer_index = std::ios_base::xalloc (); + NamePrinter::~NamePrinter () + { + } + void NamePrinter:: print (std::ostream& os, Name const& n) { diff --git a/CIAO/CCF/CCF/IDL2/SemanticGraph/Name.hpp b/CIAO/CCF/CCF/IDL2/SemanticGraph/Name.hpp index 93285e4f266..50dd752aa6a 100644 --- a/CIAO/CCF/CCF/IDL2/SemanticGraph/Name.hpp +++ b/CIAO/CCF/CCF/IDL2/SemanticGraph/Name.hpp @@ -208,6 +208,8 @@ namespace CCF // struct NamePrinter { + virtual ~NamePrinter (); + virtual void print (std::ostream&, SimpleName const&) = 0; diff --git a/CIAO/CCF/CCF/IDL2/Traversal/IntExpression.hpp b/CIAO/CCF/CCF/IDL2/Traversal/IntExpression.hpp index a4cac55a729..8e111874251 100644 --- a/CIAO/CCF/CCF/IDL2/Traversal/IntExpression.hpp +++ b/CIAO/CCF/CCF/IDL2/Traversal/IntExpression.hpp @@ -57,7 +57,7 @@ namespace CCF } virtual void - pre (Type& n) + pre (Type&) { } @@ -74,7 +74,7 @@ namespace CCF } virtual void - post (Type& n) + post (Type&) { } }; @@ -103,7 +103,7 @@ namespace CCF } virtual void - pre (Type& n) + pre (Type&) { } @@ -120,7 +120,7 @@ namespace CCF } virtual void - post (Type& n) + post (Type&) { } }; @@ -151,7 +151,7 @@ namespace CCF } virtual void - pre (Type& n) + pre (Type&) { } @@ -168,7 +168,7 @@ namespace CCF } virtual void - sign (Type& n) + sign (Type&) { } @@ -185,7 +185,7 @@ namespace CCF } virtual void - post (Type& n) + post (Type&) { } }; @@ -216,7 +216,7 @@ namespace CCF } virtual void - pre (Type& n) + pre (Type&) { } @@ -233,7 +233,7 @@ namespace CCF } virtual void - sign (Type& n) + sign (Type&) { } @@ -250,7 +250,7 @@ namespace CCF } virtual void - post (Type& n) + post (Type&) { } }; @@ -268,7 +268,7 @@ namespace CCF } virtual void - pre (Type& n) + pre (Type&) { } @@ -285,7 +285,7 @@ namespace CCF } virtual void - sign (Type& n) + sign (Type&) { } @@ -302,7 +302,7 @@ namespace CCF } virtual void - post (Type& n) + post (Type&) { } }; @@ -333,7 +333,7 @@ namespace CCF } virtual void - pre (Type& n) + pre (Type&) { } @@ -350,7 +350,7 @@ namespace CCF } virtual void - sign (Type& n) + sign (Type&) { } @@ -367,7 +367,7 @@ namespace CCF } virtual void - post (Type& n) + post (Type&) { } }; @@ -398,7 +398,7 @@ namespace CCF } virtual void - pre (Type& n) + pre (Type&) { } @@ -415,7 +415,7 @@ namespace CCF } virtual void - sign (Type& n) + sign (Type&) { } @@ -432,7 +432,7 @@ namespace CCF } virtual void - post (Type& n) + post (Type&) { } }; @@ -463,7 +463,7 @@ namespace CCF } virtual void - pre (Type& n) + pre (Type&) { } @@ -480,7 +480,7 @@ namespace CCF } virtual void - sign (Type& n) + sign (Type&) { } @@ -497,7 +497,7 @@ namespace CCF } virtual void - post (Type& n) + post (Type&) { } }; @@ -515,7 +515,7 @@ namespace CCF } virtual void - pre (Type& n) + pre (Type&) { } @@ -532,7 +532,7 @@ namespace CCF } virtual void - sign (Type& n) + sign (Type&) { } @@ -549,7 +549,7 @@ namespace CCF } virtual void - post (Type& n) + post (Type&) { } }; @@ -580,7 +580,7 @@ namespace CCF } virtual void - pre (Type& n) + pre (Type&) { } @@ -597,7 +597,7 @@ namespace CCF } virtual void - sign (Type& n) + sign (Type&) { } @@ -614,7 +614,7 @@ namespace CCF } virtual void - post (Type& n) + post (Type&) { } }; @@ -646,7 +646,7 @@ namespace CCF } virtual void - pre (Type& n) + pre (Type&) { } @@ -663,7 +663,7 @@ namespace CCF } virtual void - sign (Type& n) + sign (Type&) { } @@ -680,7 +680,7 @@ namespace CCF } virtual void - post (Type& n) + post (Type&) { } }; @@ -712,7 +712,7 @@ namespace CCF } virtual void - pre (Type& n) + pre (Type&) { } @@ -729,7 +729,7 @@ namespace CCF } virtual void - sign (Type& n) + sign (Type&) { } @@ -746,7 +746,7 @@ namespace CCF } virtual void - post (Type& n) + post (Type&) { } }; diff --git a/CIAO/CIDLC/AttributeHeaderEmitters.cpp b/CIAO/CIDLC/AttributeHeaderEmitters.cpp index d08cf3181e7..d5794a889f5 100644 --- a/CIAO/CIDLC/AttributeHeaderEmitters.cpp +++ b/CIAO/CIDLC/AttributeHeaderEmitters.cpp @@ -31,8 +31,7 @@ WriteAttributeHeaderEmitter::name (SemanticGraph::ReadWriteAttribute& a) Traversal::ReadWriteAttribute::belongs (a, write_belongs_); - os << " " << a.name () << endl - << ")" << endl; + os << " " << a.name () << ")" << endl; } void @@ -99,8 +98,7 @@ AttributeHeaderEmitter::pre (SemanticGraph::ReadWriteAttribute& a) void AttributeHeaderEmitter::name (SemanticGraph::ReadWriteAttribute& a) { - os << a.name () << " (" << endl - << ")" << endl; + os << a.name () << " ()" << endl; } void @@ -157,8 +155,7 @@ AttributeHeaderEmitter::pre (SemanticGraph::ReadAttribute& a) void AttributeHeaderEmitter::name (SemanticGraph::ReadAttribute& a) { - os << a.name () << " (" << endl - << ")" << endl; + os << a.name () << " ()" << endl; } void diff --git a/CIAO/CIDLC/AttributeSourceEmitters_T.hpp b/CIAO/CIDLC/AttributeSourceEmitters_T.hpp index 3f7e9113f64..9f601d27de7 100644 --- a/CIAO/CIDLC/AttributeSourceEmitters_T.hpp +++ b/CIAO/CIDLC/AttributeSourceEmitters_T.hpp @@ -40,7 +40,7 @@ struct WriteAttributeSourceEmitter : Traversal::ReadWriteAttribute, gen_swapping_set () { os << "this->activate_component (" << ");" - << "ACE_CHECK;" << endl; + << endl; } virtual void @@ -239,8 +239,7 @@ struct AttributeSourceEmitter : Traversal::ReadAttribute, this->gen_swapping_get (a); } - os << "return this->executor_->" << a.name () << " (" << endl - << ");"; + os << "return this->executor_->" << a.name () << " ();"; } os << "}"; diff --git a/CIAO/CIDLC/ExecImplSourceGenerator.cpp b/CIAO/CIDLC/ExecImplSourceGenerator.cpp index fc9570ca472..1f36dd99248 100644 --- a/CIAO/CIDLC/ExecImplSourceGenerator.cpp +++ b/CIAO/CIDLC/ExecImplSourceGenerator.cpp @@ -47,8 +47,7 @@ namespace virtual void receives_none (Type&) { - os << " (" << endl - << ")" << endl; + os << " ()" << endl; } virtual void @@ -229,8 +228,7 @@ namespace os << "_ptr" << endl << scope_.name () << "_exec_i::get_" - << p.name () << " (" << endl - << ")" << endl + << p.name () << " ()" << endl << STRS[EXCP_SNGL] << endl << "{" << STRS[YCH] << endl @@ -461,8 +459,7 @@ namespace << "}"; os << "void" << endl - << t.name () << "_exec_i::ciao_preactivate (" << endl - << ")" << endl + << t.name () << "_exec_i::ciao_preactivate ()" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_CE] << "))" << endl @@ -471,8 +468,7 @@ namespace << "}"; os << "void" << endl - << t.name () << "_exec_i::ciao_postactivate (" << endl - << ")" << endl + << t.name () << "_exec_i::ciao_postactivate ()" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_CE] << "))" << endl @@ -481,8 +477,7 @@ namespace << "}"; os << "void" << endl - << t.name () << "_exec_i::ccm_activate (" << endl - << ")" << endl + << t.name () << "_exec_i::ccm_activate ()" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_CE] << "))" << endl @@ -491,8 +486,7 @@ namespace << "}"; os << "void" << endl - << t.name () << "_exec_i::ccm_passivate (" << endl - << ")" << endl + << t.name () << "_exec_i::ccm_passivate ()" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_CE] << "))" << endl @@ -501,8 +495,7 @@ namespace << "}"; os << "void" << endl - << t.name () << "_exec_i::ccm_remove (" << endl - << ")" << endl + << t.name () << "_exec_i::ccm_remove ()" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_CE] << "))" << endl @@ -571,8 +564,7 @@ namespace virtual void receives_none (SemanticGraph::HomeFactory&) { - os << " (" << endl - << ")" << endl; + os << " ()" << endl; } virtual void @@ -665,8 +657,7 @@ namespace virtual void receives_none (SemanticGraph::HomeFinder&) { - os << " (" << endl - << ")" << endl; + os << " ()" << endl; } virtual void @@ -982,8 +973,7 @@ namespace os << "// Implicit operations." << endl << endl << STRS[COMP_EC] << "_ptr" << endl - << t.name () << "_exec_i::create (" << endl - << ")" << endl + << t.name () << "_exec_i::create ()" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_CE] << "))" << endl diff --git a/CIAO/CIDLC/Literals.cpp b/CIAO/CIDLC/Literals.cpp index 4c337d892ef..0ed8f8e9699 100644 --- a/CIAO/CIDLC/Literals.cpp +++ b/CIAO/CIDLC/Literals.cpp @@ -75,7 +75,6 @@ namespace StringLiterals "_ciao_extract_val", // EXTRACT "_ciao_extract_tmp", // EXTRACT_TMP "ACE_UNUSED_ARG", // ACE_UA - "throw", // ACE_TH "ACE_THROW_RETURN" // ACE_TR }; } diff --git a/CIAO/CIDLC/Literals.hpp b/CIAO/CIDLC/Literals.hpp index 8c94011a6df..09e2a8cb7c4 100644 --- a/CIAO/CIDLC/Literals.hpp +++ b/CIAO/CIDLC/Literals.hpp @@ -48,7 +48,6 @@ namespace StringLiterals EXTRACT, EXTRACT_TMP, ACE_UA, - ACE_TH, ACE_TR, LIT_SIZE }; diff --git a/CIAO/CIDLC/OperationHeaderEmitters.cpp b/CIAO/CIDLC/OperationHeaderEmitters.cpp index 097669bae5e..e41e3d6d023 100644 --- a/CIAO/CIDLC/OperationHeaderEmitters.cpp +++ b/CIAO/CIDLC/OperationHeaderEmitters.cpp @@ -33,8 +33,7 @@ OperationEmitter::receives_pre (Type&) void OperationEmitter::receives_none (Type&) { - os << " (" << endl - << ")" << endl; + os << " ()" << endl; } void @@ -131,8 +130,7 @@ FactoryOperationEmitter::name (SemanticGraph::HomeFactory& t) void FactoryOperationEmitter::receives_none (SemanticGraph::HomeFactory&) { - os << " (" << endl - << ")" << endl; + os << " ()" << endl; } void @@ -218,8 +216,7 @@ FinderOperationEmitter::name (SemanticGraph::HomeFinder& t) void FinderOperationEmitter::receives_none (SemanticGraph::HomeFinder&) { - os << " (" << endl - << ")" << endl; + os << " ()" << endl; } void diff --git a/CIAO/CIDLC/ServantHeaderGenerator.cpp b/CIAO/CIDLC/ServantHeaderGenerator.cpp index a6602ede0aa..6676db3e77d 100644 --- a/CIAO/CIDLC/ServantHeaderGenerator.cpp +++ b/CIAO/CIDLC/ServantHeaderGenerator.cpp @@ -122,8 +122,7 @@ namespace os << "// Get component implementation." << endl << "virtual CORBA::Object_ptr" << endl - << "_get_component (" << endl - << ")" << endl + << "_get_component ()" << endl << STRS[EXCP_SNGL] << ";" << endl << "protected:" << endl << "// Facet executor." << endl @@ -174,8 +173,7 @@ namespace Traversal::EmitterData::belongs (e, belongs_); - os << "ev" << endl - << ")" << endl + os << "ev)" << endl << STRS[EXCP_SNGL] << ";" << endl; } @@ -188,8 +186,7 @@ namespace os << endl << "get_connection_" << u.name () - << " (" << endl - << ")" << endl + << " ()" << endl << STRS[EXCP_SNGL] << ";" << endl; } @@ -198,8 +195,7 @@ namespace { os << "virtual " << u.scoped_name () << "Connections *" << endl << "get_connections_" << u.name () - << " (" << endl - << ")" << endl + << " ()" << endl << STRS[EXCP_SNGL] << ";" << endl; } @@ -212,8 +208,7 @@ namespace Traversal::PublisherData::belongs (p, belongs_); - os << "ev" << endl - << ")" << endl + os << "ev)" << endl << STRS[EXCP_SNGL] << ";" << endl; } @@ -243,8 +238,7 @@ namespace Traversal::EmitterData::belongs (e, belongs_); - os << "Consumer_ptr c" << endl - << ")" << endl + os << "Consumer_ptr c)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_AC] << "));" << endl; @@ -254,8 +248,7 @@ namespace Traversal::EmitterData::belongs (e, belongs_); os << "Consumer_ptr" << endl - << "disconnect_" << e.name () << " (" << endl - << ")" << endl + << "disconnect_" << e.name () << " ()" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_NC] << "));" << endl; @@ -269,8 +262,7 @@ namespace Traversal::SingleUserData::belongs (u, belongs_); - os << "_ptr" << endl - << ")" << endl + os << "_ptr)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_AC] << "," << endl @@ -281,8 +273,7 @@ namespace Traversal::SingleUserData::belongs (u, belongs_); os << "_ptr" << endl - << "disconnect_" << u.name () << " (" << endl - << ")" << endl + << "disconnect_" << u.name () << " ()" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_NC] << "));" << endl; @@ -296,8 +287,7 @@ namespace Traversal::MultiUserData::belongs (u, belongs_); - os << "_ptr" << endl - << ")" << endl + os << "_ptr)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_ECL] << "," << endl @@ -309,8 +299,7 @@ namespace os << "_ptr" << endl << "disconnect_" << u.name () << " (" << endl - << "::Components::Cookie * ck" << endl - << ")" << endl + << "::Components::Cookie * ck)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_IC] << "));" << endl; @@ -324,8 +313,7 @@ namespace Traversal::PublisherData::belongs (p, belongs_); - os << "Consumer_ptr c" << endl - << ")" << endl + os << "Consumer_ptr c)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_ECL] << "));" << endl; @@ -333,8 +321,7 @@ namespace os << "// CIAO-specific." << endl << STRS[COMP_CK] << " *" << endl << "subscribe_" << p.name () << "_generic (" << endl - << STRS[COMP_ECB] << "_ptr c" << endl - << ")" << endl + << STRS[COMP_ECB] << "_ptr c)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_ECL] << "));" << endl; @@ -345,8 +332,7 @@ namespace os << "Consumer_ptr" << endl << "unsubscribe_" << p.name () << " (" << endl - << STRS[COMP_CK] << " *ck" << endl - << ")" << endl + << STRS[COMP_CK] << " *ck)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_IC] << "));" << endl; @@ -491,8 +477,7 @@ namespace os << "virtual " << STRS[COMP_CD] << " *" << endl << "get_registered_consumers (" << endl - << "const char *publisher_name" << endl - << ")" << endl + << "const char *publisher_name)" << endl << STRS[EXCP_START] << endl << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_IN] << "," << endl @@ -503,8 +488,7 @@ namespace os << "static " << t.name () << "_Context *" << endl << "_narrow (" << endl - << STRS[COMP_SC] << "_ptr p" << endl - << ");" << endl; + << STRS[COMP_SC] << "_ptr p);" << endl; os << "protected:" << endl << "// Methods that manage this component's connections" @@ -604,8 +588,7 @@ namespace Traversal::SingleUserData::belongs (u, belongs_); - os << "_ptr c" << endl - << ")" << endl + os << "_ptr c)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_AC] << "," << endl @@ -616,8 +599,7 @@ namespace Traversal::SingleUserData::belongs (u, belongs_); os << "_ptr" << endl - << "disconnect_" << u.name () << " (" << endl - << ")" << endl + << "disconnect_" << u.name () << " ()" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_NC] << "));" << endl; @@ -640,8 +622,7 @@ namespace Traversal::MultiUserData::belongs (u, belongs_); - os << "_ptr c" << endl - << ")" << endl + os << "_ptr c)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_ECL] << "," << endl @@ -653,8 +634,7 @@ namespace os << "_ptr" << endl << "disconnect_" << u.name () << " (" << endl - << "::Components::Cookie * ck" << endl - << ")" << endl + << "::Components::Cookie * ck)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_IC] << "));" << endl; @@ -716,8 +696,7 @@ namespace os << "// Inherited from " << STRS[COMP_ECB] << "." << endl << "virtual void" << endl - << "push_event ( ::Components::EventBase *ev" << endl - << ")" << endl + << "push_event ( ::Components::EventBase *ev)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_BET] << "));" << endl; @@ -728,8 +707,7 @@ namespace << "virtual void" << endl << "ciao_push_event ( ::Components::EventBase *ev," << endl << "const char * source_id," << endl - << "::CORBA::TypeCode_ptr tc" << endl - << ")" << endl + << "::CORBA::TypeCode_ptr tc)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_BET] << "));" << endl; @@ -778,8 +756,7 @@ namespace Traversal::EmitterData::belongs (e, belongs_); - os << "Consumer_ptr c" << endl - << ")" << endl + os << "Consumer_ptr c)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_AC] << "));" << endl; @@ -789,8 +766,7 @@ namespace Traversal::EmitterData::belongs (e, belongs_); os << "Consumer_ptr" << endl - << "disconnect_" << e.name () << " (" << endl - << ")" << endl + << "disconnect_" << e.name () << " ()" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_NC] << "));" << endl; @@ -804,8 +780,7 @@ namespace Traversal::PublisherData::belongs (p, belongs_); - os << "Consumer_ptr c" << endl - << ")" << endl + os << "Consumer_ptr c)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_ECL] << "));" << endl; @@ -813,8 +788,7 @@ namespace os << "// CIAO-specific." << endl << STRS[COMP_CK] << " *" << endl << "subscribe_" << p.name () << "_generic (" << endl - << STRS[COMP_ECB] << "_ptr c" << endl - << ")" << endl + << STRS[COMP_ECB] << "_ptr c)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_ECL] << "));" << endl; @@ -825,8 +799,7 @@ namespace os << "Consumer_ptr" << endl << "unsubscribe_" << p.name () << " (" << endl - << STRS[COMP_CK] << " *ck" << endl - << ")" << endl + << STRS[COMP_CK] << " *ck)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_IC] << "));" << endl; @@ -1084,8 +1057,7 @@ namespace os << "virtual " << STRS[COMP_CK] << " *" << endl << "connect (" << endl << "const char *name," << endl - << "CORBA::Object_ptr connection" << endl - << ")" << endl + << "CORBA::Object_ptr connection)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_IN] << "," << endl @@ -1096,8 +1068,7 @@ namespace os << "virtual CORBA::Object_ptr" << endl << "disconnect (" << endl << "const char *name," << endl - << STRS[COMP_CK] << " *ck" << endl - << ")" << endl + << STRS[COMP_CK] << " *ck)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_IN] << "," << endl @@ -1115,8 +1086,7 @@ namespace os << "virtual " << STRS[COMP_CK] << " *" << endl << "subscribe (" << endl << "const char *publisher_name," << endl - << STRS[COMP_ECB] << "_ptr subscriber" << endl - << ")" << endl + << STRS[COMP_ECB] << "_ptr subscriber)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_IN] << "," << endl @@ -1126,8 +1096,7 @@ namespace os << "virtual " << STRS[COMP_ECB] << "_ptr" << endl << "unsubscribe (" << endl << "const char *publisher_name," << endl - << STRS[COMP_CK] << " *ck" << endl - << ")" << endl + << STRS[COMP_CK] << " *ck)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_IN] << "," << endl @@ -1136,8 +1105,7 @@ namespace os << "virtual void" << endl << "connect_consumer (" << endl << "const char *emitter_name," << endl - << STRS[COMP_ECB] << "_ptr consumer" << endl - << ")" << endl + << STRS[COMP_ECB] << "_ptr consumer)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_IN] << "," << endl @@ -1146,8 +1114,7 @@ namespace os << "virtual " << STRS[COMP_ECB] << "_ptr" << endl << "disconnect_consumer (" << endl - << "const char *source_name" << endl - << ")" << endl + << "const char *source_name)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_IN] << "," << endl @@ -1166,8 +1133,7 @@ namespace os << "// CIAO specific operations on the servant. " << endl << "CORBA::Object_ptr" << endl << "get_facet_executor (" << endl - << "const char *name" << endl - << ")" << endl + << "const char *name)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS]<< "));" << endl; diff --git a/CIAO/CIDLC/ServantSourceGenerator.cpp b/CIAO/CIDLC/ServantSourceGenerator.cpp index a0169356db7..f4d715b523d 100644 --- a/CIAO/CIDLC/ServantSourceGenerator.cpp +++ b/CIAO/CIDLC/ServantSourceGenerator.cpp @@ -99,8 +99,7 @@ namespace virtual void receives_none (Type&) { - os << " (" << endl - << ");"; + os << " ();"; } virtual void @@ -180,14 +179,14 @@ namespace // Overridden by facet and home operation emitters to do nothing. virtual void - gen_swap_related (Type&) + gen_swap_related (Type& o) { string swap_option = ctx.cl ().get_value ("custom-container", ""); bool swapping = (swap_option == "upgradeable"); if (swapping) { - os << "this->activate_component (" << ");" << endl; + os << "this->activate_component ();" << endl; } } @@ -207,8 +206,7 @@ namespace virtual void receives_none (Type&) { - os << " (" << endl - << ")" << endl; + os << " ()" << endl; } virtual void @@ -506,6 +504,7 @@ namespace << " " << STRS[COMP_SC] << "::_narrow (" << endl << " this->ctx_.in ()" << endl << " " << ");" + << endl << "if (! ::CORBA::is_nil (sc.in ()))" << endl << "{" << "return sc->get_CCM_object (" << endl @@ -515,6 +514,7 @@ namespace << "::Components::EntityContext::_narrow (" << endl << "this->ctx_.in ()" << endl << ");" + << endl << "if (! ::CORBA::is_nil (ec.in ()))" << endl << "{" << "return ec->get_CCM_object (" << endl @@ -582,8 +582,7 @@ namespace Traversal::SingleUserData::belongs (u, belongs_); - os << "_ptr c" << endl - << ")" << endl + os << "_ptr c)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_AC] << "," << endl @@ -592,11 +591,11 @@ namespace << "if (! ::CORBA::is_nil (this->ciao_uses_" << u.name () << "_.in ()))" << endl << "{" - << "ACE_THROW ( " << STRS[EXCP_AC] << " ());" + << "throw " << STRS[EXCP_AC] << " ();" << "}" << "if ( ::CORBA::is_nil (c))" << endl << "{" - << "ACE_THROW ( " << STRS[EXCP_IC] << " ());" + << "throw " << STRS[EXCP_IC] << " ();" << "}" << "this->ciao_uses_" << u.name () << "_ =" << endl << " "; @@ -610,8 +609,7 @@ namespace os << "_ptr" << endl << scope_.name () << "_Context::disconnect_" - << u.name () << " (" << endl - << ")" << endl + << u.name () << " ()" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_NC] << "))" << endl @@ -695,8 +693,7 @@ namespace Traversal::MultiUserData::belongs (u, belongs_); - os << "_ptr c" << endl - << ")" << endl + os << "_ptr c)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_ECL] << "," << endl @@ -741,8 +738,7 @@ namespace os << "_ptr" << endl << scope_.name () << "_Context::disconnect_" << u.name () << " (" << endl - << STRS[COMP_CK] << " * ck" << endl - << ")" << endl + << STRS[COMP_CK] << " * ck)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_IC] << "))" << endl @@ -810,8 +806,7 @@ namespace os << " (" << endl << "ev" << endl - << ");" - << endl + << ");" << endl << "}"; // @@ GD Modified Code Below @@ -840,8 +835,7 @@ namespace Traversal::PublisherData::belongs (p, simple_belongs_); os << endl - << ");" - << endl + << ");" << endl << "}" << "}"; @@ -851,8 +845,7 @@ namespace Traversal::PublisherData::belongs (p, belongs_); - os << "Consumer_ptr c" << endl - << ")" << endl + os << "Consumer_ptr c)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_ECL] << "))" << endl @@ -885,8 +878,7 @@ namespace os << STRS[COMP_CK] << " *" << endl << scope_.name () << "_Context::subscribe_" << p.name () << "_generic (" << endl - << STRS[COMP_ECB] << "_ptr c" << endl - << ")" << endl + << STRS[COMP_ECB] << "_ptr c)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_ECL] << "))" << endl @@ -915,8 +907,7 @@ namespace os << "Consumer_ptr" << endl << scope_.name () << "_Context::unsubscribe_" << p.name () << " (" << endl - << STRS[COMP_CK] << " *ck" << endl - << ")" << endl + << STRS[COMP_CK] << " *ck)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_IC] << "))" << endl @@ -991,20 +982,19 @@ namespace Traversal::EmitterData::belongs (e, belongs_); - os << "Consumer_ptr c" << endl - << ")" << endl + os << "Consumer_ptr c)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_AC] << "))" << endl << "{" << "if ( ::CORBA::is_nil (c))" << endl << "{" - << "ACE_THROW ( ::CORBA::BAD_PARAM ());" << endl + << "throw ::CORBA::BAD_PARAM ();" << endl << "}" << "if (! ::CORBA::is_nil (this->ciao_emits_" << e.name () << "_consumer_.in ()))" << endl << "{" - << "ACE_THROW ( " << STRS[EXCP_AC] << " ());" << endl + << "throw " << STRS[EXCP_AC] << " ();" << endl << "}" << "this->ciao_emits_" << e.name () << "_consumer_ = " << endl; @@ -1018,8 +1008,7 @@ namespace os << "Consumer_ptr" << endl << scope_.name () << "_Context::disconnect_" - << e.name () << " (" << endl - << ")" << endl + << e.name () << " ()" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_NC] << "))" << endl @@ -1216,8 +1205,7 @@ namespace os << STRS[COMP_CD] << " *" << endl << t.name () << "_Context::get_registered_consumers (" << endl - << "const char *publisher_name" << endl - << ")" << endl + << "const char *publisher_name)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_IN] << "," << endl @@ -1305,11 +1293,10 @@ namespace os << "Consumer::_narrow (" << endl << " consumer" << endl - << " " << ");" - << endl + << " " << ");" << endl << "if ( ::CORBA::is_nil (_ciao_consumer.in ()))" << endl << "{" - << "ACE_THROW ( " << STRS[EXCP_IC] << " ());" + << "throw " << STRS[EXCP_IC] << " ();" << endl << "}" << "this->connect_" << t.name () @@ -1340,7 +1327,7 @@ namespace << t.name ().unescaped_str () << "\") == 0)" << endl << "{" << "return this->disconnect_" << t.name () - << " (" << ");" << endl + << " ();" << endl << "}"; } }; @@ -1359,7 +1346,7 @@ namespace << t.name ().unescaped_str () << "\") == 0)" << endl << "{" << "return this->executor_->get_" << t.name () - << " (" << ");" << endl + << " ();" << endl << "}"; } }; @@ -1385,8 +1372,7 @@ namespace Traversal::PublisherData::belongs (p, belongs_); - os << "Consumer_ptr c" << endl - << ")" << endl + os << "Consumer_ptr c)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_ECL] << "))" << endl @@ -1397,7 +1383,8 @@ namespace if (swapping) { - os << "this->activate_component (" << ");" << endl; + os << "this->activate_component ();" + << endl; } os << "return this->context_->subscribe_" << p.name () @@ -1409,8 +1396,7 @@ namespace os << STRS[COMP_CK] << " *" << endl << scope_.name () << "_Servant::subscribe_" << p.name () << "_generic (" << endl - << STRS[COMP_ECB] << "_ptr c" << endl - << ")" << endl + << STRS[COMP_ECB] << "_ptr c)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_ECL] << "))" << endl @@ -1418,7 +1404,8 @@ namespace if (swapping) { - os << "this->activate_component (" << ");" << endl; + os << "this->activate_component ();" + << endl; } os << "return this->context_->subscribe_" << p.name () @@ -1432,8 +1419,7 @@ namespace os << "Consumer_ptr" << endl << scope_.name () << "_Servant::unsubscribe_" << p.name () << " (" << endl - << STRS[COMP_CK] << " *ck" << endl - << ")" << endl + << STRS[COMP_CK] << " *ck)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_IC] << "))" << endl @@ -1441,7 +1427,8 @@ namespace if (swapping) { - os << "this->activate_component (" << ");" << endl; + os << "this->activate_component ();" + << endl; } os << "return this->context_->unsubscribe_" @@ -1550,7 +1537,7 @@ namespace << "{" << "// Simplex disconnect." << endl << "return this->disconnect_" << u.name () - << " (" << ");" << endl + << " ();" << endl << "}"; } @@ -1595,8 +1582,7 @@ namespace Traversal::SingleUserData::belongs (u, belongs_); - os << "_ptr c" << endl - << ")" << endl + os << "_ptr c)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_AC] << "," << endl @@ -1614,8 +1600,7 @@ namespace os << "_ptr" << endl << scope_.name () << "_Servant::disconnect_" - << u.name () << " (" << endl - << ")" << endl + << u.name () << " ()" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_NC] << "))" << endl @@ -1649,8 +1634,7 @@ namespace Traversal::MultiUserData::belongs (u, belongs_); - os << "_ptr c" << endl - << ")" << endl + os << "_ptr c)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_ECL] << "," << endl @@ -1671,8 +1655,7 @@ namespace os << "_ptr" << endl << scope_.name () << "_Servant::disconnect_" << u.name () << " (" << endl - << STRS[COMP_CK] << " * ck" << endl - << ")" << endl + << STRS[COMP_CK] << " * ck)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_IC] << "))" << endl @@ -1809,8 +1792,7 @@ namespace Traversal::EmitterData::belongs (e, belongs_); - os << "Consumer_ptr c" << endl - << ")" << endl + os << "Consumer_ptr c)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_AC] << "))" << endl @@ -1825,8 +1807,7 @@ namespace os << "Consumer_ptr" << endl << scope_.name () << "_Servant::disconnect_" - << e.name () << " (" << endl - << ")" << endl + << e.name () << " ()" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_NC] << "))" << endl @@ -1899,8 +1880,9 @@ namespace if (swapping) - { - os << "this->activate_component (" << ");" << endl; + { + os << "this->activate_component ();" + << endl; } os << "if (! ::CORBA::is_nil (this->provide_" @@ -1915,7 +1897,8 @@ namespace os << "::CORBA::Object_var obj =" << endl << " this->provide_" << p.name () << "_i (" - << ");" << endl; + << ");" + << endl; ScopedName scoped (scope_.scoped_name ()); Name stripped (scoped.begin () + 1, scoped.end ()); @@ -1929,7 +1912,8 @@ namespace os << "::_narrow (" << "obj.in ()" << endl - << ");" << endl + << ");" + << endl << "this->provide_" << p.name () << "_ = fo;" << "return "; @@ -2036,11 +2020,13 @@ namespace os << "," << endl << " ::CIAO::Container::Facet_Consumer" << endl - << " " << ");" << endl + << " " << ");" + << endl << "this->add_facet (\"" << p.name ().unescaped_str () << "\"," << endl << "obj.in ()" << endl - << ");" << endl; + << ");" + << endl; os << "return obj._retn ();" << endl << "}"; @@ -2132,7 +2118,7 @@ namespace << STRS[EXCP_SNGL] << endl << "{" << "return this->ctx_->get_CCM_object " - << "(" << ");" << endl + << "();" << endl << "}"; os << "void" << endl @@ -2167,8 +2153,7 @@ namespace os << "Consumer_" << c.name () << "_Servant::push_event (" << endl - << "::Components::EventBase *ev" << endl - << ")" << endl + << "::Components::EventBase *ev)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_BET] << "))" << endl @@ -2193,7 +2178,7 @@ namespace << ");" << endl << "return;" << endl << "}" - << "ACE_THROW ( " << STRS[EXCP_BET] << " ());" << endl + << "throw " << STRS[EXCP_BET] << " ();" << endl << "}"; // GD Added below code @@ -2209,8 +2194,7 @@ namespace << "_Servant::ciao_push_event (" << endl << "::Components::EventBase *ev," << endl << "const char * /* source_id */," << endl - << "::CORBA::TypeCode_ptr /* tc */" << endl - << ")" << endl + << "::CORBA::TypeCode_ptr /* tc */)" << endl << STRS[EXCP_START] << " " << STRS[EXCP_SYS] << "," << endl << STRS[EXCP_BET] << "))" << endl @@ -2238,7 +2222,8 @@ namespace << scope_.name () << "_Context *ctx =" << endl << " " << scope_.name () << "_Context::_narrow (" << endl << " this->ctx_.in ()" << endl - << " " << ");" << endl; + << " " << ");" + << endl; os << "CORBA::ORB_ptr orb = ctx->_ciao_the_Container ()->the_ORB ();" << endl; @@ -2246,14 +2231,16 @@ namespace os << "CORBA::ValueFactory f =" << endl << " orb->lookup_value_factory (" << endl << " event_repo_id" << endl - << " " << ");" << endl; + << " " << ");" + << endl; os << "if (f == 0)" << endl << "{" << "return false;" << endl << "}" << "CORBA::ValueBase_var v =" << endl - << " f->create_for_unmarshal (" << ");" << endl; + << " f->create_for_unmarshal ();" + << endl; os << "f->_remove_ref ();" << endl; @@ -2290,7 +2277,8 @@ namespace os << "::Components::EventConsumerBase_var obj =" << endl << " this->get_consumer_" << c.name () << "_i (" << endl - << " " << ");" << endl; + << " " << ");" + << endl; Traversal::ConsumerData::belongs (c, belongs_); @@ -2301,9 +2289,9 @@ namespace os << "Consumer::_narrow (" << endl << " obj.in ()" << endl - << " " << ");" << endl; - - os << "this->consumes_" << c.name () << "_ = eco;" + << " " << ");" + << endl + << "this->consumes_" << c.name () << "_ = eco;" << "return "; Traversal::ConsumerData::belongs (c, belongs_); @@ -2399,17 +2387,20 @@ namespace os << "," << endl << " ::CIAO::Container::Facet_Consumer" << endl - << " " << ");" << endl; + << " " << ");" + << endl; os << "::Components::EventConsumerBase_var ecb =" << endl << " ::Components::EventConsumerBase::_narrow (" << endl << " obj.in ()" << endl - << " " << ");" << endl; + << " " << ");" + << endl; os << "this->add_consumer (\"" << c.name ().unescaped_str () << "\"," << endl << "ecb.in ()" << endl - << ");" << endl; + << ");" + << endl; os << "return ecb._retn ();" << endl << "}"; @@ -2624,8 +2615,7 @@ namespace { os << "obj_var =" << endl << " this->provide_" << p.name () << "_i (" << endl - << " " << ");" - << endl; + << " " << ");" << endl; } virtual void @@ -2648,8 +2638,7 @@ namespace { os << "ecb_var =" << endl << " this->get_consumer_" << p.name () << "_i (" << endl - << " " << ");" - << endl; + << " " << ");" << endl; } }; @@ -2946,28 +2935,25 @@ namespace component_emitter.traverse (t); } - os << "ACE_TRY_NEW_ENV" << endl + os << "try" << endl << "{" << "::Components::SessionComponent_var scom =" << endl << " ::Components::SessionComponent::_narrow (" << endl << " exe" << endl - << " " << ");" - << endl + << " " << ");" << endl << "if (! ::CORBA::is_nil (scom.in ()))" << endl << "{" << "scom->set_session_context (" << endl << "this->context_" << endl << ");" - << "}" << "this->populate_port_tables (" << endl << ");" - << "}" - << "ACE_CATCHANY" << endl + << "catch (const CORBA::Exception&)" << endl << "{" << "}" - << "ACE_ENDTRY;" << endl + << endl << "}"; // Servant Destructor @@ -2981,16 +2967,15 @@ namespace << t.name () << "_Servant::set_attributes (" << endl << "const ::Components::ConfigValues &descr" << endl << ")" << endl - << "{" - << endl; + << "{" << endl; string swap_option = ctx.cl ().get_value ("custom-container", ""); bool swapping = (swap_option == "upgradeable"); if (swapping) { - os << "this->activate_component (" << ");" - << endl; + os << "this->activate_component ();" + << endl; } os << "for ( ::CORBA::ULong i = 0; i < descr.length (); ++i)" << endl @@ -3088,7 +3073,7 @@ namespace if (swapping) { - os << "this->activate_component (" << ");" + os << "this->activate_component ();" << endl; } @@ -3136,7 +3121,8 @@ namespace if (swapping) { - os << "this->activate_component (" << ");" << endl; + os << "this->activate_component ();" + << endl; } os << "if (name == 0)" << endl @@ -3252,13 +3238,13 @@ namespace if (swapping) { - os << "this->activate_component (" << ");" + os << "this->activate_component ();" << endl; } os << "if (emitter_name == 0)" << endl << "{" - << STRS[ACE_TH] << " ( " << STRS[EXCP_BP] << ");" << endl + << "throw " << STRS[EXCP_BP] << ";" << endl << "}"; // Generate an IF block for each 'emits' declaration. @@ -3279,8 +3265,8 @@ namespace } os << STRS[ACE_UA] << " (consumer);" - << STRS[ACE_TH] << " ( " - << STRS[EXCP_IN] << " ());" << endl + << "throw " + << STRS[EXCP_IN] << " ();" << endl << "}"; os << STRS[COMP_ECB] << "_ptr" << endl @@ -3295,7 +3281,8 @@ namespace if (swapping) { - os << "this->activate_component (" << ");" << endl; + os << "this->activate_component ();" + << endl; } os << "if (source_name == 0)" << endl @@ -3440,7 +3427,8 @@ namespace if (swapping) { - os << "this->activate_component (" << ");" << endl; + os << "this->activate_component ();" + << endl; } os << "// Just in case there are no if blocks" << endl @@ -3485,7 +3473,8 @@ namespace if (swapping) { - os << "this->activate_component (" << ");" << endl; + os << "this->activate_component ();" + << endl; } os << "// Just in case there are no if blocks" << endl @@ -3547,7 +3536,8 @@ namespace if (swapping) { - os << "this->activate_component (" << ");" << endl; + os << "this->activate_component ();" + << endl; } os << "if (name == 0)" << endl @@ -3666,6 +3656,7 @@ namespace << ")" << endl << STRS[EXCP_SNGL] << endl << "{" + << ";" << "::CORBA::Object_var obj_var;" << "::Components::EventConsumerBase_var ecb_var;" << endl; @@ -3851,8 +3842,6 @@ namespace operation_emitter.traverse (hf); } - os << endl; - Traversal::Home::manages (scope_, enclosing_manages_); os << "::CCM_"; diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index e2ef5697d80..7ef02ab281c 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,11 +1,18 @@ +Thu Jan 25 18:18:58 UTC 2007 Chad Elliott <elliott_c@ociweb.com> + + * *.{h,cpp,inl}: + + Removed the majority of the ACE exception macros. The + ACE_THROW_RETURN's were left in to avoid warnings from aCC. + Wed Jan 24 13:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> - * *.{h,cpp,inl} + * *.{h,cpp,inl}: Removed part of the environment macros Mon Jan 22 23:14:56 2007 William R. Otte <wotte@dre.vanderbilt.edu> - * CIAO version 0.5.5 released. + * CIAO version 0.5.5 released. Local Variables: diff --git a/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp b/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp index a0cf11d9609..342aa0ddb5a 100644 --- a/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp +++ b/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp @@ -113,8 +113,7 @@ CIAO::Deployment_Configuration::get_default_node_manager_ior (void) const } ::Deployment::NodeManager_ptr -CIAO::Deployment_Configuration::get_node_manager (const char *name - ACE_ENV_ARG_DECL) +CIAO::Deployment_Configuration::get_node_manager (const char *name) { if (name == 0) return get_default_node_manager (); @@ -135,40 +134,35 @@ CIAO::Deployment_Configuration::get_node_manager (const char *name if (CORBA::is_nil (entry->int_id_.node_manager_.in ())) { - ACE_TRY + try { CORBA::Object_var temp = this->orb_->string_to_object - (entry->int_id_.IOR_.c_str () - ACE_ENV_ARG_PARAMETER); + (entry->int_id_.IOR_.c_str ()); entry->int_id_.node_manager_ = - ::Deployment::NodeManager::_narrow (temp.in () - ACE_ENV_ARG_PARAMETER); + ::Deployment::NodeManager::_narrow (temp.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_ERROR ((LM_ERROR, "DANCE (%P|%t) Deployment_Configuration.cpp: " "Error while contacting NodeManager %s\n", name)); - ACE_RE_THROW; + throw; } - ACE_ENDTRY; } return ::Deployment::NodeManager::_duplicate (entry->int_id_.node_manager_.in ()); } ::Deployment::NodeManager_ptr -CIAO::Deployment_Configuration::get_default_node_manager (void) +CIAO::Deployment_Configuration::get_default_node_manager () { if (CORBA::is_nil (this->default_node_manager_.node_manager_.in ())) { CORBA::Object_var temp = this->orb_->string_to_object - (this->default_node_manager_.IOR_.c_str () - ACE_ENV_ARG_PARAMETER); + (this->default_node_manager_.IOR_.c_str ()); this->default_node_manager_.node_manager_ = - ::Deployment::NodeManager::_narrow (temp.in () - ACE_ENV_ARG_PARAMETER); + ::Deployment::NodeManager::_narrow (temp.in ()); } return ::Deployment::NodeManager::_duplicate (this->default_node_manager_.node_manager_.in ()); diff --git a/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h b/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h index f0f45076a9a..af17d4357ed 100644 --- a/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h +++ b/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h @@ -98,8 +98,7 @@ namespace CIAO * @retval nil if no valid name were found. */ ::Deployment::NodeManager_ptr - get_node_manager (const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + get_node_manager (const char *name); /** * Return the reference to the default NodeManager the @@ -109,7 +108,7 @@ namespace CIAO * @retval nil if no valid daemon is configured. */ ::Deployment::NodeManager_ptr - get_default_node_manager (void); + get_default_node_manager (); protected: CORBA::ORB_var orb_; diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp index f4e5c6852ce..74a6177e5a8 100644 --- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp +++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp @@ -40,7 +40,6 @@ DomainApplicationManager_Impl (CORBA::ORB_ptr orb, is_redeployment_ (false), esd_ (0) { - ACE_DECLARE_NEW_CORBA_ENV; ACE_NEW_THROW_EX (this->all_connections_, Deployment::Connections (), CORBA::NO_MEMORY ()); @@ -92,7 +91,7 @@ get_node_app (const char * node_name) "ERROR while finding the node application " "for the node [%s] \n", node_name)); - ACE_THROW (Deployment::NoSuchName ()); + throw Deployment::NoSuchName (); } return @@ -102,13 +101,13 @@ get_node_app (const char * node_name) void CIAO::DomainApplicationManager_Impl:: -init (void) +init () ACE_THROW_SPEC ((CORBA::SystemException, Deployment::ResourceNotAvailable, Deployment::StartError, Deployment::PlanError)) { - ACE_TRY + try { //Deployment::DnC_Dump::dump (this->plan_); @@ -144,7 +143,7 @@ init (void) "DAnCE (%P|%t) DomainApplicationManager_Impl.cpp -" "CIAO::DomainApplicationManager_Impl::init -" "ERROR while calling get_plan_info () \n")); - ACE_TRY_THROW (Deployment::PlanError ()); + throw Deployment::PlanError (); } // Call split_plan() @@ -154,7 +153,7 @@ init (void) "DAnCE (%P|%t) DomainApplicationManager_Impl.cpp -" "CIAO::DomainApplicationManager_Impl::init -" "ERROR while calling split_plan () \n")); - ACE_TRY_THROW (Deployment::PlanError ()); + throw Deployment::PlanError (); } // Invoke preparePlan on each NodeManager by giving child plan. @@ -177,7 +176,7 @@ init (void) "ERROR while finding the node specific plan " "for the node [%s] \n", this->node_manager_names_[i].c_str ())); - ACE_TRY_THROW (Deployment::PlanError ()); + throw Deployment::PlanError (); } Chained_Artifacts & artifacts = entry->int_id_; @@ -186,13 +185,11 @@ init (void) // corresponding child plan as input, which returns a // NodeApplicationManager object reference. Deployment::ApplicationManager_var tmp_app_manager = - my_node_manager->preparePlan (artifacts.child_plan_.in () - ACE_ENV_ARG_PARAMETER); + my_node_manager->preparePlan (artifacts.child_plan_.in ()); Deployment::NodeApplicationManager_var app_manager = Deployment::NodeApplicationManager::_narrow - (tmp_app_manager.in () - ACE_ENV_ARG_PARAMETER); + (tmp_app_manager.in ()); if (CORBA::is_nil (app_manager.in ())) { @@ -207,7 +204,7 @@ init (void) reference for NodeApplicationManager\n"); ACE_DEBUG ((LM_DEBUG, error.c_str ())); - ACE_TRY_THROW + throw (Deployment::StartError ("DomainApplicationManager_Impl:init", error.c_str ())); } @@ -216,13 +213,11 @@ init (void) artifacts.node_application_manager_ = app_manager._retn (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "DomainApplicationManager_Impl::init\t\n"); - ACE_RE_THROW; + ex._tao_print_exception ("DomainApplicationManager_Impl::init\t\n"); + throw; } - ACE_ENDTRY; } bool @@ -503,8 +498,7 @@ add_connections (const Deployment::Connections & incoming_conn) void CIAO::DomainApplicationManager_Impl:: startLaunch (const ::Deployment::Properties & configProperty, - ::CORBA::Boolean start - ACE_ENV_ARG_DECL) + ::CORBA::Boolean start) ACE_THROW_SPEC ((CORBA::SystemException, ::Deployment::ResourceNotAvailable, ::Deployment::StartError, @@ -513,7 +507,7 @@ startLaunch (const ::Deployment::Properties & configProperty, CIAO_TRACE("CIAO::DomainApplicationManager_Impl::startLaunch"); ACE_UNUSED_ARG (start); - ACE_TRY + try { // Clean up all cached connections first this->all_connections_->length (0); @@ -540,7 +534,7 @@ startLaunch (const ::Deployment::Properties & configProperty, ("Unable to resolve a reference to node manager: "); error += this->node_manager_names_[i]; - ACE_TRY_THROW + throw (Deployment::StartError ("DomainApplicationManager_Impl:startLaunch", error.c_str ())); @@ -563,7 +557,7 @@ startLaunch (const ::Deployment::Properties & configProperty, has a nil reference for NodeApplicationManager\n"); ACE_DEBUG ((LM_DEBUG, error.c_str ())); - ACE_TRY_THROW + throw (Deployment::StartError ("DomainApplicationManager_Impl::startLaunch", error.c_str ())); @@ -599,8 +593,7 @@ startLaunch (const ::Deployment::Properties & configProperty, // Narrow down to NodeApplication object reference ::Deployment::NodeApplication_var my_na = - ::Deployment::NodeApplication::_narrow (temp_application.in () - ACE_ENV_ARG_PARAMETER); + ::Deployment::NodeApplication::_narrow (temp_application.in ()); if (CORBA::is_nil (my_na.in ())) { @@ -617,7 +610,7 @@ startLaunch (const ::Deployment::Properties & configProperty, "startLaunch on NodeApplicationManager.\n"); ACE_ERROR ((LM_ERROR, error.c_str ())); - ACE_TRY_THROW + throw (Deployment::StartError ("DomainApplicationManager_Impl::startLaunch", error.c_str ())); @@ -633,19 +626,18 @@ startLaunch (const ::Deployment::Properties & configProperty, this->synchronize_shared_components_with_node_managers (); } - ACE_CATCH (Deployment::StartError,ex) + catch (const Deployment::StartError& ex) { ACE_DEBUG ((LM_DEBUG, "DAM_Impl:StartError: %s, %s\n", ex.name.in (), ex.reason.in ())); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "DomainApplicationManager_Impl::startLaunch\t\n"); - ACE_RE_THROW; + ex._tao_print_exception ( + "DomainApplicationManager_Impl::startLaunch\t\n"); + throw; } - ACE_ENDTRY; } @@ -656,7 +648,7 @@ install_all_es (void) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StartError)) { - ACE_TRY + try { for (CORBA::ULong j = 0; j < this->esd_->length (); ++j) { @@ -677,7 +669,7 @@ install_all_es (void) ("Unable to resolve a reference to NodeManager: "); error += this->esd_[j].node.in (); - ACE_TRY_THROW + throw (Deployment::StartError ("DomainApplicationManager_Impl::install_all_es", error.c_str ())); @@ -694,13 +686,12 @@ install_all_es (void) this->add_es_to_map (this->esd_[j].name.in (), ciao_es.in ()); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "DomainApplicationManager_Impl::install_all_es.\n"); - ACE_RE_THROW; + ex._tao_print_exception ( + "DomainApplicationManager_Impl::install_all_es.\n"); + throw; } - ACE_ENDTRY; } @@ -711,32 +702,30 @@ add_es_to_map (const char * node_name, ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StartError)) { - ACE_TRY + try { this->es_map_.bind ( node_name, CIAO::CIAO_Event_Service::_duplicate (ciao_es)); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "DomainApplicationManager_Impl::add_es_to_map.\n"); - ACE_RE_THROW; + ex._tao_print_exception ( + "DomainApplicationManager_Impl::add_es_to_map.\n"); + throw; } - ACE_ENDTRY; } void CIAO::DomainApplicationManager_Impl:: finishLaunch (CORBA::Boolean start, - CORBA::Boolean is_ReDaC - ACE_ENV_ARG_DECL) + CORBA::Boolean is_ReDaC) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StartError)) { CIAO_TRACE("CIAO::DomainApplicationManager_Impl::finishLaunch"); - ACE_TRY + try { // Install all the CIAO_Event_Services within the Deployment Plan this->install_all_es (); @@ -765,7 +754,7 @@ finishLaunch (CORBA::Boolean start, ("Unable to resolve a reference to NodeManager: "); error += this->node_manager_names_[i]; - ACE_TRY_THROW + throw (Deployment::StartError ("DomainApplicationManager_Impl::finishLaunch", error.c_str ())); @@ -793,8 +782,7 @@ finishLaunch (CORBA::Boolean start, (entry->int_id_).child_plan_.in (), !is_ReDaC, true, // we search *new* plan - DomainApplicationManager_Impl::Internal_Connections - ACE_ENV_ARG_PARAMETER); + DomainApplicationManager_Impl::Internal_Connections); if (my_connections == 0) { @@ -805,7 +793,7 @@ finishLaunch (CORBA::Boolean start, "for the node [%s] \n", this->node_manager_names_[i].c_str ())); - ACE_TRY_THROW + throw (Deployment::StartError ("DomainApplicationManager_Impl::finish_launch", "There was some error establishing connections.")); @@ -831,7 +819,7 @@ finishLaunch (CORBA::Boolean start, (*my_connections, start, true // "true" => establish new connections only - ACE_ENV_ARG_PARAMETER); + ); } //============================================================= @@ -850,8 +838,7 @@ finishLaunch (CORBA::Boolean start, (entry->int_id_).old_child_plan_.in (), true, // yes, get *all* the connections false, // search in the *old* plan - DomainApplicationManager_Impl::Internal_Connections - ACE_ENV_ARG_PARAMETER); + DomainApplicationManager_Impl::Internal_Connections); // Pass in the "false" parameter to get *all* the connections in // the new deployment plan, regardless those in old plan @@ -860,8 +847,7 @@ finishLaunch (CORBA::Boolean start, (entry->int_id_).child_plan_.in (), true, // yes, get *all* the connections true, // search in the *new* plan - DomainApplicationManager_Impl::Internal_Connections - ACE_ENV_ARG_PARAMETER); + DomainApplicationManager_Impl::Internal_Connections); Deployment::Connections * unnecessary_connections = this->subtract_connections (*connections_in_old_plan, @@ -893,7 +879,7 @@ finishLaunch (CORBA::Boolean start, (*unnecessary_connections, start, false // false ==> remove unnecessary connections - ACE_ENV_ARG_PARAMETER); + ); } //============================================================= @@ -918,17 +904,16 @@ finishLaunch (CORBA::Boolean start, // Establish bindings on external/shared components of this deployment plan. this->post_finishLaunch (); } - ACE_CATCH (Deployment::StartError, ex) + catch (const Deployment::StartError& ex) { ACE_ERROR ((LM_ERROR, "DAM_Impl::finishLaunch - StartError: %s, %s\n", ex.name.in (), ex.reason.in ())); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "DomainApplicationManager_Impl::finishLaunch: " - "Killing NodeApplications.\n"); + ex._tao_print_exception ( + "DomainApplicationManager_Impl::finishLaunch: ""Killing NodeApplications.\n"); // Invoke destroyManager() operation on each cached // NodeManager object. @@ -945,12 +930,10 @@ finishLaunch (CORBA::Boolean start, // Invoke destoryApplication() operation on the NodeApplicationManger. // Since we have the first arg is not used by NAM anyway. my_node_application_manager->destroyApplication - (0 - ACE_ENV_ARG_PARAMETER); + (0); } - ACE_RE_THROW; + throw; } - ACE_ENDTRY; } @@ -960,7 +943,7 @@ post_finishLaunch (void) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StartError)) { - ACE_TRY + try { // For each "external" component... CORBA::ULong length = this->shared_->length (); @@ -979,13 +962,12 @@ post_finishLaunch (void) delete binding; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "DomainApplicationManager_Impl::post_finishLaunch.\n"); - ACE_RE_THROW; + ex._tao_print_exception ( + "DomainApplicationManager_Impl::post_finishLaunch.\n"); + throw; } - ACE_ENDTRY; } @@ -1104,7 +1086,7 @@ synchronize_shared_components_with_node_managers (void) ("Unable to resolve a reference to node manager: "); error += this->node_manager_names_[i]; - ACE_TRY_THROW + throw (Deployment::StartError ("DomainApplicationManager_Impl:startLaunch", error.c_str ())); @@ -1127,8 +1109,7 @@ CIAO::DomainApplicationManager_Impl:: get_outgoing_connections (const Deployment::DeploymentPlan &plan, bool is_getting_all_connections, bool is_search_new_plan, - Connection_Search_Type t - ACE_ENV_ARG_DECL) + Connection_Search_Type t) { CIAO_TRACE("CIAO::DomainApplicationManager_Impl::get_outgoing_connections"); Deployment::Connections_var connections; @@ -1149,8 +1130,7 @@ get_outgoing_connections (const Deployment::DeploymentPlan &plan, if (!get_outgoing_connections_i (plan.instance[i].name.in (), connections.inout (), is_getting_all_connections, - is_search_new_plan - ACE_ENV_ARG_PARAMETER)) + is_search_new_plan)) return 0; } return connections._retn (); @@ -1163,8 +1143,7 @@ CIAO::DomainApplicationManager_Impl:: get_outgoing_connections_i (const char * instname, Deployment::Connections & retv, bool is_getting_all_connections, - bool is_search_new_plan - ACE_ENV_ARG_DECL) + bool is_search_new_plan) ACE_THROW_SPEC ((Deployment::StartError)) { CIAO_TRACE("CIAO::DomainApplicationManager_Impl::get_outoing_connections_i"); @@ -1431,13 +1410,13 @@ handle_direct_connection ( void CIAO::DomainApplicationManager_Impl:: -start (void) +start () ACE_THROW_SPEC ((CORBA::SystemException, ::Deployment::StartError)) { CIAO_TRACE("CIAO::DomainApplicationManager_Impl::start"); - ACE_TRY + try { CORBA::ULong i; @@ -1460,9 +1439,9 @@ start (void) ("Unable to resolve a reference to node manager: "); error += this->node_manager_names_[i]; - ACE_TRY_THROW (Deployment::StartError - ("DomainApplicationManager_Impl:startLaunch", - error.c_str ())); + throw Deployment::StartError( + "DomainApplicationManager_Impl:startLaunch", + error.c_str ()); } ::Deployment::NodeApplication_ptr my_na = @@ -1487,7 +1466,7 @@ start (void) "for the node [%s] \n", this->node_manager_names_[i].c_str ())); - ACE_TRY_THROW (Deployment::StartError ()); + throw Deployment::StartError (); } ::Deployment::NodeApplication_ptr my_na = @@ -1518,9 +1497,9 @@ start (void) ("Unable to resolve a reference to node manager: "); error += this->node_manager_names_[i]; - ACE_TRY_THROW (Deployment::StartError - ("DomainApplicationManager_Impl:startLaunch", - error.c_str ())); + throw Deployment::StartError( + "DomainApplicationManager_Impl:startLaunch", + error.c_str ()); } ::Deployment::NodeApplication_ptr my_na = @@ -1529,24 +1508,22 @@ start (void) my_na->ciao_postactivate (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "DomainApplicationManager_Impl::start\t\n"); - ACE_RE_THROW; + ex._tao_print_exception ("DomainApplicationManager_Impl::start\t\n"); + throw; } - ACE_ENDTRY; } void CIAO::DomainApplicationManager_Impl:: -destroyApplication (void) +destroyApplication () ACE_THROW_SPEC ((CORBA::SystemException, ::Deployment::StopError)) { CIAO_TRACE("CIAO::DomainApplicationManager_Impl::destroyApplication"); - ACE_TRY + try { // Passivate shared components also, which should delegate to EM to handle this->passivate_shared_components (); @@ -1570,7 +1547,7 @@ destroyApplication (void) ("Unable to resolve a reference to NodeManager: "); error += this->node_manager_names_[i]; - ACE_TRY_THROW + throw (Deployment::StopError ("DomainApplicationManager_Impl::destroyApplication", error.c_str ())); @@ -1597,8 +1574,7 @@ destroyApplication (void) (entry->int_id_).child_plan_.in (), true, // yes, get *all* the connections true, // yes, we search the current plan - DomainApplicationManager_Impl::External_Connections - ACE_ENV_ARG_PARAMETER); + DomainApplicationManager_Impl::External_Connections); // Invoke finishLaunch() on NodeApplication to remove bindings. // If this NodeApplication is not within the control of this DAM, @@ -1636,7 +1612,7 @@ destroyApplication (void) (connections.in (), true, // "true" ==> start the components false // "false" => remove connections - ACE_ENV_ARG_PARAMETER); + ); } } @@ -1652,8 +1628,7 @@ destroyApplication (void) Deployment::NodeManager_var my_node_manager = (entry->int_id_).node_manager_; - my_node_manager->destroyPlan ((entry->int_id_).child_plan_ - ACE_ENV_ARG_PARAMETER); + my_node_manager->destroyPlan ((entry->int_id_).child_plan_); } // ?? @@ -1664,24 +1639,23 @@ destroyApplication (void) // We should again activate those shared components this->activate_shared_components (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "DomainApplicationManager_Impl::destroyApplication\t\n"); - ACE_RE_THROW; + ex._tao_print_exception ( + "DomainApplicationManager_Impl::destroyApplication\t\n"); + throw; } - ACE_ENDTRY; } void CIAO::DomainApplicationManager_Impl:: -destroyManager (void) +destroyManager () ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StopError)) { CIAO_TRACE("CIAO::DomainApplicationManager_Impl::destroyManager"); - ACE_TRY + try { for (CORBA::ULong i = 0; i < this->num_child_plans_; ++i) { @@ -1692,7 +1666,7 @@ destroyManager (void) if (this->artifact_map_.find (this->node_manager_names_[i], entry) != 0) - ACE_TRY_THROW (Deployment::StopError ()); // Should never happen! + throw Deployment::StopError (); // Should never happen! ::Deployment::NodeManager_var my_node_manager = (entry->int_id_).node_manager_; @@ -1700,25 +1674,22 @@ destroyManager (void) ::Deployment::NodeApplicationManager_var my_nam = (entry->int_id_).node_application_manager_; - my_node_manager->destroyManager (my_nam.in () - ACE_ENV_ARG_PARAMETER); + my_node_manager->destroyManager (my_nam.in ()); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "DomainApplicationManager_Impl::destroyManager\t\n"); - ACE_RE_THROW; + ex._tao_print_exception ( + "DomainApplicationManager_Impl::destroyManager\t\n"); + throw; } - ACE_ENDTRY; } void CIAO::DomainApplicationManager_Impl:: perform_redeployment ( - const Deployment::DeploymentPlan & plan - ACE_ENV_ARG_DECL) + const Deployment::DeploymentPlan & plan) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::PlanError, Deployment::InstallationFailure, @@ -1734,7 +1705,7 @@ perform_redeployment ( this->is_redeployment_ = true; this->plan_ = plan; - ACE_TRY + try { // Call init() on the myself, which will validate/split the plan and // call preparePlan on each NodeManager, by this, we shall get @@ -1763,21 +1734,20 @@ perform_redeployment ( this->start (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "DomainApplicationManager_Impl::perform_redeployment\t\n"); + ex._tao_print_exception ( + "DomainApplicationManager_Impl::perform_redeployment\t\n"); this->plan_ = this->old_plan_; - ACE_RE_THROW; + throw; } - ACE_ENDTRY; } // Returns the DeploymentPlan associated with this ApplicationManager. ::Deployment::DeploymentPlan * CIAO::DomainApplicationManager_Impl:: -getPlan (void) +getPlan () ACE_THROW_SPEC ((CORBA::SystemException)) { CIAO_TRACE("CIAO::DomainApplicationManager_Impl::getPlan"); @@ -1913,7 +1883,7 @@ passivate_shared_components (void) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StartError)) { - ACE_TRY + try { // For each "external" component... CORBA::ULong length = this->shared_->length (); @@ -1932,13 +1902,12 @@ passivate_shared_components (void) delete binding; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "DomainApplicationManager_Impl::passivate_shared_components.\n"); - ACE_RE_THROW; + ex._tao_print_exception ( + "DomainApplicationManager_Impl::passivate_shared_components.\n"); + throw; } - ACE_ENDTRY; } @@ -1948,7 +1917,7 @@ activate_shared_components (void) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StartError)) { - ACE_TRY + try { // For each "external" component... CORBA::ULong length = this->shared_->length (); @@ -1967,13 +1936,12 @@ activate_shared_components (void) delete binding; } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "DomainApplicationManager_Impl::activate_shared_components.\n"); - ACE_RE_THROW; + ex._tao_print_exception ( + "DomainApplicationManager_Impl::activate_shared_components.\n"); + throw; } - ACE_ENDTRY; } diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h index 2efaf7e1842..f9ebd9dba06 100644 --- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h +++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h @@ -116,7 +116,7 @@ namespace CIAO * * @@ What else do we need to initialize here? */ - void init (void) + void init () ACE_THROW_SPEC ((CORBA::SystemException, Deployment::ResourceNotAvailable, Deployment::StartError, @@ -141,8 +141,7 @@ namespace CIAO * Fetch the NodeApplication object reference based on the NodeManager name. */ virtual Deployment::NodeApplication_ptr get_node_app ( - const char * node_name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const char * node_name) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Deployment::NoSuchName)); @@ -160,8 +159,7 @@ namespace CIAO */ virtual void startLaunch (const ::Deployment::Properties & configProperty, - ::CORBA::Boolean start - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::CORBA::Boolean start) ACE_THROW_SPEC ((CORBA::SystemException, ::Deployment::ResourceNotAvailable, ::Deployment::StartError, @@ -174,8 +172,7 @@ namespace CIAO * launching or starting the application fails. */ virtual void finishLaunch (CORBA::Boolean start, - CORBA::Boolean is_ReDAC - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::Boolean is_ReDAC) ACE_THROW_SPEC ((CORBA::SystemException, ::Deployment::StartError)); @@ -203,7 +200,7 @@ namespace CIAO * Starts the application. Raises the StartError exception if * starting the application fails. */ - virtual void start (void) + virtual void start () ACE_THROW_SPEC ((CORBA::SystemException, ::Deployment::StartError)); @@ -213,14 +210,14 @@ namespace CIAO * InvalidReference exception if the appliction reference is * unknown. */ - virtual void destroyApplication (void) + virtual void destroyApplication () ACE_THROW_SPEC ((CORBA::SystemException, ::Deployment::StopError)); /** * Returns the DeploymentPlan associated with this ApplicationManager. */ - virtual ::Deployment::DeploymentPlan * getPlan (void) + virtual ::Deployment::DeploymentPlan * getPlan () ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -230,7 +227,7 @@ namespace CIAO * op invoked on it. This is part of the result for merging DAM * with DA. */ - virtual void destroyManager (void) + virtual void destroyManager () ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StopError)); @@ -238,8 +235,7 @@ namespace CIAO // same UUID of the existing running plan. virtual void perform_redeployment ( - const Deployment::DeploymentPlan & plan - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const Deployment::DeploymentPlan & plan) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::PlanError, Deployment::InstallationFailure, @@ -333,16 +329,14 @@ namespace CIAO get_outgoing_connections (const Deployment::DeploymentPlan &plan, bool is_getting_all_connections = true, bool is_search_new_plan = true, - Connection_Search_Type t = Internal_Connections - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + Connection_Search_Type t = Internal_Connections); /// This is a helper function to find the connection for a component. bool get_outgoing_connections_i (const char * instname, Deployment::Connections & retv, bool is_ReDAC, - bool is_search_new_plan - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + bool is_search_new_plan) ACE_THROW_SPEC ((Deployment::StartError)); bool diff --git a/CIAO/DAnCE/ExecutionManager/DAM_Map.cpp b/CIAO/DAnCE/ExecutionManager/DAM_Map.cpp index 847a5f7c977..350fb63d331 100644 --- a/CIAO/DAnCE/ExecutionManager/DAM_Map.cpp +++ b/CIAO/DAnCE/ExecutionManager/DAM_Map.cpp @@ -74,7 +74,7 @@ namespace CIAO Deployment::DomainApplicationManagers * - DAM_Map::get_dams (void) + DAM_Map::get_dams () { CIAO_TRACE("Execution_Manager::DAM_Map::get_dams"); CORBA::ULong const sz = diff --git a/CIAO/DAnCE/ExecutionManager/DAM_Map.h b/CIAO/DAnCE/ExecutionManager/DAM_Map.h index 7c9436452d1..d69c9d10e9a 100644 --- a/CIAO/DAnCE/ExecutionManager/DAM_Map.h +++ b/CIAO/DAnCE/ExecutionManager/DAM_Map.h @@ -48,7 +48,7 @@ namespace CIAO ::Deployment::DomainApplicationManager_ptr tmp); Deployment::DomainApplicationManagers * - get_dams (void); + get_dams (); bool unbind_dam (const ACE_CString &str); diff --git a/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp b/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp index 8d59e399063..c7b5df7b96a 100644 --- a/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp +++ b/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp @@ -62,12 +62,10 @@ namespace CIAO bool write_ior_file (CORBA::ORB_ptr orb, - CIAO::ExecutionManagerDaemon_ptr obj - ACE_ENV_ARG_DECL) + CIAO::ExecutionManagerDaemon_ptr obj) { CORBA::String_var ior = - orb->object_to_string (obj - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (obj); FILE* ior_output_file_ = ACE_OS::fopen (ior_file_name_, "w"); @@ -104,13 +102,11 @@ namespace CIAO bool register_with_ns (CORBA::ORB_ptr orb, - CIAO::ExecutionManagerDaemon_ptr obj - ACE_ENV_ARG_DECL) + CIAO::ExecutionManagerDaemon_ptr obj) { // Naming Service related operations CORBA::Object_var naming_context_object = - orb->resolve_initial_references ("NameService" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("NameService"); CosNaming::NamingContext_var naming_context = CosNaming::NamingContext::_narrow (naming_context_object.in ()); @@ -140,27 +136,23 @@ namespace CIAO int run_main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); if (!parse_args (argc, argv)) return -1; // Get reference to Root POA. CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + = orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); if (CORBA::is_nil (poa.in ())) @@ -190,16 +182,14 @@ namespace CIAO { retval = register_with_ns (orb.in (), - daemon.in () - ACE_ENV_ARG_PARAMETER); + daemon.in ()); } if (write_to_ior_) { retval = write_ior_file (orb.in (), - daemon.in () - ACE_ENV_ARG_PARAMETER); + daemon.in ()); } if (!retval) @@ -231,18 +221,15 @@ namespace CIAO (void) de.release (); poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "CIAO_ExecutionManager::main\t\n"); + ex._tao_print_exception ("CIAO_ExecutionManager::main\t\n"); return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "CIAO_ExecutionManager has closed\n")); diff --git a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp index 4cc133ac053..8a93b2f5ef0 100644 --- a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp +++ b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp @@ -29,8 +29,7 @@ namespace CIAO Deployment::DomainApplicationManager_ptr Execution_Manager_Impl::preparePlan ( const Deployment::DeploymentPlan &plan, - CORBA::Boolean - ACE_ENV_ARG_DECL) + CORBA::Boolean) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::ResourceNotAvailable, Deployment::PlanError, @@ -127,7 +126,7 @@ namespace CIAO } Deployment::DomainApplicationManagers * - Execution_Manager_Impl::getManagers (void) + Execution_Manager_Impl::getManagers () ACE_THROW_SPEC ((CORBA::SystemException)) { CIAO_TRACE("Execution_Manager::Execution_Manager_Impl::getManagers"); @@ -138,8 +137,7 @@ namespace CIAO } Deployment::DomainApplicationManager_ptr - Execution_Manager_Impl::getManager (const char * plan_uuid - ACE_ENV_ARG_DECL) + Execution_Manager_Impl::getManager (const char * plan_uuid) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::PlanNotExist)) { return this->map_.fetch_dam_reference (plan_uuid); @@ -147,13 +145,12 @@ namespace CIAO void Execution_Manager_Impl::destroyManager ( - Deployment::DomainApplicationManager_ptr manager - ACE_ENV_ARG_DECL) + Deployment::DomainApplicationManager_ptr manager) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StopError)) { CIAO_TRACE("Execution_Manager::Execution_Manager_Impl::destroyManagers"); - ACE_TRY + try { ::Deployment::DeploymentPlan_var plan = manager->getPlan (); @@ -168,32 +165,28 @@ namespace CIAO #if 0 PortableServer::ObjectId_var oid = - this->poa_->reference_to_id (manager - ACE_ENV_ARG_PARAMETER); + this->poa_->reference_to_id (manager); - this->poa_->deactivate_object (oid.in () - ACE_ENV_ARG_PARAMETER); + this->poa_->deactivate_object (oid.in ()); #endif /*if 0*/ } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Execution_Manager_Impl::destroyManager\t\n"); - ACE_THROW (Deployment::StopError ()); + ex._tao_print_exception ( + "Execution_Manager_Impl::destroyManager\t\n"); + throw Deployment::StopError (); } - ACE_ENDTRY; } void Execution_Manager_Impl::destroyManagerByPlan ( - const char * plan_uuid - ACE_ENV_ARG_DECL) + const char * plan_uuid) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StopError)) { CIAO_TRACE("Execution_Manager::Execution_Manager_Impl::destroyManagerByPlan"); - ACE_TRY + try { // Get DomainApplicationManager first if (! this->map_.is_plan_available (plan_uuid)) @@ -201,7 +194,7 @@ namespace CIAO ACE_ERROR ((LM_ERROR, "Execution_Manager_Impl::destroyManagerByPlan - " "Invalid plan uuid [%s]\n", plan_uuid)); - ACE_THROW (Deployment::StopError ()); + throw Deployment::StopError (); } Deployment::DomainApplicationManager_var @@ -227,36 +220,32 @@ namespace CIAO #if 0 PortableServer::ObjectId_var oid = - this->poa_->reference_to_id (manager - ACE_ENV_ARG_PARAMETER); + this->poa_->reference_to_id (manager); - this->poa_->deactivate_object (oid.in () - ACE_ENV_ARG_PARAMETER); + this->poa_->deactivate_object (oid.in ()); #endif /*if 0*/ } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Execution_Manager_Impl::destroyManager\t\n"); - ACE_THROW (Deployment::StopError ()); + ex._tao_print_exception ( + "Execution_Manager_Impl::destroyManager\t\n"); + throw Deployment::StopError (); } - ACE_ENDTRY; } void - Execution_Manager_Impl::shutdown (void) + Execution_Manager_Impl::shutdown () ACE_THROW_SPEC ((CORBA::SystemException)) { CIAO_TRACE("Execution_Manager::Execution_Manager_Impl::shutdown"); // Shutdown the ORB on which it is runing - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } void Execution_Manager_Impl::perform_redeployment ( - const Deployment::DeploymentPlan & plan - ACE_ENV_ARG_DECL) + const Deployment::DeploymentPlan & plan) ACE_THROW_SPEC ((::CORBA::SystemException, ::Deployment::PlanError, ::Deployment::InstallationFailure, @@ -284,29 +273,27 @@ namespace CIAO "DAnCE (%P|%t) ExecutionManager_Impl.cpp -" "CIAO::Execution_Manager_Impl::perform_redeployment -" "Invalid plan uuid: %s\n", plan.UUID.in ())); - ACE_THROW (Deployment::PlanError ( - "Execution_Manager_Impl::perform_redeployment", - "Invalid plan uuid specified.")); + throw Deployment::PlanError ( + "Execution_Manager_Impl::perform_redeployment", + "Invalid plan uuid specified."); } - ACE_TRY + try { // Call perform_redeployment() on the DAM, which will do the // actual redeployment and reconfiguration on the dommain level. dam->perform_redeployment (plan); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Execution_Manager_Impl::perform_redeployment\t\n"); - ACE_RE_THROW; + ex._tao_print_exception ( + "Execution_Manager_Impl::perform_redeployment\t\n"); + throw; } - ACE_ENDTRY; } Deployment::DeploymentPlan * - Execution_Manager_Impl::getPlan (const char * plan_uuid - ACE_ENV_ARG_DECL) + Execution_Manager_Impl::getPlan (const char * plan_uuid) ACE_THROW_SPEC ((::CORBA::SystemException)) { Deployment::DomainApplicationManager_var dam; @@ -321,20 +308,18 @@ namespace CIAO "DAnCE (%P|%t) ExecutionManager_Impl.cpp -" "CIAO::Execution_Manager_Impl::getPlan -" "Invalid plan uuid: %s\n", plan_uuid)); - ACE_THROW (::CORBA::BAD_PARAM ()); + throw ::CORBA::BAD_PARAM (); } - ACE_TRY + try { return dam->getPlan (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Execution_Manager_Impl::getPlan\t\n"); - ACE_RE_THROW; + ex._tao_print_exception ("Execution_Manager_Impl::getPlan\t\n"); + throw; } - ACE_ENDTRY; } void @@ -350,7 +335,7 @@ namespace CIAO // Find the NodeApplication hosting the component, and then call // <finishLaunch> on it - ACE_TRY + try { Deployment::NodeApplication_var node_app = this->find_node_application (binding); @@ -360,7 +345,7 @@ namespace CIAO ACE_ERROR ((LM_ERROR, "Execution_Manager_Impl::finalize_global_binding - " "nil NodeApplication object reference.\n")); - ACE_THROW (Deployment::InvalidConnection ()); + throw Deployment::InvalidConnection (); } node_app->finishLaunch (binding.providedReference_.in (), @@ -373,13 +358,12 @@ namespace CIAO else this->remove_shared_component (binding); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Execution_Manager_Impl::finalize_global_binding\t\n"); - ACE_THROW (Deployment::InvalidConnection ()); + ex._tao_print_exception ( + "Execution_Manager_Impl::finalize_global_binding\t\n"); + throw Deployment::InvalidConnection (); } - ACE_ENDTRY; } void @@ -394,7 +378,7 @@ namespace CIAO // Find the NodeApplication hosting the component, and then call // <finishLaunch> on it - ACE_TRY + try { Deployment::NodeApplication_var node_app = this->find_node_application (binding); @@ -404,18 +388,17 @@ namespace CIAO ACE_ERROR ((LM_ERROR, "Execution_Manager_Impl::passivate_shared_components - " "nil NodeApplication object reference.\n")); - ACE_THROW (Deployment::StartError ()); + throw Deployment::StartError (); } node_app->passivate_component (binding.name_.c_str ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Execution_Manager_Impl::passivate_shared_components\t\n"); - ACE_THROW (Deployment::StartError ()); + ex._tao_print_exception ( + "Execution_Manager_Impl::passivate_shared_components\t\n"); + throw Deployment::StartError (); } - ACE_ENDTRY; } void @@ -430,7 +413,7 @@ namespace CIAO // Find the NodeApplication hosting the component, and then call // <ciao_activate> on it - ACE_TRY + try { Deployment::NodeApplication_var node_app = this->find_node_application (binding); @@ -440,18 +423,17 @@ namespace CIAO ACE_ERROR ((LM_ERROR, "Execution_Manager_Impl::activate_shared_components - " "nil NodeApplication object reference.\n")); - ACE_THROW (Deployment::StartError ()); + throw Deployment::StartError (); } node_app->activate_component (binding.name_.c_str ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Execution_Manager_Impl::passivate_shared_components\t\n"); - ACE_THROW (Deployment::StartError ()); + ex._tao_print_exception ( + "Execution_Manager_Impl::passivate_shared_components\t\n"); + throw Deployment::StartError (); } - ACE_ENDTRY; } @@ -476,7 +458,7 @@ namespace CIAO "DAnCE (%P|%t) ExecutionManager_Impl.cpp -" "CIAO::Execution_Manager_Impl::find_node_application -" "Invalid plan uuid: %s\n", binding.plan_uuid_.c_str ())); - ACE_THROW (::CORBA::BAD_PARAM ()); + throw ::CORBA::BAD_PARAM (); } // Find the NA based on the NodeName field of the binding @@ -490,7 +472,7 @@ namespace CIAO "DAnCE (%P|%t) ExecutionManager_Impl.cpp -" "CIAO::Execution_Manager_Impl::find_node_application -" "Invalid node name: %s!\n", binding.node_.c_str ())); - ACE_THROW (::CORBA::BAD_PARAM ()); + throw ::CORBA::BAD_PARAM (); } return node_app._retn (); diff --git a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h index 526b970e42b..cf674d37fe9 100644 --- a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h +++ b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h @@ -52,46 +52,41 @@ namespace CIAO /// $CIAO_ROOT/ciao/Deployment.idl for documentation virtual Deployment::DomainApplicationManager_ptr preparePlan (const Deployment::DeploymentPlan & plan, - CORBA::Boolean commitResources - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::Boolean commitResources) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::ResourceNotAvailable, Deployment::PlanError, Deployment::StartError)); virtual Deployment::DomainApplicationManagers * - getManagers (void) + getManagers () ACE_THROW_SPEC ((CORBA::SystemException)); // Below method is CIAO specific extension virtual Deployment::DomainApplicationManager_ptr - getManager (const char * plan_uuid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + getManager (const char * plan_uuid) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::PlanNotExist)); virtual void - destroyManager (Deployment::DomainApplicationManager_ptr manager - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + destroyManager (Deployment::DomainApplicationManager_ptr manager) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StopError)); // Below method is CIAO specific extension, please see the IDL // definition for more details. virtual void - destroyManagerByPlan (const char * plan_uuid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + destroyManagerByPlan (const char * plan_uuid) ACE_THROW_SPEC ((::CORBA::SystemException, ::Deployment::StopError)); - virtual void shutdown (void) + virtual void shutdown () ACE_THROW_SPEC ((CORBA::SystemException)); // The input parameter is a *new_plan* which has the // same UUID of the existing running plan. virtual void perform_redeployment ( - const Deployment::DeploymentPlan & plan - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const Deployment::DeploymentPlan & plan) ACE_THROW_SPEC ((::CORBA::SystemException, ::Deployment::PlanError, ::Deployment::InstallationFailure, @@ -102,8 +97,7 @@ namespace CIAO ::Components::RemoveFailure)); virtual Deployment::DeploymentPlan * getPlan ( - const char * plan_uuid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const char * plan_uuid) ACE_THROW_SPEC ((::CORBA::SystemException)); /// ****************** C++ Methods ************************* diff --git a/CIAO/DAnCE/NodeApplication/Container_Impl.cpp b/CIAO/DAnCE/NodeApplication/Container_Impl.cpp index f5652d971a0..89cab7af662 100644 --- a/CIAO/DAnCE/NodeApplication/Container_Impl.cpp +++ b/CIAO/DAnCE/NodeApplication/Container_Impl.cpp @@ -26,8 +26,7 @@ CIAO::Container_Impl::_default_POA (void) /////////////////////////////////////////////////////////////// CORBA::Long -CIAO::Container_Impl::init (const CORBA::PolicyList *policies - ACE_ENV_ARG_DECL) +CIAO::Container_Impl::init (const CORBA::PolicyList *policies) ACE_THROW_SPEC ((CORBA::SystemException)) { CIAO_TRACE ("CIAO::Container_Impl::init"); @@ -56,15 +55,13 @@ CIAO::Container_Impl::init (const CORBA::PolicyList *policies } return this->container_->init (0, - policies - ACE_ENV_ARG_PARAMETER); + policies); } Deployment::ComponentInfos * CIAO::Container_Impl::install ( const ::Deployment::ContainerImplementationInfo & container_impl_info - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, ::Deployment::UnknownImplId, @@ -74,7 +71,7 @@ CIAO::Container_Impl::install ( { CIAO_TRACE ("CIAO::Container_Impl::install"); Deployment::ComponentInfos_var retv; - ACE_TRY + try { ACE_NEW_THROW_EX (retv, Deployment::ComponentInfos, @@ -93,22 +90,20 @@ CIAO::Container_Impl::install ( { // Install home Components::CCMHome_var home = - this->install_home (impl_infos[i] - ACE_ENV_ARG_PARAMETER); + this->install_home (impl_infos[i]); Components::KeylessCCMHome_var kh = - Components::KeylessCCMHome::_narrow (home.in () - ACE_ENV_ARG_PARAMETER); + Components::KeylessCCMHome::_narrow (home.in ()); if (CORBA::is_nil (kh.in ())) - ACE_TRY_THROW (Deployment::InstallationFailure ()); + throw Deployment::InstallationFailure (); // Create component from home Components::CCMObject_var comp = kh->create_component (); if (CORBA::is_nil (comp.in ())) - ACE_TRY_THROW (Deployment::InstallationFailure ()); + throw Deployment::InstallationFailure (); if (this->component_map_.bind (impl_infos[i].component_instance_name.in (), @@ -120,7 +115,7 @@ CIAO::Container_Impl::install ( "error in binding component " "instance name [%s] into the component map \n", impl_infos[i].component_instance_name.in ())); - ACE_TRY_THROW (Deployment::InstallationFailure ()); + throw Deployment::InstallationFailure (); } // Set the return value. @@ -150,15 +145,14 @@ CIAO::Container_Impl::install ( impl_infos[i].component_config[prop_len].value >>= path; CORBA::String_var ior = - this->orb_->object_to_string (comp.in () - ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (comp.in ()); if (CIAO::Utility::write_IOR (path, ior.in ()) != 0) { if (CIAO::debug_level () > 1) ACE_DEBUG ((LM_DEBUG, "Failed to write the IOR.\n")); - ACE_TRY_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } @@ -179,7 +173,6 @@ CIAO::Container_Impl::install ( naming_context, this->orb_.in (), Components::CCMObject::_duplicate (comp.in ()) - ACE_ENV_ARG_PARAMETER ); if (!result) @@ -199,7 +192,7 @@ CIAO::Container_Impl::install ( "error in binding component " "instance name [%s] into the naming map \n", impl_infos[i].component_instance_name.in ())); - ACE_TRY_THROW (Deployment::InstallationFailure ()); + throw Deployment::InstallationFailure (); } } @@ -233,19 +226,17 @@ CIAO::Container_Impl::install ( } } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Container_Impl::install\t\n"); - ACE_RE_THROW; + ex._tao_print_exception ("Container_Impl::install\t\n"); + throw; } - ACE_ENDTRY; return retv._retn (); } ::Deployment::Properties * -CIAO::Container_Impl::properties (void) +CIAO::Container_Impl::properties () ACE_THROW_SPEC ((CORBA::SystemException)) { CIAO_TRACE ("CIAO::Container_Impl::properties"); @@ -261,7 +252,7 @@ CIAO::Container_Impl::properties (void) } ::Deployment::NodeApplication_ptr -CIAO::Container_Impl::get_node_application (void) +CIAO::Container_Impl::get_node_application () ACE_THROW_SPEC ((CORBA::SystemException)) { CIAO_TRACE ("CIAO::Container_Impl::get_node_application"); @@ -270,8 +261,7 @@ CIAO::Container_Impl::get_node_application (void) ::Components::CCMHome_ptr CIAO::Container_Impl::install_home ( - const ::Deployment::ComponentImplementationInfo & impl_info - ACE_ENV_ARG_DECL) + const ::Deployment::ComponentImplementationInfo & impl_info) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::UnknownImplId, Deployment::ImplEntryPointNotFound, @@ -294,8 +284,7 @@ CIAO::Container_Impl::install_home ( impl_info.executor_entrypt.in (), impl_info.servant_dll.in (), impl_info.servant_entrypt.in (), - impl_info.component_instance_name.in () - ACE_ENV_ARG_PARAMETER); + impl_info.component_instance_name.in ()); if (CIAO::debug_level () > 9) { @@ -330,8 +319,7 @@ CIAO::Container_Impl::install_home ( void -CIAO::Container_Impl::remove_home (const char * comp_ins_name - ACE_ENV_ARG_DECL) +CIAO::Container_Impl::remove_home (const char * comp_ins_name) ACE_THROW_SPEC ((CORBA::SystemException, Components::RemoveFailure)) { @@ -341,25 +329,24 @@ CIAO::Container_Impl::remove_home (const char * comp_ins_name ACE_CString str (comp_ins_name); if (this->home_map_.find (str, home) != 0) - ACE_THROW (CORBA::BAD_PARAM ()); + throw CORBA::BAD_PARAM (); // @@TODO We should remove all components created by this home as well. // This is not implemented yet. - this->container_->ciao_uninstall_home (home - ACE_ENV_ARG_PARAMETER); + this->container_->ciao_uninstall_home (home); // If the previous calls failed, what should we do here?? CORBA::release (home); // @@ Still need to remove the home if the previous operation fails? if (this->home_map_.unbind (str) == -1) - ACE_THROW (::Components::RemoveFailure ()); + throw ::Components::RemoveFailure (); } // Remove all homes and components void -CIAO::Container_Impl::remove (void) +CIAO::Container_Impl::remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::RemoveFailure)) { @@ -374,8 +361,7 @@ CIAO::Container_Impl::remove (void) iter != end; ++iter) { - this->container_->ciao_uninstall_home ( (*iter).int_id_ - ACE_ENV_ARG_PARAMETER); + this->container_->ciao_uninstall_home ( (*iter).int_id_); CORBA::release ( (*iter).int_id_); } @@ -392,7 +378,7 @@ CIAO::Container_Impl::remove (void) //////////////////////////////////////////////////////////////////////// void -CIAO::Container_Impl::remove_components (void) +CIAO::Container_Impl::remove_components () ACE_THROW_SPEC ((CORBA::SystemException, Components::RemoveFailure)) { @@ -409,7 +395,7 @@ CIAO::Container_Impl::remove_components (void) // on the home. Components::CCMHome_ptr home; if (this->home_map_.find ( (*iter).ext_id_, home) != 0) - ACE_THROW (CORBA::BAD_PARAM ()); + throw CORBA::BAD_PARAM (); // This will call ccm_passivate on the component executor. home->remove_component (((*iter).int_id_).in ()); @@ -426,8 +412,7 @@ CIAO::Container_Impl::remove_components (void) // Below method is not used actually. void -CIAO::Container_Impl::remove_component (const char * comp_ins_name - ACE_ENV_ARG_DECL) +CIAO::Container_Impl::remove_component (const char * comp_ins_name) ACE_THROW_SPEC ((CORBA::SystemException, Components::RemoveFailure)) { @@ -452,10 +437,10 @@ CIAO::Container_Impl::remove_component (const char * comp_ins_name */ if (this->component_map_.find (str, comp) != 0) - ACE_THROW (CORBA::BAD_PARAM ()); + throw CORBA::BAD_PARAM (); if (this->home_map_.find (str, home) != 0) - ACE_THROW (CORBA::BAD_PARAM ()); + throw CORBA::BAD_PARAM (); // This will call ccm_passivate on the component executor. home->remove_component (comp.in ()); @@ -464,7 +449,7 @@ CIAO::Container_Impl::remove_component (const char * comp_ins_name // @@ Still need to remove the home if the previous operation fails? if (this->component_map_.unbind (str) == -1) - ACE_THROW (::Components::RemoveFailure ()); + throw ::Components::RemoveFailure (); if (this->naming_map_.find (str, naming_context) == 0) { @@ -473,7 +458,6 @@ CIAO::Container_Impl::remove_component (const char * comp_ins_name unregister_with_ns ( naming_context.c_str (), this->orb_.in () - ACE_ENV_ARG_PARAMETER ); if (!result) @@ -484,7 +468,7 @@ CIAO::Container_Impl::remove_component (const char * comp_ins_name else { if (this->naming_map_.unbind (str) == -1) - ACE_THROW (::Components::RemoveFailure ()); + throw ::Components::RemoveFailure (); } } } @@ -492,17 +476,15 @@ CIAO::Container_Impl::remove_component (const char * comp_ins_name bool CIAO::Container_Impl::register_with_ns (const char * s, CORBA::ORB_ptr orb, - Components::CCMObject_ptr obj - ACE_ENV_ARG_DECL) + Components::CCMObject_ptr obj) { CIAO_TRACE ("CIAO::Container_Impl::register_with_ns"); - ACE_TRY + try { // Obtain the naming service CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("NameService"); if (CORBA::is_nil (naming_obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -510,8 +492,7 @@ CIAO::Container_Impl::register_with_ns (const char * s, false); CosNaming::NamingContextExt_var root = - CosNaming::NamingContextExt::_narrow (naming_obj.in () - ACE_ENV_ARG_PARAMETER); + CosNaming::NamingContextExt::_narrow (naming_obj.in ()); CosNaming::Name name (0); name.length (0); @@ -552,32 +533,28 @@ CIAO::Container_Impl::register_with_ns (const char * s, return true; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "CIAO (%P|%t) Container_Impl.cpp -" - "CIAO::Container_Impl::register_with_ns -" - "NodeApplication: failed to register " - "with naming service."); + ex._tao_print_exception ("CIAO (%P|%t) Container_Impl.cpp -" + "CIAO::Container_Impl::register_with_ns -" + "NodeApplication: failed to register " + "with naming service."); return false; } - ACE_ENDTRY; return true; } bool CIAO::Container_Impl::unregister_with_ns (const char * obj_name, - CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) + CORBA::ORB_ptr orb) { CIAO_TRACE ("CIAO::Container_Impl::unregister_with_ns"); - ACE_TRY + try { // Obtain the naming service CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("NameService"); if (CORBA::is_nil (naming_obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -585,8 +562,7 @@ CIAO::Container_Impl::unregister_with_ns (const char * obj_name, false); CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in () - ACE_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (naming_obj.in ()); CosNaming::Name name (0); name.length (0); @@ -617,19 +593,17 @@ CIAO::Container_Impl::unregister_with_ns (const char * obj_name, ACE_DEBUG ((LM_DEBUG, "Unregister component with the name server : %s!\n", obj_name)); - naming_context->unbind (name ACE_ENV_ARG_PARAMETER); + naming_context->unbind (name); return true; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "CIAO (%P|%t) Container_Impl.cpp -" - "CIAO::Container_Impl::unregister_with_ns -" - "NodeApplication: failed to unregister " - "with naming service."); + ex._tao_print_exception ("CIAO (%P|%t) Container_Impl.cpp -" + "CIAO::Container_Impl::unregister_with_ns -" + "NodeApplication: failed to unregister " + "with naming service."); return false; } - ACE_ENDTRY; return true; } diff --git a/CIAO/DAnCE/NodeApplication/Container_Impl.h b/CIAO/DAnCE/NodeApplication/Container_Impl.h index 35fe4db486e..7becc7b8e9e 100644 --- a/CIAO/DAnCE/NodeApplication/Container_Impl.h +++ b/CIAO/DAnCE/NodeApplication/Container_Impl.h @@ -62,14 +62,12 @@ namespace CIAO /*-------------------- IDL operations (idl) ------------------*/ /// Initialize the container. - virtual CORBA::Long init (const CORBA::PolicyList *policies - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Long init (const CORBA::PolicyList *policies) ACE_THROW_SPEC ((CORBA::SystemException)); /// Install all homes and components Deployment::ComponentInfos * - install (const ::Deployment::ContainerImplementationInfo & container_impl_info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + install (const ::Deployment::ContainerImplementationInfo & container_impl_info) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::UnknownImplId, Deployment::ImplEntryPointNotFound, @@ -78,17 +76,17 @@ namespace CIAO /// Remove all homes and components virtual void - remove (void) + remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::RemoveFailure)); /// Deployment::Container interface defined attributes/operations. virtual ::Deployment::Properties * - properties (void) + properties () ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::Deployment::NodeApplication_ptr - get_node_application (void) + get_node_application () ACE_THROW_SPEC ((CORBA::SystemException)); /*-------------------------------------------------------------*/ @@ -101,8 +99,7 @@ namespace CIAO // Install the home of this particular component virtual ::Components::CCMHome_ptr - install_home (const ::Deployment::ComponentImplementationInfo & impl_info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + install_home (const ::Deployment::ComponentImplementationInfo & impl_info) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::UnknownImplId, Deployment::ImplEntryPointNotFound, @@ -122,39 +119,34 @@ namespace CIAO */ // Remove the home of this particular component virtual void - remove_home (const char * comp_ins_name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + remove_home (const char * comp_ins_name) ACE_THROW_SPEC ((CORBA::SystemException, Components::RemoveFailure)); bool register_with_ns (const char * obj_name, CORBA::ORB_ptr orb, - Components::CCMObject_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + Components::CCMObject_ptr obj); bool unregister_with_ns (const char * obj_name, - CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + CORBA::ORB_ptr orb); // ------------------- CIAO Internal Operations ------------------------ // These below two are helper methods to clean up components // should only be called when we are sure that there is no // active connection on this component. - virtual void remove_components (void) + virtual void remove_components () ACE_THROW_SPEC ((CORBA::SystemException, Components::RemoveFailure)); - virtual void remove_component (const char * comp_ins_name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void remove_component (const char * comp_ins_name) ACE_THROW_SPEC ((CORBA::SystemException, Components::RemoveFailure)); /// Set the cached object reference. - void set_objref (Deployment::Container_ptr o - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + void set_objref (Deployment::Container_ptr o); /// Get the cached object reference. This operation will invoke /// _this if there's no cached reference available. Notice that @@ -163,7 +155,7 @@ namespace CIAO /// @@ Gan, caller should own memory. In this case you shoudl /// return a duplicate OR add a const to the operation /// signature. This is simply bad programming. - Deployment::Container_ptr get_objref (void); + Deployment::Container_ptr get_objref (); protected: /// Keep a pointer to the managing ORB serving this servant. diff --git a/CIAO/DAnCE/NodeApplication/Container_Impl.inl b/CIAO/DAnCE/NodeApplication/Container_Impl.inl index 6b5336c730e..85c17197070 100644 --- a/CIAO/DAnCE/NodeApplication/Container_Impl.inl +++ b/CIAO/DAnCE/NodeApplication/Container_Impl.inl @@ -14,19 +14,18 @@ CIAO::Container_Impl::Container_Impl (CORBA::ORB_ptr o, } ACE_INLINE void -CIAO::Container_Impl::set_objref (Deployment::Container_ptr o - ACE_ENV_ARG_DECL) +CIAO::Container_Impl::set_objref (Deployment::Container_ptr o) { CIAO_TRACE("CIAO::Container_Imp::set_objref"); if (!CORBA::is_nil (this->objref_.in ())) - ACE_THROW (CORBA::BAD_INV_ORDER ()); + throw CORBA::BAD_INV_ORDER (); this->objref_ = Deployment::Container::_duplicate (o); } ACE_INLINE ::Deployment::Container_ptr -CIAO::Container_Impl::get_objref (void) +CIAO::Container_Impl::get_objref () { CIAO_TRACE("CIAO::Container_Imp::get_objref"); diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication.cpp index 6cf23f00b58..021f1e5322c 100644 --- a/CIAO/DAnCE/NodeApplication/NodeApplication.cpp +++ b/CIAO/DAnCE/NodeApplication/NodeApplication.cpp @@ -16,7 +16,7 @@ void print_arg (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { TAO_EC_Default_Factory::init_svcs (); @@ -39,13 +39,11 @@ main (int argc, char *argv[]) // Run the main event loop for the ORB. nodeapp_core.run_orb (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "NodeApp::main\t\n"); + ex._tao_print_exception ("NodeApp::main\t\n"); return 1; } - ACE_ENDTRY; if (CIAO::debug_level () > 1) ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) - This NodeApplication is destroyed!\n")); diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp index 6a09f630cec..eef577b2cfd 100644 --- a/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp +++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp @@ -68,15 +68,13 @@ CIAO::NodeApplication_Core::svc () { CIAO_TRACE ("CIAO::NodeApplication_Core::svc"); - ACE_TRY_NEW_ENV + try { CORBA::Object_var object = - this->orb_->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -96,15 +94,12 @@ CIAO::NodeApplication_Core::svc () // Configuring NodeApplication. PortableServer::ObjectId_var nodeapp_oid - = root_poa->activate_object (nodeapp_servant - ACE_ENV_ARG_PARAMETER); + = root_poa->activate_object (nodeapp_servant); - object = root_poa->id_to_reference (nodeapp_oid.in () - ACE_ENV_ARG_PARAMETER); + object = root_poa->id_to_reference (nodeapp_oid.in ()); Deployment::NodeApplication_var nodeapp_obj = - Deployment::NodeApplication::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + Deployment::NodeApplication::_narrow (object.in ()); if (CORBA::is_nil (nodeapp_obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -127,8 +122,7 @@ CIAO::NodeApplication_Core::svc () return 1; } - CORBA::String_var str = this->orb_->object_to_string (nodeapp_obj.in () - ACE_ENV_ARG_PARAMETER); + CORBA::String_var str = this->orb_->object_to_string (nodeapp_obj.in ()); if (this->options_.write_ior_file ()) CIAO::Utility::write_IOR (this->options_.ior_output_filename (), @@ -146,19 +140,16 @@ CIAO::NodeApplication_Core::svc () if (this->options_.use_callback ()) { - object = this->orb_->string_to_object (this->options_.callback_ior () - ACE_ENV_ARG_PARAMETER); + object = this->orb_->string_to_object (this->options_.callback_ior ()); CIAO::NodeApplication_Callback_var nam_callback - = CIAO::NodeApplication_Callback::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + = CIAO::NodeApplication_Callback::_narrow (object.in ()); Deployment::Properties_out properties_out (prop.out ()); nodeapp_man = nam_callback->register_node_application (nodeapp_obj.in (), - properties_out - ACE_ENV_ARG_PARAMETER); + properties_out); } ACE_DEBUG ((LM_DEBUG, @@ -166,16 +157,15 @@ CIAO::NodeApplication_Core::svc () this->orb_->run (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); this->orb_->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + ex._tao_print_exception ("Exception caught"); return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "Exiting NodeApplication...\n")); diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp index 258b580a4d7..afbb5c9bcc6 100644 --- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp +++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp @@ -16,7 +16,7 @@ CIAO::NodeApplication_Impl::~NodeApplication_Impl (void) CORBA::Long -CIAO::NodeApplication_Impl::init (void) +CIAO::NodeApplication_Impl::init () ACE_THROW_SPEC ((CORBA::SystemException)) { /// @todo initialize this NodeApplication properties @@ -26,7 +26,6 @@ CIAO::NodeApplication_Impl::init (void) CORBA::Long CIAO::NodeApplication_Impl::create_all_containers ( const ::Deployment::ContainerImplementationInfos & container_infos - ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -61,8 +60,7 @@ void CIAO::NodeApplication_Impl::finishLaunch ( const Deployment::Connections & providedReference, CORBA::Boolean start, - CORBA::Boolean add_connection - ACE_ENV_ARG_DECL) + CORBA::Boolean add_connection) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StartError, Deployment::InvalidConnection)) @@ -78,15 +76,14 @@ void CIAO::NodeApplication_Impl::finishLaunch_i ( const Deployment::Connections & connections, CORBA::Boolean start, - CORBA::Boolean add_connection - ACE_ENV_ARG_DECL) + CORBA::Boolean add_connection) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StartError, Deployment::InvalidConnection)) { ACE_UNUSED_ARG (start); - ACE_TRY + try { CORBA::ULong const length = connections.length (); @@ -118,7 +115,7 @@ CIAO::NodeApplication_Impl::finishLaunch_i ( "invalid port name [%s] in instance [%s] \n", connections[i].portName.in (), name.c_str ())); - ACE_TRY_THROW (Deployment::InvalidConnection ()); + throw Deployment::InvalidConnection (); } Components::EventConsumerBase_var consumer; @@ -166,22 +163,20 @@ CIAO::NodeApplication_Impl::finishLaunch_i ( "CIAO (%P|%t) - NodeApplication_Impl.cpp, " "CIAO::NodeApplication_Impl::finishLaunch_i: " "Unsupported event port type encounted\n")); - ACE_TRY_THROW (CORBA::NO_IMPLEMENT ()); + throw CORBA::NO_IMPLEMENT (); } } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "NodeApplication_Impl::finishLaunch\t\n"); - ACE_RE_THROW; + ex._tao_print_exception ("NodeApplication_Impl::finishLaunch\t\n"); + throw; } - ACE_ENDTRY; } void -CIAO::NodeApplication_Impl::ciao_preactivate (void) +CIAO::NodeApplication_Impl::ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StartError)) { @@ -200,7 +195,7 @@ CIAO::NodeApplication_Impl::ciao_preactivate (void) } void -CIAO::NodeApplication_Impl::start (void) +CIAO::NodeApplication_Impl::start () ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StartError)) { @@ -219,7 +214,7 @@ CIAO::NodeApplication_Impl::start (void) } void -CIAO::NodeApplication_Impl::ciao_postactivate (void) +CIAO::NodeApplication_Impl::ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StartError)) { @@ -238,7 +233,7 @@ CIAO::NodeApplication_Impl::ciao_postactivate (void) } void -CIAO::NodeApplication_Impl::ciao_passivate (void) +CIAO::NodeApplication_Impl::ciao_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StopError)) { @@ -256,8 +251,7 @@ CIAO::NodeApplication_Impl::ciao_passivate (void) Deployment::ComponentInfos * CIAO::NodeApplication_Impl::install ( - const ::Deployment::NodeImplementationInfo & node_impl_info - ACE_ENV_ARG_DECL) + const ::Deployment::NodeImplementationInfo & node_impl_info) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::UnknownImplId, Deployment::ImplEntryPointNotFound, @@ -265,7 +259,7 @@ CIAO::NodeApplication_Impl::install ( Components::InvalidConfiguration)) { Deployment::ComponentInfos_var retv; - ACE_TRY + try { // Extract ORB resource def here. this->configurator_.init_resource_manager (node_impl_info.nodeapp_config); @@ -311,8 +305,7 @@ CIAO::NodeApplication_Impl::install ( { Deployment::ComponentInfos_var comp_infos = this->container_set_.at(i+old_set_size)-> - install (container_infos[i] - ACE_ENV_ARG_PARAMETER); + install (container_infos[i]); // Append the return sequence to the *big* return sequence CORBA::ULong curr_len = retv->length (); @@ -348,26 +341,23 @@ CIAO::NodeApplication_Impl::install ( "error binding component instance [%s] " "into the map. \n", retv[len].component_instance_name.in ())); - ACE_TRY_THROW ( - Deployment::InstallationFailure ("NodeApplication_Imp::install", - "Duplicate component instance name")); + throw Deployment::InstallationFailure ( + "NodeApplication_Imp::install", + "Duplicate component instance name"); } } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "CIAO_NodeApplication::install error\t\n"); - ACE_RE_THROW; + ex._tao_print_exception ("CIAO_NodeApplication::install error\t\n"); + throw; } - ACE_ENDTRY; return retv._retn (); } void -CIAO::NodeApplication_Impl::remove_component (const char * inst_name - ACE_ENV_ARG_DECL) +CIAO::NodeApplication_Impl::remove_component (const char * inst_name) ACE_THROW_SPEC ((::CORBA::SystemException, ::Components::RemoveFailure)) { @@ -383,7 +373,7 @@ CIAO::NodeApplication_Impl::remove_component (const char * inst_name "CIAO::NodeApplication_Impl::remove_component, " "invalid instance [%s] in the component_container_map.\n", inst_name)); - ACE_TRY_THROW (::Components::RemoveFailure ()); + throw ::Components::RemoveFailure (); } // Remove this component instance from the node application @@ -394,8 +384,7 @@ CIAO::NodeApplication_Impl::remove_component (const char * inst_name } void -CIAO::NodeApplication_Impl::passivate_component (const char * name - ACE_ENV_ARG_DECL) +CIAO::NodeApplication_Impl::passivate_component (const char * name) ACE_THROW_SPEC ((::CORBA::SystemException, ::Components::RemoveFailure)) { @@ -408,7 +397,7 @@ CIAO::NodeApplication_Impl::passivate_component (const char * name "CIAO::NodeApplication_Impl::passivate_component, " "invalid instance [%s] \n", name)); - ACE_TRY_THROW (Components::RemoveFailure ()); + throw Components::RemoveFailure (); } if (CORBA::is_nil (comp_state.objref_.in ())) @@ -421,8 +410,7 @@ CIAO::NodeApplication_Impl::passivate_component (const char * name } void -CIAO::NodeApplication_Impl::activate_component (const char * name - ACE_ENV_ARG_DECL) +CIAO::NodeApplication_Impl::activate_component (const char * name) ACE_THROW_SPEC ((::CORBA::SystemException, ::Deployment::StartError)) { @@ -435,7 +423,7 @@ CIAO::NodeApplication_Impl::activate_component (const char * name "CIAO::NodeApplication_Impl::activate_component, " "invalid instance [%s] \n", name)); - ACE_TRY_THROW (Deployment::StartError ()); + throw Deployment::StartError (); } if (CORBA::is_nil (comp_state.objref_.in ())) @@ -455,7 +443,7 @@ CIAO::NodeApplication_Impl::activate_component (const char * name void -CIAO::NodeApplication_Impl::remove (void) +CIAO::NodeApplication_Impl::remove () ACE_THROW_SPEC ((CORBA::SystemException)) { // If we still have components installed, then do nothing @@ -492,7 +480,7 @@ CIAO::NodeApplication_Impl::remove (void) // For static deployment, ORB will be shutdown in the Static_NodeManager if (this->static_entrypts_maps_ == 0) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); ACE_DEBUG ((LM_DEBUG, "NA: shutdown\n")); } } @@ -501,8 +489,7 @@ CIAO::NodeApplication_Impl::remove (void) // Create a container interface, which will be hosted in this NodeApplication. ::Deployment::Container_ptr CIAO::NodeApplication_Impl::create_container ( - const ::Deployment::Properties &properties - ACE_ENV_ARG_DECL) + const ::Deployment::Properties &properties) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::CreateFailure, ::Components::InvalidConfiguration)) @@ -529,23 +516,19 @@ CIAO::NodeApplication_Impl::create_container ( // suggest how to install the components. Each such data stucture // should be correspond to one <process_collocation> tag in the XML // file to describe the deployment plan. - container_servant->init (policies.ptr () - ACE_ENV_ARG_PARAMETER); + container_servant->init (policies.ptr ()); PortableServer::ObjectId_var oid - = this->poa_->activate_object (container_servant - ACE_ENV_ARG_PARAMETER); + = this->poa_->activate_object (container_servant); CORBA::Object_var obj - = this->poa_->id_to_reference (oid.in () - ACE_ENV_ARG_PARAMETER); + = this->poa_->id_to_reference (oid.in ()); ::Deployment::Container_var ci - = ::Deployment::Container::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + = ::Deployment::Container::_narrow (obj.in ()); // Cached the objref in its servant. - container_servant->set_objref (ci.in () ACE_ENV_ARG_PARAMETER); + container_servant->set_objref (ci.in ()); { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); @@ -561,8 +544,7 @@ CIAO::NodeApplication_Impl::create_container ( // Remove a container interface. void -CIAO::NodeApplication_Impl::remove_container (::Deployment::Container_ptr cref - ACE_ENV_ARG_DECL) +CIAO::NodeApplication_Impl::remove_container (::Deployment::Container_ptr cref) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::RemoveFailure)) { @@ -571,23 +553,21 @@ CIAO::NodeApplication_Impl::remove_container (::Deployment::Container_ptr cref if (this->container_set_.object_in_set (cref) == 0) { - ACE_THROW (Components::RemoveFailure()); + throw Components::RemoveFailure(); } cref->remove (); // @@ Deactivate object. PortableServer::ObjectId_var oid - = this->poa_->reference_to_id (cref - ACE_ENV_ARG_PARAMETER); + = this->poa_->reference_to_id (cref); - this->poa_->deactivate_object (oid.in () - ACE_ENV_ARG_PARAMETER); + this->poa_->deactivate_object (oid.in ()); // Should we remove the server still, even if the previous call failed. if (this->container_set_.remove (cref) == -1) { - ACE_THROW (::Components::RemoveFailure ()); + throw ::Components::RemoveFailure (); } ACE_DEBUG ((LM_DEBUG, "LEAVING: NodeApplication_Impl::remove_container()\n")); @@ -595,7 +575,7 @@ CIAO::NodeApplication_Impl::remove_container (::Deployment::Container_ptr cref // Get containers ::Deployment::Containers * -CIAO::NodeApplication_Impl::get_containers (void) +CIAO::NodeApplication_Impl::get_containers () ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; @@ -603,12 +583,11 @@ CIAO::NodeApplication_Impl::get_containers (void) CIAO::CIAO_Event_Service * CIAO::NodeApplication_Impl:: -install_es (const ::CIAO::DAnCE::EventServiceDeploymentDescription & es_info - ACE_ENV_ARG_DECL) +install_es (const ::CIAO::DAnCE::EventServiceDeploymentDescription & es_info) ACE_THROW_SPEC ((::CORBA::SystemException, ::Deployment::InstallationFailure)) { - ACE_TRY + try { ACE_DEBUG ((LM_DEBUG, "\nNodeApplication_Impl::install_es() called.\n\n")); @@ -623,7 +602,7 @@ ACE_THROW_SPEC ((::CORBA::SystemException, ::CIAO::CIAO_RT_Event_Service::_narrow (ciao_es.in ()); if (CORBA::is_nil (ciao_rtes.in ())) - ACE_THROW (::Deployment::InstallationFailure ()); + throw ::Deployment::InstallationFailure (); // Set up the event channel federations for (CORBA::ULong j = 0; j < es_info.addr_servs.length (); ++j) @@ -671,14 +650,12 @@ ACE_THROW_SPEC ((::CORBA::SystemException, } return ciao_es._retn (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "NodeApplication_Impl::finishLaunch\t\n"); + ex._tao_print_exception ("NodeApplication_Impl::finishLaunch\t\n"); ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0); } - ACE_ENDTRY; } @@ -724,8 +701,7 @@ handle_facet_receptable_connection ( { ::Components::Cookie_var cookie = comp->connect (connection.portName.in (), - connection.endpoint.in () - ACE_ENV_ARG_PARAMETER); + connection.endpoint.in ()); ACE_CString key = (*create_connection_key (connection)); if (CIAO::debug_level () > 10) @@ -757,7 +733,7 @@ handle_facet_receptable_connection ( if (this->cookie_map_.find (key, cookie) != 0) { ACE_ERROR ((LM_ERROR, "Error: Cookie Not Found!\n")); - ACE_TRY_THROW (Deployment::InvalidConnection ()); + throw Deployment::InvalidConnection (); } comp->disconnect (connection.portName.in (), @@ -788,8 +764,7 @@ handle_emitter_consumer_connection ( Deployment::InvalidConnection)) { Components::EventConsumerBase_var consumer = - Components::EventConsumerBase::_narrow (connection.endpoint.in () - ACE_ENV_ARG_PARAMETER); + Components::EventConsumerBase::_narrow (connection.endpoint.in ()); if (CORBA::is_nil (consumer.in ())) { @@ -800,7 +775,7 @@ handle_emitter_consumer_connection ( "there is an invalid endPoint. \n", connection.portName.in (), connection.instanceName.in ())); - ACE_TRY_THROW (Deployment::InvalidConnection ()); + throw Deployment::InvalidConnection (); } if (CIAO::debug_level () > 11) @@ -816,8 +791,7 @@ handle_emitter_consumer_connection ( if (add_connection) { comp->connect_consumer (connection.portName.in (), - consumer.in () - ACE_ENV_ARG_PARAMETER); + consumer.in ()); if (CIAO::debug_level () > 6) { @@ -836,7 +810,8 @@ handle_emitter_consumer_connection ( // Operation not implemented by the CIDLC. // comp->disconnect_consumer (connection.portName.in (), // 0 -// ACE_ENV_ARG_PARAMETER); +//); +// ACE_TRY_CHECK; if (CIAO::debug_level () > 6) { @@ -863,8 +838,7 @@ handle_publisher_consumer_connection ( Deployment::InvalidConnection)) { Components::EventConsumerBase_var consumer = - Components::EventConsumerBase::_narrow (connection.endpoint.in () - ACE_ENV_ARG_PARAMETER); + Components::EventConsumerBase::_narrow (connection.endpoint.in ()); if (CORBA::is_nil (consumer.in ())) { @@ -875,7 +849,7 @@ handle_publisher_consumer_connection ( "there is an invalid endPoint. \n", connection.portName.in (), connection.instanceName.in ())); - ACE_TRY_THROW (Deployment::InvalidConnection ()); + throw Deployment::InvalidConnection (); } if (CIAO::debug_level () > 11) @@ -892,8 +866,7 @@ handle_publisher_consumer_connection ( { ::Components::Cookie_var cookie = comp->subscribe (connection.portName.in (), - consumer.in () - ACE_ENV_ARG_PARAMETER); + consumer.in ()); ACE_CString key = (*create_connection_key (connection)); this->cookie_map_.rebind (key, cookie); @@ -921,12 +894,11 @@ handle_publisher_consumer_connection ( if (this->cookie_map_.find (key, cookie) != 0) { ACE_ERROR ((LM_ERROR, "Error: Cookie Not Found!\n")); - ACE_TRY_THROW (Deployment::InvalidConnection ()); + throw Deployment::InvalidConnection (); } comp->unsubscribe (connection.portName.in (), - cookie.in () - ACE_ENV_ARG_PARAMETER); + cookie.in ()); this->cookie_map_.unbind (key); if (CIAO::debug_level () > 6) @@ -959,7 +931,7 @@ handle_publisher_es_connection ( "CIAO (%P|%t) - NodeApplication_Impl.cpp, " "CIAO::NodeApplication_Impl::handle_publisher_es_connection: " "Unsupported event connection type\n")); - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw CORBA::NO_IMPLEMENT (); } const CIAO::CIAO_Event_Service_ptr event_service = @@ -968,7 +940,7 @@ handle_publisher_es_connection ( if (CORBA::is_nil (event_service)) { ACE_DEBUG ((LM_DEBUG, "Nil event_service\n")); - ACE_THROW (Deployment::InvalidConnection ()); + throw Deployment::InvalidConnection (); } // supplier ID @@ -1017,7 +989,7 @@ handle_publisher_es_connection ( if (this->cookie_map_.find (key, cookie) != 0) { ACE_ERROR ((LM_ERROR, "Error: Cookie Not Found!\n")); - ACE_TRY_THROW (Deployment::InvalidConnection ()); + throw Deployment::InvalidConnection (); } comp->unsubscribe (connection.portName.in (), @@ -1054,7 +1026,7 @@ handle_es_consumer_connection ( "CIAO (%P|%t) - NodeApplication_Impl.cpp, " "CIAO::NodeApplication_Impl::handle_es_consumer_connection: " "Unsupported event connection type\n")); - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw CORBA::NO_IMPLEMENT (); } // Get ES object @@ -1067,7 +1039,7 @@ handle_es_consumer_connection ( "CIAO (%P|%t) - NodeApplication_Impl.cpp, " "CIAO::NodeApplication_Impl::handle_es_consumer_connection: " "NIL event_service\n")); - ACE_THROW (Deployment::InvalidConnection ()); + throw Deployment::InvalidConnection (); } // Get consumer object @@ -1080,7 +1052,7 @@ handle_es_consumer_connection ( "CIAO (%P|%t) - NodeApplication_Impl.cpp, " "CIAO::NodeApplication_Impl::handle_es_consumer_connection: " "Nil consumer port object reference\n")); - ACE_THROW (Deployment::InvalidConnection ()); + throw Deployment::InvalidConnection (); } // consumer ID @@ -1158,8 +1130,7 @@ handle_es_consumer_connection ( void CIAO::NodeApplication_Impl::build_event_connection ( const Deployment::Connection & connection, - bool add_or_remove - ACE_ENV_ARG_DECL) + bool add_or_remove) ACE_THROW_SPEC ((Deployment::InvalidConnection, CORBA::SystemException)) { @@ -1189,13 +1160,12 @@ CIAO::NodeApplication_Impl::build_event_connection ( // Get the consumer port object reference and put it into "consumer" Components::EventConsumerBase_var consumer = - Components::EventConsumerBase::_narrow (connection.endpoint.in () - ACE_ENV_ARG_PARAMETER); + Components::EventConsumerBase::_narrow (connection.endpoint.in ()); if (CORBA::is_nil (consumer.in ())) { ACE_DEBUG ((LM_DEBUG, "Nil consumer port object reference\n")); - ACE_THROW (Deployment::InvalidConnection ()); + throw Deployment::InvalidConnection (); } // Get the supplier component object reference. @@ -1206,7 +1176,7 @@ CIAO::NodeApplication_Impl::build_event_connection ( if (this->component_state_map_.find (supplier_comp_name, comp_state) != 0) { ACE_DEBUG ((LM_DEBUG, "Nil source component object reference\n")); - ACE_THROW (Deployment::InvalidConnection ()); + throw Deployment::InvalidConnection (); } // Get the consumer component object reference. @@ -1217,7 +1187,7 @@ CIAO::NodeApplication_Impl::build_event_connection ( if (CORBA::is_nil (event_service)) { ACE_DEBUG ((LM_DEBUG, "Nil event_service\n")); - ACE_THROW (Deployment::InvalidConnection ()); + throw Deployment::InvalidConnection (); } // supplier ID diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h index 6a3fc6cd9a4..c412b1aa9f5 100644 --- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h +++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h @@ -98,14 +98,13 @@ namespace CIAO virtual void finishLaunch (const Deployment::Connections & connections, CORBA::Boolean start, - CORBA::Boolean add_connection - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::Boolean add_connection) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StartError, Deployment::InvalidConnection)); virtual void - start (void) + start () ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StartError)); @@ -114,28 +113,27 @@ namespace CIAO *-----------------------------------------------------------*/ virtual void - ciao_preactivate (void) + ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StartError)); virtual void - ciao_postactivate (void) + ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StartError)); virtual void - ciao_passivate (void) + ciao_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StopError)); /// Initialize the NodeApplication - virtual CORBA::Long init (void) + virtual CORBA::Long init () ACE_THROW_SPEC ((CORBA::SystemException)); /// Start install homes and components. virtual ::Deployment::ComponentInfos * - install (const ::Deployment::NodeImplementationInfo & node_impl_info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + install (const ::Deployment::NodeImplementationInfo & node_impl_info) ACE_THROW_SPEC ((CORBA::SystemException, ::Deployment::UnknownImplId, ::Deployment::ImplEntryPointNotFound, @@ -144,59 +142,52 @@ namespace CIAO /// Install a number of CIAO_Event_Service objects within the NA virtual ::CIAO::CIAO_Event_Service * - install_es (const ::CIAO::DAnCE::EventServiceDeploymentDescription & es_info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + install_es (const ::CIAO::DAnCE::EventServiceDeploymentDescription & es_info) ACE_THROW_SPEC ((::CORBA::SystemException, ::Deployment::InstallationFailure)); /// Get the object reference of the NodeApplicationManager. /// This might come in handy later. virtual ::CORBA::Object_ptr - get_node_application_manager (void) + get_node_application_manager () ACE_THROW_SPEC ((CORBA::SystemException)); /// Access the readonly attribute. virtual ::Deployment::Properties * - properties (void) + properties () ACE_THROW_SPEC ((CORBA::SystemException)); /// Remove a component instance from the NodeApplication - virtual void remove_component (const char * inst_name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void remove_component (const char * inst_name) ACE_THROW_SPEC ((::CORBA::SystemException, ::Components::RemoveFailure)); - virtual void activate_component (const char * name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void activate_component (const char * name) ACE_THROW_SPEC ((::CORBA::SystemException, ::Deployment::StartError)); - virtual void passivate_component (const char * name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void passivate_component (const char * name) ACE_THROW_SPEC ((::CORBA::SystemException, ::Components::RemoveFailure)); /// Remove everything inside including all components and homes. - virtual void remove (void) + virtual void remove () ACE_THROW_SPEC ((CORBA::SystemException)); /// Create a container interface, which will be hosted in this NodeApplication. virtual ::Deployment::Container_ptr - create_container (const ::Deployment::Properties &properties - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + create_container (const ::Deployment::Properties &properties) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::CreateFailure, ::Components::InvalidConfiguration)); /// Remove a container interface. - virtual void remove_container (::Deployment::Container_ptr cref - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void remove_container (::Deployment::Container_ptr cref) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::RemoveFailure)); /// Get all container object refs - virtual ::Deployment::Containers * get_containers ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual ::Deployment::Containers * get_containers () ACE_THROW_SPEC ((CORBA::SystemException)); /*------------- CIAO specific helper functions (C++)--------- @@ -210,7 +201,7 @@ namespace CIAO /// Return the cached object reference of this NodeApplication object. /// This operation does *NOT* increase the reference count. ::Deployment::NodeApplication_ptr - get_objref (void); + get_objref (); /*------- CIAO helper functions for pub/sub service ------- * @@ -224,8 +215,7 @@ namespace CIAO /// event connection. void build_event_connection ( const Deployment::Connection & connection, - bool add_or_remove - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + bool add_or_remove) ACE_THROW_SPEC ((Deployment::InvalidConnection, CORBA::SystemException)); @@ -235,8 +225,7 @@ namespace CIAO virtual void finishLaunch_i (const Deployment::Connections & connections, CORBA::Boolean start, - CORBA::Boolean add_connection - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::Boolean add_connection) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StartError, Deployment::InvalidConnection)); @@ -291,8 +280,7 @@ namespace CIAO /// Create and initialize all the containers virtual CORBA::Long create_all_containers ( - const ::Deployment::ContainerImplementationInfos & container_infos - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const ::Deployment::ContainerImplementationInfos & container_infos) ACE_THROW_SPEC ((CORBA::SystemException)); /// Create a "key" for the connection diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.inl b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.inl index afaa7153359..2fefdcc84d4 100644 --- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.inl +++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.inl @@ -19,7 +19,7 @@ NodeApplication_Impl (CORBA::ORB_ptr o, // Access the readonly attribute ACE_INLINE Deployment::Properties * -CIAO::NodeApplication_Impl::properties (void) +CIAO::NodeApplication_Impl::properties () ACE_THROW_SPEC ((CORBA::SystemException)) { Deployment::Properties * tmp = 0; @@ -41,8 +41,7 @@ CIAO::NodeApplication_Impl::_default_POA (void) ACE_INLINE CORBA::Object_ptr -CIAO::NodeApplication_Impl::get_node_application_manager ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +CIAO::NodeApplication_Impl::get_node_application_manager () ACE_THROW_SPEC ((CORBA::SystemException)) { return ::CORBA::Object::_duplicate (this->node_app_manager_.in ()); @@ -53,13 +52,12 @@ ACE_INLINE void CIAO::NodeApplication_Impl:: set_objref (Components::Deployment::ServerActivator_ptr act, const Components::ConfigValues &config, - Components::Deployment::ComponentServer_ptr cs - ACE_ENV_ARG_DECL) + Components::Deployment::ComponentServer_ptr cs) ACE_THROW_SPEC ((CORBA::SystemException)) { if (!CORBA::is_nil (this->node_app_manager_.in ()) || !CORBA::is_nil (this->objref_.in ())) - ACE_THROW (CORBA::BAD_INV_ORDER ()); + throw CORBA::BAD_INV_ORDER (); this->config_ = new Components::ConfigValues (config); this->activator_ = Components::Deployment::ServerActivator::_duplicate (act); @@ -69,7 +67,7 @@ set_objref (Components::Deployment::ServerActivator_ptr act, ACE_INLINE ::Deployment::NodeApplication_ptr CIAO::NodeApplication_Impl:: -get_objref (void) +get_objref () { if (CORBA::is_nil (this->objref_.in ())) { diff --git a/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp b/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp index 66ef9a34d2b..b0dfb8a9ac0 100644 --- a/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp +++ b/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp @@ -16,8 +16,7 @@ CIAO::RTResource_Config_Manager::init (RTCORBA::RTORB_ptr rtorb) void CIAO::RTResource_Config_Manager::print_resources -(const CIAO::DAnCE::ServerResource &server_resource - ACE_ENV_ARG_DECL) +(const CIAO::DAnCE::ServerResource &server_resource) ACE_THROW_SPEC ((CORBA::SystemException)) { const CIAO::DAnCE::ORBResource &orb_resource @@ -103,8 +102,7 @@ CIAO::RTResource_Config_Manager::print_resources void CIAO::RTResource_Config_Manager::init_resources -(const CIAO::DAnCE::ServerResource &server_resource - ACE_ENV_ARG_DECL) +(const CIAO::DAnCE::ServerResource &server_resource) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -114,7 +112,7 @@ CIAO::RTResource_Config_Manager::init_resources { ACE_ERROR ((LM_ERROR, "RTResource_Config_Manager has not been properly initialized.\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } this->print_resources (server_resource); @@ -139,16 +137,15 @@ CIAO::RTResource_Config_Manager::init_resources orb_resource.threadpool_list[i].default_priority, orb_resource.threadpool_list[i].allow_request_buffering, orb_resource.threadpool_list[i].max_buffered_requests, - orb_resource.threadpool_list[i].max_request_buffer_size - ACE_ENV_ARG_PARAMETER); - // Simply pass back the exception here + orb_resource.threadpool_list[i].max_request_buffer_size); + // Simply pass back the exception here // for now. We need to have a better way // to handle execption here. if (this->threadpool_map_.bind (orb_resource.threadpool_list[i].Id.in (), thr_id) != 0) { ACE_ERROR ((LM_ERROR, "Error binding thread pool Id: %s to map when initializing RTNodeApplication resources.\n", orb_resource.threadpool_list[i].Id.in ())); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } else { @@ -189,9 +186,8 @@ CIAO::RTResource_Config_Manager::init_resources orb_resource.threadpool_with_lanes_list[i].allow_borrowing, orb_resource.threadpool_with_lanes_list[i].allow_request_buffering, orb_resource.threadpool_with_lanes_list[i].max_buffered_requests, - orb_resource.threadpool_with_lanes_list[i].max_request_buffer_size - ACE_ENV_ARG_PARAMETER); - // Simply pass back the exception here + orb_resource.threadpool_with_lanes_list[i].max_request_buffer_size); + // Simply pass back the exception here // for now. We need to have a better way // to handle execption here. @@ -202,7 +198,7 @@ CIAO::RTResource_Config_Manager::init_resources "Error binding thread pool name: %s to map when " "initializing RTNodeApplication resources.\n", orb_resource.threadpool_with_lanes_list[i].Id.in ())); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } else @@ -234,7 +230,7 @@ CIAO::RTResource_Config_Manager::init_resources "Error binding priority bands name: %s to map " "when initializing RTNodeApplication resources.\n", orb_resource.connection_bands_list[i].Id.in ())); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } else { @@ -259,8 +255,7 @@ CIAO::RTResource_Config_Manager::init_resources // Create a list of policies for (CORBA::ULong pc = 0; pc < np; ++pc) { - policy_list[pc] = this->create_single_policy (sets[i].policies[pc] - ACE_ENV_ARG_PARAMETER); + policy_list[pc] = this->create_single_policy (sets[i].policies[pc]); } // Bind the policy list to the name. The bind operation should @@ -272,7 +267,7 @@ CIAO::RTResource_Config_Manager::init_resources ACE_ERROR ((LM_ERROR, "Error binding Policy_Set with name: %s\n", sets[i].Id.in ())); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } else { @@ -284,7 +279,7 @@ CIAO::RTResource_Config_Manager::init_resources } void -CIAO::RTResource_Config_Manager::fini (void) +CIAO::RTResource_Config_Manager::fini () ACE_THROW_SPEC ((CORBA::SystemException)) { TP_MAP::ITERATOR iter = this->threadpool_map_.begin (); @@ -292,15 +287,13 @@ CIAO::RTResource_Config_Manager::fini (void) for (; iter != end; ++iter) { - this->rtorb_->destroy_threadpool ((*iter).int_id_ - ACE_ENV_ARG_PARAMETER); + this->rtorb_->destroy_threadpool ((*iter).int_id_); } } RTCORBA::ThreadpoolId -CIAO::RTResource_Config_Manager::find_threadpool_by_name (const char *name - ACE_ENV_ARG_DECL) +CIAO::RTResource_Config_Manager::find_threadpool_by_name (const char *name) ACE_THROW_SPEC ((CORBA::SystemException)) { if (name == 0) @@ -325,8 +318,7 @@ CIAO::RTResource_Config_Manager::find_threadpool_by_name (const char *name } RTCORBA::PriorityBands * -CIAO::RTResource_Config_Manager::find_priority_bands_by_name (const char *name - ACE_ENV_ARG_DECL) +CIAO::RTResource_Config_Manager::find_priority_bands_by_name (const char *name) ACE_THROW_SPEC ((CORBA::SystemException)) { if (name == 0) @@ -352,8 +344,7 @@ CIAO::RTResource_Config_Manager::find_priority_bands_by_name (const char *name } CORBA::PolicyList * -CIAO::RTResource_Config_Manager::find_policies_by_name (const char *name - ACE_ENV_ARG_DECL) +CIAO::RTResource_Config_Manager::find_policies_by_name (const char *name) ACE_THROW_SPEC ((CORBA::SystemException)) { if (name == 0) @@ -388,8 +379,7 @@ CIAO::RTResource_Config_Manager::find_policies_by_name (const char *name CORBA::Policy_ptr CIAO::RTResource_Config_Manager::create_single_policy -(const CIAO::DAnCE::PolicyDef &policy_def - ACE_ENV_ARG_DECL) +(const CIAO::DAnCE::PolicyDef &policy_def) ACE_THROW_SPEC ((CORBA::SystemException)) { // if (CIAO::debug_level () > 9) @@ -407,8 +397,7 @@ CIAO::RTResource_Config_Manager::create_single_policy = policy_def.PriorityModelDef (); retv = this->rtorb_->create_priority_model_policy ((RTCORBA::PriorityModel) tmp.priority_model, - tmp.server_priority - ACE_ENV_ARG_PARAMETER); + tmp.server_priority); if (! CORBA::is_nil (retv.in ())) ACE_DEBUG ((LM_DEBUG, @@ -420,11 +409,9 @@ CIAO::RTResource_Config_Manager::create_single_policy case RTCORBA::THREADPOOL_POLICY_TYPE: { RTCORBA::ThreadpoolId tpid = - this->find_threadpool_by_name (policy_def.ThreadpoolDef().Id.in () - ACE_ENV_ARG_PARAMETER); + this->find_threadpool_by_name (policy_def.ThreadpoolDef().Id.in ()); - retv = this->rtorb_->create_threadpool_policy (tpid - ACE_ENV_ARG_PARAMETER); + retv = this->rtorb_->create_threadpool_policy (tpid); if (! CORBA::is_nil (retv.in ())) ACE_DEBUG ((LM_DEBUG, @@ -436,12 +423,10 @@ CIAO::RTResource_Config_Manager::create_single_policy case RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE: { RTCORBA::PriorityBands_var bands = - this->find_priority_bands_by_name (policy_def.PriorityBandedConnectionDef().Id.in () - ACE_ENV_ARG_PARAMETER); + this->find_priority_bands_by_name (policy_def.PriorityBandedConnectionDef().Id.in ()); retv = - this->rtorb_->create_priority_banded_connection_policy (bands.in () - ACE_ENV_ARG_PARAMETER); + this->rtorb_->create_priority_banded_connection_policy (bands.in ()); if (! CORBA::is_nil (retv.in ())) { diff --git a/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h b/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h index 0811d99263d..514a13cb797 100644 --- a/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h +++ b/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h @@ -56,34 +56,29 @@ namespace CIAO void init (RTCORBA::RTORB_ptr rtorb); /// Initializing the RTResource_Config_Manager - void init_resources (const CIAO::DAnCE::ServerResource &info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + void init_resources (const CIAO::DAnCE::ServerResource &info) ACE_THROW_SPEC ((CORBA::SystemException)); /// Finalizing the RTResource_Config_Manager and the resources it /// manages. - void fini (void) + void fini () ACE_THROW_SPEC ((CORBA::SystemException)); /// Query a policy set by name - CORBA::PolicyList *find_policies_by_name (const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyList *find_policies_by_name (const char *name) ACE_THROW_SPEC ((CORBA::SystemException)); protected: - void print_resources (const CIAO::DAnCE::ServerResource &info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + void print_resources (const CIAO::DAnCE::ServerResource &info) ACE_THROW_SPEC ((CORBA::SystemException)); /// Query a thread pool by name. - RTCORBA::ThreadpoolId find_threadpool_by_name (const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + RTCORBA::ThreadpoolId find_threadpool_by_name (const char *name) ACE_THROW_SPEC ((CORBA::SystemException)); /// Query a priority bands info by name. - RTCORBA::PriorityBands *find_priority_bands_by_name (const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + RTCORBA::PriorityBands *find_priority_bands_by_name (const char *name) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -114,8 +109,7 @@ namespace CIAO /// create a single policy CORBA::Policy_ptr create_single_policy - (const CIAO::DAnCE::PolicyDef &policy_def - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + (const CIAO::DAnCE::PolicyDef &policy_def) ACE_THROW_SPEC ((CORBA::SystemException)); /// Hash_Map stuff. diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp index 4a21bc5a5e4..b6e24eb6cae 100644 --- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp +++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp @@ -49,7 +49,7 @@ is_external_component (ACE_CString & name) Deployment::Connections * CIAO::NodeApplicationManager_Impl_Base:: -create_connections (void) +create_connections () ACE_THROW_SPEC ((CORBA::SystemException, Deployment::ResourceNotAvailable, Deployment::StartError, @@ -181,14 +181,13 @@ Deployment::Application_ptr CIAO::NodeApplicationManager_Impl_Base:: startLaunch (const Deployment::Properties & configProperty, Deployment::Connections_out providedReference, - CORBA::Boolean start - ACE_ENV_ARG_DECL) + CORBA::Boolean start) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::ResourceNotAvailable, Deployment::StartError, Deployment::InvalidProperty)) { - ACE_TRY + try { CIAO_TRACE("CIAO::NodeApplicationManager_Impl::startLaunch"); ACE_UNUSED_ARG (configProperty); @@ -226,7 +225,7 @@ startLaunch (const Deployment::Properties & configProperty, "CIAO::NodeApplicationManager_Impl::startLaunch -" "Failed to create Node Implementation Infos!\n")); - ACE_TRY_THROW + throw (Deployment::StartError ("NodeApplicationManager_Imp::startLaunch", "Unable to get node level infos")); } @@ -271,7 +270,7 @@ startLaunch (const Deployment::Properties & configProperty, } Deployment::NodeApplication_var tmp = - create_node_application (cmd_option.c_str () ACE_ENV_ARG_PARAMETER); + create_node_application (cmd_option.c_str ()); if (CIAO::debug_level () > 9) { @@ -301,7 +300,7 @@ startLaunch (const Deployment::Properties & configProperty, Deployment::ComponentInfos_var comp_info; // This will install all homes and components. - comp_info = this->nodeapp_->install (*node_info ACE_ENV_ARG_PARAMETER); + comp_info = this->nodeapp_->install (*node_info); // Now fill in the map we have for the "newly installed" components. @@ -319,7 +318,7 @@ startLaunch (const Deployment::Properties & configProperty, ACE_CString error ("Duplicate component instance name "); error += comp_info[len].component_instance_name.in(); - ACE_TRY_THROW + throw (Deployment::StartError ("NodeApplicationManager_Impl::startLaunch", error.c_str ())); @@ -339,7 +338,7 @@ startLaunch (const Deployment::Properties & configProperty, ACE_CString error ("Duplicate component instance name "); error += this->shared_components_[j].name.in(); - ACE_TRY_THROW + throw (Deployment::StartError ("NodeApplicationManager_Impl::startLaunch", error.c_str ())); @@ -352,31 +351,30 @@ startLaunch (const Deployment::Properties & configProperty, if (providedReference == 0) { - ACE_TRY_THROW + throw (Deployment::StartError ("NodeApplicationManager_Impl::startLaunch", "Error creating connections for components during startLaunch.")); } } - ACE_CATCH (Deployment::UnknownImplId, e) + catch (const Deployment::UnknownImplId& e) { ACE_THROW_RETURN (Deployment::StartError (e.name.in (), e.reason.in ()), Deployment::Application::_nil()); } - ACE_CATCH (Deployment::ImplEntryPointNotFound, e) + catch (const Deployment::ImplEntryPointNotFound& e) { ACE_THROW_RETURN (Deployment::StartError (e.name.in (), e.reason.in ()), Deployment::Application::_nil()); } - ACE_CATCH (Deployment::InstallationFailure,e) + catch (const Deployment::InstallationFailure& e) { ACE_THROW_RETURN (Deployment::StartError (e.name.in (), e.reason.in ()), Deployment::Application::_nil()); } - ACE_ENDTRY; return Deployment::NodeApplication::_duplicate (this->nodeapp_.in ()); } @@ -387,8 +385,7 @@ CIAO::NodeApplicationManager_Impl_Base:: perform_redeployment (const Deployment::Properties & configProperty, Deployment::Connections_out providedReference, CORBA::Boolean /*add_or_remove*/, // true means "add" only - CORBA::Boolean start - ACE_ENV_ARG_DECL) + CORBA::Boolean start) ACE_THROW_SPEC ((::CORBA::SystemException, ::Deployment::PlanError, ::Deployment::InstallationFailure, @@ -427,7 +424,7 @@ perform_redeployment (const Deployment::Properties & configProperty, ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) NodeApplicationManager_Impl_Base: " "invoked CIAO::NodeApplicationManager_Impl_Base::perform_redeployment \n")); - ACE_TRY + try { if (! CORBA::is_nil (this->nodeapp_.in ())) { @@ -462,7 +459,7 @@ perform_redeployment (const Deployment::Properties & configProperty, // Install the components // This is what we will get back, a sequence of compoent object refs. Deployment::ComponentInfos_var comp_info; - comp_info = this->nodeapp_->install (*node_info ACE_ENV_ARG_PARAMETER); + comp_info = this->nodeapp_->install (*node_info); // Now fill in the map we have for the components. const CORBA::ULong comp_len = comp_info->length (); @@ -479,7 +476,7 @@ perform_redeployment (const Deployment::Properties & configProperty, ACE_CString error ("Duplicate component instance name "); error += comp_info[len].component_instance_name.in(); - ACE_TRY_THROW + throw (Deployment::PlanError ("NodeApplicationManager_Impl::startLaunch", error.c_str ())); @@ -493,7 +490,7 @@ perform_redeployment (const Deployment::Properties & configProperty, if (providedReference == 0) { - ACE_TRY_THROW + throw (Deployment::InstallationFailure ("NodeApplicationManager_Impl::startLaunch", "Error creating connections during startLaunch.")); @@ -504,29 +501,27 @@ perform_redeployment (const Deployment::Properties & configProperty, { this->startLaunch (configProperty, providedReference, - start - ACE_ENV_ARG_PARAMETER); + start); } } - ACE_CATCH (Deployment::UnknownImplId, e) + catch (const Deployment::UnknownImplId& e) { ACE_THROW_RETURN (Deployment::UnknownImplId (e.name.in (), e.reason.in ()), Deployment::Application::_nil()); } - ACE_CATCH (Deployment::ImplEntryPointNotFound, e) + catch (const Deployment::ImplEntryPointNotFound& e) { ACE_THROW_RETURN (Deployment::ImplEntryPointNotFound (e.name.in (), e.reason.in ()), Deployment::Application::_nil()); } - ACE_CATCH (Deployment::InstallationFailure,e) + catch (const Deployment::InstallationFailure& e) { ACE_THROW_RETURN (Deployment::InstallationFailure (e.name.in (), e.reason.in ()), Deployment::Application::_nil()); } - ACE_ENDTRY; return Deployment::NodeApplication::_duplicate (this->nodeapp_.in ()); } @@ -543,7 +538,7 @@ add_new_components () ::Deployment::InvalidConnection, ::Deployment::InvalidProperty)) { - ACE_TRY + try { // We ignored those components that are already in the <component_map_>, for // the rest ones, we pack them into NodeImplementationInfo. @@ -579,7 +574,7 @@ add_new_components () "CIAO::NodeApplicationManager_Impl::perform_redeployment -" "Failed to create Node Implementation Infos!\n")); - ACE_TRY_THROW + throw (Deployment::PlanError ("NodeApplicationManager_Imp::perform_redeployment", "Unable to get node level infos")); } @@ -587,7 +582,7 @@ add_new_components () // Install the components // This is what we will get back, a sequence of component object refs. Deployment::ComponentInfos_var comp_info; - comp_info = this->nodeapp_->install (*node_info ACE_ENV_ARG_PARAMETER); + comp_info = this->nodeapp_->install (*node_info); // Now fill in the map we have for the components. const CORBA::ULong comp_len = comp_info->length (); @@ -604,20 +599,19 @@ add_new_components () ACE_CString error ("Duplicate component instance name "); error += comp_info[len].component_instance_name.in(); - ACE_TRY_THROW + throw (Deployment::PlanError ("NodeApplicationManager_Impl::startLaunch", error.c_str ())); } } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_ERROR ((LM_ERROR, "NodeApplicationManager_Impl_Base::" "add_new_components () exception caught.\n")); - ACE_RE_THROW; + throw; } - ACE_ENDTRY; } @@ -628,7 +622,7 @@ remove_existing_components () ::Deployment::PlanError, ::Components::RemoveFailure)) { - ACE_TRY + try { ACE_Vector<ACE_CString> gone_component_list; @@ -651,13 +645,12 @@ remove_existing_components () for (size_t i = 0; i < gone_component_list.size (); ++i) this->component_map_.unbind (gone_component_list[i]); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_ERROR ((LM_ERROR, "NodeApplicationManager_Impl_Base::" "remove_existing_components () exception caught.\n")); - ACE_RE_THROW; + throw; } - ACE_ENDTRY; } bool @@ -680,8 +673,7 @@ is_to_be_removed (const char * name) void CIAO::NodeApplicationManager_Impl_Base:: -set_shared_components (const Deployment::ComponentPlans & shared - ACE_ENV_ARG_DECL) +set_shared_components (const Deployment::ComponentPlans & shared) ACE_THROW_SPEC ((::CORBA::SystemException)) { this->shared_components_ = shared; @@ -689,8 +681,7 @@ set_shared_components (const Deployment::ComponentPlans & shared void CIAO::NodeApplicationManager_Impl_Base:: -destroyApplication (Deployment::Application_ptr app - ACE_ENV_ARG_DECL) +destroyApplication (Deployment::Application_ptr app) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StopError)) { @@ -702,7 +693,7 @@ destroyApplication (Deployment::Application_ptr app //@@ Since we know there is only 1 nodeapp so the passed in // parameter is ignored for now. if (CORBA::is_nil (this->nodeapp_.in () )) - ACE_THROW (Deployment::StopError ()); + throw Deployment::StopError (); // Iterate over all the components within this NAM, and if it's // not a shared component, then remove it. If all the components @@ -742,8 +733,7 @@ destroyApplication (Deployment::Application_ptr app ::CORBA::Long CIAO::NodeApplicationManager_Impl_Base::set_priority ( const char * cid, - const ::Deployment::Sched_Params & params - ACE_ENV_ARG_DECL) + const ::Deployment::Sched_Params & params) ACE_THROW_SPEC ((::CORBA::SystemException)) { if (CIAO::debug_level () > 20) @@ -832,14 +822,13 @@ CIAO::NodeApplicationManager_Impl::init ( const CORBA::ULong delay, const Deployment::DeploymentPlan & plan, const PortableServer::POA_ptr callback_poa, - NodeManager_Impl_Base * nm - ACE_ENV_ARG_DECL) + NodeManager_Impl_Base * nm) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::InvalidProperty)) { PortableServer::ObjectId_var oid; - ACE_TRY + try { if (nodeapp_location == 0) { @@ -847,7 +836,7 @@ CIAO::NodeApplicationManager_Impl::init ( "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -" "CIAO::NodeApplicationManager_Impl::init -" "NULL NodeApplication location. \n")); - ACE_TRY_THROW (CORBA::BAD_PARAM ()); + throw CORBA::BAD_PARAM (); } if (delay == 0) @@ -857,7 +846,7 @@ CIAO::NodeApplicationManager_Impl::init ( "CIAO::NodeApplicationManager_Impl::init -" "NodeManager must be started with a -d " "of greter than zero.\n")); - ACE_TRY_THROW (CORBA::BAD_PARAM ()); + throw CORBA::BAD_PARAM (); } this->nodeapp_path_.set (nodeapp_location); @@ -872,17 +861,14 @@ CIAO::NodeApplicationManager_Impl::init ( this->callback_poa_ = PortableServer::POA::_duplicate (callback_poa); // Activate the ourself. - oid = this->poa_->activate_object (this - ACE_ENV_ARG_PARAMETER); + oid = this->poa_->activate_object (this); CORBA::Object_var obj = - this->poa_->id_to_reference (oid.in () - ACE_ENV_ARG_PARAMETER); + this->poa_->id_to_reference (oid.in ()); // And cache the object reference. this->objref_ = - Deployment::NodeApplicationManager::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + Deployment::NodeApplicationManager::_narrow (obj.in ()); // add the signal handler to the ACE_REACTOR @@ -899,13 +885,11 @@ CIAO::NodeApplicationManager_Impl::init ( */ } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "NodeApplicationManager_Impl_Base::init\t\n"); - ACE_RE_THROW; + ex._tao_print_exception ("NodeApplicationManager_Impl_Base::init\t\n"); + throw; } - ACE_ENDTRY; //return this object reference return oid.in (); @@ -913,8 +897,7 @@ CIAO::NodeApplicationManager_Impl::init ( Deployment::NodeApplication_ptr CIAO::NodeApplicationManager_Impl:: -create_node_application (const ACE_CString & options - ACE_ENV_ARG_DECL) +create_node_application (const ACE_CString & options) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::ResourceNotAvailable, Deployment::StartError, @@ -939,27 +922,23 @@ create_node_application (const ACE_CString & options PortableServer::ServantBase_var servant_var (callback_servant); PortableServer::ObjectId_var cb_id - = this->callback_poa_->activate_object (callback_servant - ACE_ENV_ARG_PARAMETER); + = this->callback_poa_->activate_object (callback_servant); ACE_Process_Options p_options; ACE_Process_Manager process_manager; process_manager.open (10, ACE_Reactor::instance ()); - ACE_TRY + try { CORBA::Object_var cb_obj = - this->callback_poa_->id_to_reference (cb_id.in () - ACE_ENV_ARG_PARAMETER); + this->callback_poa_->id_to_reference (cb_id.in ()); CIAO::NodeApplication_Callback_var cb = - CIAO::NodeApplication_Callback::_narrow (cb_obj.in () - ACE_ENV_ARG_PARAMETER); + CIAO::NodeApplication_Callback::_narrow (cb_obj.in ()); CORBA::String_var cb_ior = - this->orb_->object_to_string (cb.in () - ACE_ENV_ARG_PARAMETER); + this->orb_->object_to_string (cb.in ()); // spawn the new NodeApplication. p_options.command_line ("%s -k %s " @@ -981,7 +960,7 @@ create_node_application (const ACE_CString & options "Fail to spawn a NodeApplication process\n")); } - ACE_TRY_THROW + throw (Deployment::ResourceNotAvailable ("Failed to spawn process", "NodeApplication", @@ -998,8 +977,7 @@ create_node_application (const ACE_CString & options while (looping) { - this->orb_->perform_work (timeout - ACE_ENV_ARG_PARAMETER); + this->orb_->perform_work (timeout); retval = callback_servant->get_nodeapp_ref (); @@ -1015,7 +993,7 @@ create_node_application (const ACE_CString & options "Fail to acquire the NodeApplication object\n")); } - ACE_TRY_THROW (Deployment::ResourceNotAvailable ()); + throw Deployment::ResourceNotAvailable (); } { @@ -1024,15 +1002,14 @@ create_node_application (const ACE_CString & options Deployment::NodeApplication::_duplicate (retval.in ()); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { this->callback_poa_->deactivate_object (cb_id.in ()); - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - this->callback_poa_->deactivate_object (cb_id.in () ACE_ENV_ARG_PARAMETER); + this->callback_poa_->deactivate_object (cb_id.in ()); if (CIAO::debug_level () > 1) { @@ -1091,8 +1068,7 @@ CIAO::Static_NodeApplicationManager_Impl::init ( const CORBA::ULong delay, const Deployment::DeploymentPlan & plan, const PortableServer::POA_ptr callback_poa, - NodeManager_Impl_Base * nm - ACE_ENV_ARG_DECL) + NodeManager_Impl_Base * nm) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::InvalidProperty)) { @@ -1103,7 +1079,7 @@ CIAO::Static_NodeApplicationManager_Impl::init ( ACE_UNUSED_ARG (delay); ACE_UNUSED_ARG (callback_poa); - ACE_TRY + try { this->node_manager_ = nm; @@ -1111,25 +1087,20 @@ CIAO::Static_NodeApplicationManager_Impl::init ( this->plan_ = plan; // Activate the ourself. - oid = this->poa_->activate_object (this - ACE_ENV_ARG_PARAMETER); + oid = this->poa_->activate_object (this); CORBA::Object_var obj = - this->poa_->id_to_reference (oid.in () - ACE_ENV_ARG_PARAMETER); + this->poa_->id_to_reference (oid.in ()); // And cache the object reference. this->objref_ = - Deployment::NodeApplicationManager::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + Deployment::NodeApplicationManager::_narrow (obj.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "NodeApplicationManager_Impl_Base::init\t\n"); - ACE_RE_THROW; + ex._tao_print_exception ("NodeApplicationManager_Impl_Base::init\t\n"); + throw; } - ACE_ENDTRY; //return this object reference return oid.in (); @@ -1137,8 +1108,7 @@ CIAO::Static_NodeApplicationManager_Impl::init ( Deployment::NodeApplication_ptr CIAO::Static_NodeApplicationManager_Impl:: -create_node_application (const ACE_CString & options - ACE_ENV_ARG_DECL) +create_node_application (const ACE_CString & options) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::ResourceNotAvailable, Deployment::StartError, @@ -1166,16 +1136,13 @@ create_node_application (const ACE_CString & options // CONFIGURING NodeApplication PortableServer::ObjectId_var nodeapp_oid - = poa_->activate_object (nodeapp_servant - ACE_ENV_ARG_PARAMETER); + = poa_->activate_object (nodeapp_servant); CORBA::Object_var - obj = poa_->id_to_reference (nodeapp_oid.in () - ACE_ENV_ARG_PARAMETER); + obj = poa_->id_to_reference (nodeapp_oid.in ()); Deployment::NodeApplication_var nodeapp_obj = - Deployment::NodeApplication::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + Deployment::NodeApplication::_narrow (obj.in ()); if (CORBA::is_nil (nodeapp_obj.in ())) { diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h index a379313dee6..5ea55596f1b 100644 --- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h +++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h @@ -64,16 +64,14 @@ namespace CIAO virtual Deployment::Application_ptr startLaunch (const Deployment::Properties & configProperty, Deployment::Connections_out providedReference, - CORBA::Boolean start - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::Boolean start) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::ResourceNotAvailable, Deployment::StartError, Deployment::InvalidProperty)); //@@ Destroy the whole applicaton. - virtual void destroyApplication (Deployment::Application_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void destroyApplication (Deployment::Application_ptr) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StopError)); @@ -81,8 +79,7 @@ namespace CIAO perform_redeployment (const Deployment::Properties & configProperty, Deployment::Connections_out providedReference, CORBA::Boolean add_or_remove, - CORBA::Boolean start - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::Boolean start) ACE_THROW_SPEC ((::CORBA::SystemException, ::Deployment::PlanError, ::Deployment::InstallationFailure, @@ -93,13 +90,11 @@ namespace CIAO ::Components::RemoveFailure)); virtual void - reset_plan (const ::Deployment::DeploymentPlan & plan - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + reset_plan (const ::Deployment::DeploymentPlan & plan) ACE_THROW_SPEC ((::CORBA::SystemException)); virtual void - set_shared_components (const Deployment::ComponentPlans & shared - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + set_shared_components (const Deployment::ComponentPlans & shared) ACE_THROW_SPEC ((::CORBA::SystemException)); /** @@ -139,8 +134,7 @@ namespace CIAO const CORBA::ULong delay, const Deployment::DeploymentPlan & plan, const PortableServer::POA_ptr callback_poa, - NodeManager_Impl_Base * nm - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + NodeManager_Impl_Base * nm) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::InvalidProperty))=0; @@ -150,8 +144,7 @@ namespace CIAO /// Set the priority of the NodeApplication process which this NAM manages virtual ::CORBA::Long set_priority ( const char * cid, - const ::Deployment::Sched_Params & params - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const ::Deployment::Sched_Params & params) ACE_THROW_SPEC ((CORBA::SystemException )); protected: @@ -183,8 +176,7 @@ namespace CIAO /// Internal help function to create new NodeApplicationProcess virtual Deployment::NodeApplication_ptr - create_node_application (const ACE_CString & options - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + create_node_application (const ACE_CString & options) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::ResourceNotAvailable, Deployment::StartError, @@ -192,7 +184,7 @@ namespace CIAO /// Helper function to get the connection. virtual Deployment::Connections * - create_connections (void) + create_connections () ACE_THROW_SPEC ((CORBA::SystemException, Deployment::ResourceNotAvailable, Deployment::StartError, @@ -202,8 +194,7 @@ namespace CIAO * Find the configurations in the plan and prepare them to pass to the * NodeApplication, from command line probably. */ - void parse_config_value (ACE_CString & str - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + void parse_config_value (ACE_CString & str) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::InvalidProperty)); @@ -331,8 +322,7 @@ namespace CIAO const CORBA::ULong delay, const Deployment::DeploymentPlan & plan, const PortableServer::POA_ptr callback_poa, - NodeManager_Impl_Base * nm - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + NodeManager_Impl_Base * nm) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::InvalidProperty)); @@ -343,8 +333,7 @@ namespace CIAO // Internal help function to create new NodeApplicationProcess // Here we override it to create an in-process NodeApplication object virtual Deployment::NodeApplication_ptr - create_node_application (const ACE_CString & options - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + create_node_application (const ACE_CString & options) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::ResourceNotAvailable, Deployment::StartError, @@ -384,8 +373,7 @@ namespace CIAO const CORBA::ULong delay, const Deployment::DeploymentPlan & plan, const PortableServer::POA_ptr callback_poa, - NodeManager_Impl_Base * nm - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + NodeManager_Impl_Base * nm) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::InvalidProperty)); @@ -396,8 +384,7 @@ namespace CIAO /// Internal help function to create new NodeApplicationProcess /// Here we override it to create an in-process NodeApplication object virtual Deployment::NodeApplication_ptr - create_node_application (const ACE_CString & options - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + create_node_application (const ACE_CString & options) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::ResourceNotAvailable, Deployment::StartError, diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl index e744e953876..49bdc80098e 100644 --- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl +++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl @@ -22,15 +22,14 @@ NodeApplicationManager_Impl_Base (CORBA::ORB_ptr o, ACE_INLINE void CIAO::NodeApplicationManager_Impl_Base:: -parse_config_value (ACE_CString & str - ACE_ENV_ARG_DECL) +parse_config_value (ACE_CString & str) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::InvalidProperty)) { // The unused arg is for future improvemnts. ACE_UNUSED_ARG (str); - ACE_THROW ( CORBA::NO_IMPLEMENT() ); + throw CORBA::NO_IMPLEMENT(); } ACE_INLINE @@ -42,8 +41,7 @@ CIAO::NodeApplicationManager_Impl_Base::get_nodeapp_manager (void) ACE_INLINE void CIAO::NodeApplicationManager_Impl_Base:: -reset_plan (const ::Deployment::DeploymentPlan & plan - ACE_ENV_ARG_DECL) +reset_plan (const ::Deployment::DeploymentPlan & plan) ACE_THROW_SPEC ((::CORBA::SystemException)) { this->plan_ = plan; diff --git a/CIAO/DAnCE/NodeManager/MonitorCB.cpp b/CIAO/DAnCE/NodeManager/MonitorCB.cpp index e7893327b8a..56a789a76a3 100644 --- a/CIAO/DAnCE/NodeManager/MonitorCB.cpp +++ b/CIAO/DAnCE/NodeManager/MonitorCB.cpp @@ -49,7 +49,7 @@ int CIAO::MonitorCB::update_data (::Deployment::Domain& data) catch (CORBA::Exception& ) { //ACE_DEBUG ((LM_DEBUG, "CIAO::NM::MonitorCB::Unknown Exception\n")); - //ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NM::MonitorCB::updateDomain"); + //ex._tao_print_exception ("NM::MonitorCB::updateDomain"); } catch (...) { diff --git a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp index eb42689d25c..04d718f9dfd 100644 --- a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp +++ b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp @@ -26,10 +26,10 @@ CIAO::NodeManager_Impl_Base::~NodeManager_Impl_Base () } void -CIAO::NodeManager_Impl_Base::init (void) +CIAO::NodeManager_Impl_Base::init () ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_TRY + try { // Create the call back poa for NAM. PortableServer::POAManager_var mgr @@ -38,16 +38,13 @@ CIAO::NodeManager_Impl_Base::init (void) this->callback_poa_ = this->poa_->create_POA ("callback_poa", mgr.in (), - 0 - ACE_ENV_ARG_PARAMETER); + 0); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "NodeManager_Impl::init\t\n"); - ACE_RE_THROW; + ex._tao_print_exception ("NodeManager_Impl::init\t\n"); + throw; } - ACE_ENDTRY; } PortableServer::POA_ptr @@ -58,25 +55,24 @@ CIAO::NodeManager_Impl_Base::_default_POA (void) char * -CIAO::NodeManager_Impl_Base::name (void) +CIAO::NodeManager_Impl_Base::name () ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->name_.in ()); } void -CIAO::NodeManager_Impl_Base::shutdown (void) +CIAO::NodeManager_Impl_Base::shutdown () ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } void CIAO::NodeManager_Impl_Base::joinDomain (const Deployment::Domain & domain, Deployment::TargetManager_ptr target, - Deployment::Logger_ptr - ACE_ENV_ARG_DECL) + Deployment::Logger_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_THROW (CORBA::NO_IMPLEMENT ()); @@ -107,7 +103,7 @@ CIAO::NodeManager_Impl_Base::joinDomain (const Deployment::Domain & domain, } void -CIAO::NodeManager_Impl_Base::leaveDomain (void) +CIAO::NodeManager_Impl_Base::leaveDomain () ACE_THROW_SPEC ((CORBA::SystemException)) { // Delete the monitor , this will also terminate the thread @@ -119,7 +115,6 @@ CIAO::NodeManager_Impl_Base::set_priority ( const char * plan_id, const char * cid, const ::Deployment::Sched_Params & nm_params - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((::CORBA::SystemException)) @@ -146,9 +141,8 @@ CIAO::NodeManager_Impl_Base::set_priority ( catch (CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "(%P|%t) NodeManager_Impl::set_priority ()\t\n"); - ACE_RE_THROW; + ex._tao_print_exception ("(%P|%t) NodeManager_Impl::set_priority ()\t\n"); + throw; } } @@ -229,8 +223,7 @@ set_all_consumers (ACE_CString &name, Deployment::NodeApplicationManager_ptr CIAO::NodeManager_Impl_Base:: -preparePlan (const Deployment::DeploymentPlan &plan - ACE_ENV_ARG_DECL) +preparePlan (const Deployment::DeploymentPlan &plan) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StartError, Deployment::PlanError)) @@ -278,7 +271,7 @@ preparePlan (const Deployment::DeploymentPlan &plan } // Create/find NodeApplicationManager and set/reset plan on it - ACE_TRY + try { if (!this->map_.is_available (plan.UUID.in ())) { @@ -291,8 +284,7 @@ preparePlan (const Deployment::DeploymentPlan &plan // Implementation undefined. CIAO::NodeApplicationManager_Impl_Base *node_app_mgr = - this->create_node_app_manager (this->orb_.in (), this->poa_.in () - ACE_ENV_ARG_PARAMETER); + this->create_node_app_manager (this->orb_.in (), this->poa_.in ()); PortableServer::ServantBase_var safe (node_app_mgr); @@ -306,7 +298,7 @@ preparePlan (const Deployment::DeploymentPlan &plan plan, this->callback_poa_.in (), this // pass in a copy of ourself (servant object) - ACE_ENV_ARG_PARAMETER); + ); this->map_.insert_nam (plan.UUID.in (), oid.in ()); @@ -354,37 +346,33 @@ preparePlan (const Deployment::DeploymentPlan &plan return nam._retn (); } } - ACE_CATCH (PortableServer::POA::ObjectNotActive, ex) + catch (const PortableServer::POA::ObjectNotActive& ex) { ACE_THROW_RETURN (Deployment::StartError (), Deployment::NodeApplicationManager::_nil ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "(%P|%t) NodeManager_Impl::preparePlan\t\n"); - ACE_RE_THROW; + ex._tao_print_exception ("(%P|%t) NodeManager_Impl::preparePlan\t\n"); + throw; } - ACE_ENDTRY; return Deployment::NodeApplicationManager::_nil (); } void CIAO::NodeManager_Impl_Base::destroyManager -(Deployment::NodeApplicationManager_ptr manager - ACE_ENV_ARG_DECL) +(Deployment::NodeApplicationManager_ptr manager) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StopError, Deployment::InvalidReference)) { CIAO_TRACE("CIAO::NodeManager_Impl::destroyManager"); - ACE_TRY + try { // Deactivate this object PortableServer::ObjectId_var id = - this->poa_->reference_to_id (manager - ACE_ENV_ARG_PARAMETER); + this->poa_->reference_to_id (manager); if (!this->map_.remove_nam (id.in ())) { @@ -393,37 +381,33 @@ CIAO::NodeManager_Impl_Base::destroyManager "Unable to remove object from map!\n")); } - this->poa_->deactivate_object (id.in () - ACE_ENV_ARG_PARAMETER); + this->poa_->deactivate_object (id.in ()); } - ACE_CATCH (PortableServer::POA::WrongAdapter, ex) + catch (const PortableServer::POA::WrongAdapter& ex) { ACE_ERROR ((LM_ERROR, "NodeManager_Impl::destroyManager: EXCEPTION - " "Invalid reference passed to destroyManager\n")); - ACE_THROW (::Deployment::InvalidReference ()); + throw ::Deployment::InvalidReference (); } - ACE_CATCH (PortableServer::POA::ObjectNotActive, ex) + catch (const PortableServer::POA::ObjectNotActive& ex) { ACE_ERROR ((LM_ERROR, "NodeManager_Impl::destroyManager: EXCEPTION - " " asked to destroy an already inactive object.\n")); - ACE_THROW (::Deployment::InvalidReference ()); + throw ::Deployment::InvalidReference (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "NodeManager_Impl::destroyManager\t\n"); - ACE_RE_THROW; + ex._tao_print_exception ("NodeManager_Impl::destroyManager\t\n"); + throw; } - ACE_ENDTRY; } void CIAO::NodeManager_Impl_Base:: -destroyPlan (const Deployment::DeploymentPlan & plan - ACE_ENV_ARG_DECL) +destroyPlan (const Deployment::DeploymentPlan & plan) ACE_THROW_SPEC ((::CORBA::SystemException, ::Deployment::StopError)) { @@ -461,7 +445,7 @@ destroyPlan (const Deployment::DeploymentPlan & plan this->comp_consumers_map_.unbind ( plan.instance[i].name.in ()) != 0) { - ACE_TRY_THROW + throw (Deployment::StopError ("NodeManager_Impl_Base::destroyPlan ", "Unable to find component instance")); } @@ -491,7 +475,7 @@ destroyPlan (const Deployment::DeploymentPlan & plan Deployment::ComponentPlans * CIAO::NodeManager_Impl_Base:: -get_shared_components (void) +get_shared_components () ACE_THROW_SPEC ((::CORBA::SystemException)) { return this->get_shared_components_i (); @@ -643,8 +627,7 @@ NodeManager_Impl (const char *name, ::CIAO::NodeApplicationManager_Impl_Base * CIAO::NodeManager_Impl:: create_node_app_manager (CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL) + PortableServer::POA_ptr poa) ACE_THROW_SPEC ((CORBA::SystemException)) { CIAO::NodeApplicationManager_Impl_Base *app_mgr = 0; @@ -674,8 +657,7 @@ Static_NodeManager_Impl (const char *name, ::CIAO::NodeApplicationManager_Impl_Base * CIAO::Static_NodeManager_Impl:: create_node_app_manager (CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL) + PortableServer::POA_ptr poa) ACE_THROW_SPEC ((CORBA::SystemException)) { if (CIAO::debug_level () > 10) @@ -694,26 +676,23 @@ create_node_app_manager (CORBA::ORB_ptr orb, void CIAO::Static_NodeManager_Impl::destroyManager -(Deployment::NodeApplicationManager_ptr manager - ACE_ENV_ARG_DECL) +(Deployment::NodeApplicationManager_ptr manager) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StopError, Deployment::InvalidReference)) { CIAO_TRACE("CIAO::Static_NodeManager_Impl::destroyManager"); - ACE_TRY + try { - CIAO::NodeManager_Impl_Base::destroyManager (manager ACE_ENV_ARG_PARAMETER); + CIAO::NodeManager_Impl_Base::destroyManager (manager); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Static_NodeManager_Impl::destroyManager\t\n"); - ACE_RE_THROW; + ex._tao_print_exception ("Static_NodeManager_Impl::destroyManager\t\n"); + throw; } - ACE_ENDTRY; } diff --git a/CIAO/DAnCE/NodeManager/NodeManager_Impl.h b/CIAO/DAnCE/NodeManager/NodeManager_Impl.h index f6caf3b4f58..cea98f0fa91 100644 --- a/CIAO/DAnCE/NodeManager/NodeManager_Impl.h +++ b/CIAO/DAnCE/NodeManager/NodeManager_Impl.h @@ -74,53 +74,49 @@ namespace CIAO ACE_THROW_SPEC ((CORBA::SystemException)); /// Initializes the NodeManager. - virtual void init (void) + virtual void init () ACE_THROW_SPEC ((CORBA::SystemException)); /// POA operation.. virtual PortableServer::POA_ptr _default_POA (void); /// CIAO::Daemon defined attributes/operations. - virtual char * name (void) + virtual char * name () ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (void) + virtual void shutdown () ACE_THROW_SPEC ((CORBA::SystemException)); virtual void joinDomain (const Deployment::Domain & domain, Deployment::TargetManager_ptr manager, Deployment::Logger_ptr log - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void leaveDomain (void) + virtual void leaveDomain () ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::Deployment::NodeApplicationManager_ptr - preparePlan (const Deployment::DeploymentPlan &plan - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + preparePlan (const Deployment::DeploymentPlan &plan) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StartError, Deployment::PlanError)); virtual void - destroyManager (Deployment::NodeApplicationManager_ptr appManager - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + destroyManager (Deployment::NodeApplicationManager_ptr appManager) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StopError, Deployment::InvalidReference)); /// CIAO specific extension, which is particularly useful for dealing with /// shared components issue - virtual void destroyPlan (const Deployment::DeploymentPlan & plan - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void destroyPlan (const Deployment::DeploymentPlan & plan) ACE_THROW_SPEC ((::CORBA::SystemException, ::Deployment::StopError)); /// CIAO specific extension, return a set of shared components virtual ::Deployment::ComponentPlans * - get_shared_components (void) + get_shared_components () ACE_THROW_SPEC ((::CORBA::SystemException)); /// RACE specific extension. Modify the priority of a node application @@ -130,8 +126,7 @@ namespace CIAO set_priority ( const char * plan_id, const char * cid, - const ::Deployment::Sched_Params & nm_params - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const ::Deployment::Sched_Params & nm_params) ACE_THROW_SPEC ((::CORBA::SystemException)); // ********* CIAO Specific Helper functions ************ @@ -180,8 +175,7 @@ namespace CIAO virtual ::CIAO::NodeApplicationManager_Impl_Base * create_node_app_manager (CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL) + PortableServer::POA_ptr poa) ACE_THROW_SPEC ((CORBA::SystemException))=0; /// Actual implementation of the @c get_shared_components IDL operation @@ -289,8 +283,7 @@ namespace CIAO virtual ::CIAO::NodeApplicationManager_Impl_Base * create_node_app_manager (CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL) + PortableServer::POA_ptr poa) ACE_THROW_SPEC ((CORBA::SystemException)); }; @@ -317,8 +310,7 @@ namespace CIAO ); void destroyManager - (Deployment::NodeApplicationManager_ptr manager - ACE_ENV_ARG_DECL) + (Deployment::NodeApplicationManager_ptr manager) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StopError, Deployment::InvalidReference)); @@ -333,8 +325,7 @@ namespace CIAO virtual ::CIAO::NodeApplicationManager_Impl_Base * create_node_app_manager (CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL) + PortableServer::POA_ptr poa) ACE_THROW_SPEC ((CORBA::SystemException)); Static_Config_EntryPoints_Maps* static_config_entrypoints_maps_; diff --git a/CIAO/DAnCE/NodeManager/Node_Manager.cpp b/CIAO/DAnCE/NodeManager/Node_Manager.cpp index 10098dce5ed..7a10e719cc0 100644 --- a/CIAO/DAnCE/NodeManager/Node_Manager.cpp +++ b/CIAO/DAnCE/NodeManager/Node_Manager.cpp @@ -128,13 +128,11 @@ write_pid (void) bool register_with_ns (const char * name_context, CORBA::ORB_ptr orb, - CIAO::NodeManagerDaemon_ptr obj - ACE_ENV_ARG_DECL) + CIAO::NodeManagerDaemon_ptr obj) { // Naming Service related operations CORBA::Object_var naming_context_object = - orb->resolve_initial_references ("NameService" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("NameService"); CosNaming::NamingContext_var naming_context = CosNaming::NamingContext::_narrow (naming_context_object.in ()); @@ -161,14 +159,13 @@ register_with_ns (const char * name_context, int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // Initialize orb // @@TODO: Add error checking. There is absoluteley none. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); CIAO::Server_init (orb.in ()); @@ -186,19 +183,16 @@ main (int argc, char *argv[]) // Get reference to Root POA. CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + = orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa - = PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + = PortableServer::POA::_narrow (obj.in ()); CORBA::Object_var table_object = - orb->resolve_initial_references ("IORTable" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("IORTable"); IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); + IORTable::Table::_narrow (table_object.in ()); if (CORBA::is_nil (adapter.in ())) { @@ -225,12 +219,10 @@ main (int argc, char *argv[]) node_manager_servant->_this (); CORBA::String_var str = - orb->object_to_string (node_manager.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (node_manager.in ()); adapter->bind ("NodeManager", - str.in () - ACE_ENV_ARG_PARAMETER); + str.in ()); if (write_to_ior_) { @@ -250,8 +242,7 @@ main (int argc, char *argv[]) // Register this name with the Naming Service (void) register_with_ns (name, orb.in (), - node_manager.in () - ACE_ENV_ARG_PARAMETER); + node_manager.in ()); } ACE_DEBUG ((LM_INFO, "CIAO_NodeManager IOR: %s\n", str.in ())); @@ -281,17 +272,15 @@ main (int argc, char *argv[]) // Run the main event loop for the ORB. orb->run (); - poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "CIAO_NodeManager::main\t\n"); + ex._tao_print_exception ("CIAO_NodeManager::main\t\n"); return 1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "CIAO_NodeManager has closed\n")); diff --git a/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp index 3b8eed94ae9..a1e5831e0af 100644 --- a/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp +++ b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp @@ -16,16 +16,13 @@ namespace CIAO // @todo make this a private method static CORBA::Object_ptr fetch_reference_naming (CORBA::ORB_ptr orb, - const char *repoman_name = 0 - ACE_ENV_ARG_DECL) + const char *repoman_name = 0) { CORBA::Object_var tmp = - orb->resolve_initial_references ("NameService" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("NameService"); CosNaming::NamingContext_var pns = - CosNaming::NamingContext::_narrow (tmp.in () - ACE_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (tmp.in ()); if (CORBA::is_nil (pns.in ())) { @@ -37,8 +34,7 @@ namespace CIAO name[0].id = CORBA::string_dup (repoman_name); - return pns->resolve (name - ACE_ENV_ARG_PARAMETER); + return pns->resolve (name); } Plan_Generator_i::Plan_Generator_i () @@ -55,14 +51,14 @@ namespace CIAO if (rm_use_naming) { - obj = fetch_reference_naming (orb, rm_name ACE_ENV_ARG_PARAMETER); + obj = fetch_reference_naming (orb, rm_name); } else { - obj = orb->string_to_object (rm_name ACE_ENV_ARG_PARAMETER); + obj = orb->string_to_object (rm_name); } - this->rm_ = Deployment::RepositoryManager::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + this->rm_ = Deployment::RepositoryManager::_narrow (obj.in ()); if (CORBA::is_nil (this->rm_.in ())) { diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp index 682477e2009..6a4103af3ac 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp @@ -139,20 +139,16 @@ namespace CIAO } static ::Deployment::DomainApplicationManager_ptr - read_dap_ior (CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) + read_dap_ior (CORBA::ORB_ptr orb) { - CORBA::Object_var obj = orb->string_to_object (dap_ior - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var obj = orb->string_to_object (dap_ior); return - Deployment::DomainApplicationManager::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + Deployment::DomainApplicationManager::_narrow (obj.in ()); } static int write_dap_ior (CORBA::ORB_ptr orb, - ::Deployment::DomainApplicationManager_ptr dap - ACE_ENV_ARG_DECL) + ::Deployment::DomainApplicationManager_ptr dap) { CORBA::String_var ior = orb->object_to_string (dap); @@ -172,15 +168,13 @@ namespace CIAO static int run_main_implementation (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); if (parse_args (argc, argv) == false) return -1; @@ -270,8 +264,7 @@ namespace CIAO } else if (mode == pl_mode_stop_by_dam) // tear down by DAM { - dapp_mgr = read_dap_ior (orb.in () - ACE_ENV_ARG_PARAMETER); + dapp_mgr = read_dap_ior (orb.in ()); if (CORBA::is_nil (dapp_mgr.in ())) { @@ -301,25 +294,23 @@ namespace CIAO orb->destroy (); } - ACE_CATCH (Plan_Launcher_i::Deployment_Failure, ex) + catch (const Plan_Launcher_i::Deployment_Failure& ex) { ACE_ERROR ((LM_ERROR, "Deployment failed. Plan_Launcher exiting.\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "(%P|%t) Plan_Launcher: "); + ex._tao_print_exception ("(%P|%t) Plan_Launcher: "); return -1; } - ACE_CATCHALL + catch (...) { ACE_ERROR ((LM_ERROR, "(%P|%t) Plan_Launcher: Unknown exception.\n")); return -1; } - ACE_ENDTRY; return 0; } diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp index f04c6b31064..d5d62fab723 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp @@ -10,16 +10,13 @@ namespace CIAO { // @todo make this a private method static CORBA::Object_ptr - fetch_reference_naming (CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) + fetch_reference_naming (CORBA::ORB_ptr orb) { CORBA::Object_var tmp = - orb->resolve_initial_references ("NameService" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("NameService"); CosNaming::NamingContext_var pns = - CosNaming::NamingContext::_narrow (tmp.in () - ACE_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (tmp.in ()); if (CORBA::is_nil (pns.in ())) { @@ -31,8 +28,7 @@ namespace CIAO name[0].id = CORBA::string_dup ("ExecutionManager"); - return pns->resolve (name - ACE_ENV_ARG_PARAMETER); + return pns->resolve (name); } Plan_Launcher_i::Plan_Launcher_i () @@ -45,8 +41,7 @@ namespace CIAO CORBA::ORB_ptr orb, bool use_repoman, bool rm_use_naming, - const char *rm_name - ACE_ENV_ARG_DECL) + const char *rm_name) { CORBA::Object_var obj; @@ -60,8 +55,7 @@ namespace CIAO obj = orb->string_to_object (em_ior); } - this->em_ = ::CIAO::ExecutionManagerDaemon::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + this->em_ = ::CIAO::ExecutionManagerDaemon::_narrow (obj.in ()); if (CORBA::is_nil (this->em_.in ())) { @@ -93,8 +87,7 @@ namespace CIAO Plan_Launcher_i::launch_plan (const char *deployment_plan_uri, const char *package_uri, bool use_package_name, - bool use_repoman - ACE_ENV_ARG_DECL) + bool use_repoman) ACE_THROW_SPEC ((Plan_Launcher_i::Deployment_Failure)) { if (CIAO::debug_level () > 9) @@ -124,10 +117,10 @@ namespace CIAO } const char * - Plan_Launcher_i::launch_plan (const ::Deployment::DeploymentPlan &plan ACE_ENV_ARG_DECL) + Plan_Launcher_i::launch_plan (const ::Deployment::DeploymentPlan &plan) ACE_THROW_SPEC ((Plan_Launcher_i::Deployment_Failure)) { - ACE_TRY + try { if (CORBA::is_nil (this->em_.in ())) { @@ -213,7 +206,7 @@ namespace CIAO map_.bind_dam_reference (plan.UUID.in (), Deployment::DomainApplicationManager::_duplicate (dam.in ())); } - ACE_CATCH (Deployment::ResourceNotAvailable, ex) + catch (const Deployment::ResourceNotAvailable& ex) { ACE_ERROR ((LM_ERROR, "EXCEPTION: ResourceNotAvaiable exception caught: %s,\n" @@ -226,52 +219,51 @@ namespace CIAO ex.propertyName.in (), ex.elementName.in (), ex.resourceName.in ())); - ACE_THROW (Deployment_Failure ("")); + throw Deployment_Failure (""); } - ACE_CATCH (Deployment::StartError, ex) + catch (const Deployment::StartError& ex) { ACE_ERROR ((LM_ERROR, "EXCEPTION: StartError exception caught: %s, %s\n", ex.name.in (), ex.reason.in ())); - ACE_THROW (Deployment_Failure ("")); + throw Deployment_Failure (""); } - ACE_CATCH (Deployment::InvalidProperty, ex) + catch (const Deployment::InvalidProperty& ex) { ACE_ERROR ((LM_ERROR, "EXCEPTION: InvalidProperty exception caught: %s, %s\n", ex.name.in (), ex.reason.in ())); - ACE_THROW (Deployment_Failure ("")); + throw Deployment_Failure (""); } - ACE_CATCH (Deployment::InvalidConnection, ex) + catch (const Deployment::InvalidConnection& ex) { ACE_ERROR ((LM_ERROR, "EXCEPTION: InvalidConnection exception caught: %s, %s\n", ex.name.in (), ex.reason.in ())); - ACE_THROW (Deployment_Failure ("")); + throw Deployment_Failure (""); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_ERROR ((LM_ERROR, "CORBA EXCEPTION: %s\n", - ACE_ANY_EXCEPTION._info().fast_rep())); - ACE_THROW (Deployment_Failure ("")); + ex._info().fast_rep())); + throw Deployment_Failure (""); } - ACE_CATCHALL + catch (...) { ACE_ERROR ((LM_ERROR, "EXCEPTION: non-CORBA exception\n")); - ACE_THROW (Deployment_Failure ("")); + throw Deployment_Failure (""); } - ACE_ENDTRY; return CORBA::string_dup (plan.UUID.in ()); } ::Deployment::DomainApplicationManager_ptr - Plan_Launcher_i::get_dam (const char *uuid ACE_ENV_ARG_DECL) + Plan_Launcher_i::get_dam (const char *uuid) { if (!this->map_.is_plan_available (uuid)) { @@ -290,7 +282,7 @@ namespace CIAO // executable to tear down a plan, so we could NOT rely on the local // DAM_Map to fetch DAM obj reference. Instead, we make a remote call // on ExecutionManager to fetch it. - ACE_TRY + try { ::Deployment::DomainApplicationManager_var dapp_mgr = this->em_->getManager (uuid); @@ -309,7 +301,7 @@ namespace CIAO this->destroy_dam_by_plan (uuid); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // @todo the destroy_dam_by_plan could give a stoperror exception // we should handle @@ -317,14 +309,12 @@ namespace CIAO "for plan with uuid: %s\n", uuid)); return false; } - ACE_ENDTRY; return true; } bool - Plan_Launcher_i::teardown_plan (::Deployment::DomainApplicationManager_ptr dam - ACE_ENV_ARG_DECL) + Plan_Launcher_i::teardown_plan (::Deployment::DomainApplicationManager_ptr dam) { if (CIAO::debug_level ()) { @@ -345,8 +335,7 @@ namespace CIAO } void - Plan_Launcher_i::destroy_dam (::Deployment::DomainApplicationManager_ptr dam - ACE_ENV_ARG_DECL) + Plan_Launcher_i::destroy_dam (::Deployment::DomainApplicationManager_ptr dam) { if (CIAO::debug_level ()) { @@ -363,8 +352,7 @@ namespace CIAO } void - Plan_Launcher_i::destroy_dam_by_plan (const char* plan_uuid - ACE_ENV_ARG_DECL) + Plan_Launcher_i::destroy_dam_by_plan (const char* plan_uuid) { if (CIAO::debug_level ()) { @@ -384,8 +372,7 @@ namespace CIAO Plan_Launcher_i::re_launch_plan (const char *deployment_plan_uri, const char *package_uri, bool use_package_name, - bool use_repoman - ACE_ENV_ARG_DECL) + bool use_repoman) ACE_THROW_SPEC ((Plan_Launcher_i::Deployment_Failure)) { CIAO::Config_Handlers::XML_File_Intf intf (deployment_plan_uri); @@ -405,7 +392,7 @@ namespace CIAO } const char * - Plan_Launcher_i::re_launch_plan (const ::Deployment::DeploymentPlan &plan ACE_ENV_ARG_DECL) + Plan_Launcher_i::re_launch_plan (const ::Deployment::DeploymentPlan &plan) ACE_THROW_SPEC ((Plan_Launcher_i::Deployment_Failure)) { diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h index 23ea6abc722..2212c00333f 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h @@ -43,8 +43,7 @@ namespace CIAO CORBA::ORB_ptr orb, bool use_repoman = false, bool rm_use_naming = false, - const char *rm_name = 0 - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + const char *rm_name = 0); /** * @brief Launch a plan, given a deployment plan URI @@ -54,15 +53,13 @@ namespace CIAO const char * launch_plan (const char *deployment_plan_uri, const char *package_uri = 0, bool use_package_name = true, - bool use_repoman = false - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + bool use_repoman = false) ACE_THROW_SPEC ((Deployment_Failure)); const char * re_launch_plan (const char *deployment_plan_uri, const char *package_uri = 0, bool use_package_name = true, - bool use_repoman = false - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + bool use_repoman = false) ACE_THROW_SPEC ((Deployment_Failure)); /** @@ -70,29 +67,23 @@ namespace CIAO * @param plan A valid IDL deployment plan * @returns a string containing the UUID of the plan. Null indicates failure. */ - const char * launch_plan (const ::Deployment::DeploymentPlan &plan - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const char * launch_plan (const ::Deployment::DeploymentPlan &plan) ACE_THROW_SPEC ((Deployment_Failure)); - const char * re_launch_plan (const ::Deployment::DeploymentPlan &plan - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const char * re_launch_plan (const ::Deployment::DeploymentPlan &plan) ACE_THROW_SPEC ((Deployment_Failure)); /// Returns the DAM associated with a given plan URI - ::Deployment::DomainApplicationManager_ptr get_dam (const char *uuid - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ::Deployment::DomainApplicationManager_ptr get_dam (const char *uuid); /// Tears down a plan given the UUID - bool teardown_plan (const char *uuid ACE_ENV_ARG_DECL); + bool teardown_plan (const char *uuid); - bool teardown_plan (::Deployment::DomainApplicationManager_ptr dam - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + bool teardown_plan (::Deployment::DomainApplicationManager_ptr dam); - void destroy_dam (::Deployment::DomainApplicationManager_ptr dam - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + void destroy_dam (::Deployment::DomainApplicationManager_ptr dam); - void destroy_dam_by_plan (const char * plan_uuid - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + void destroy_dam_by_plan (const char * plan_uuid); private: ::CIAO::ExecutionManagerDaemon_var em_; diff --git a/CIAO/DAnCE/RepositoryManager/RMadmin.cpp b/CIAO/DAnCE/RepositoryManager/RMadmin.cpp index 4be6883fc81..f61a9f2a71e 100644 --- a/CIAO/DAnCE/RepositoryManager/RMadmin.cpp +++ b/CIAO/DAnCE/RepositoryManager/RMadmin.cpp @@ -39,11 +39,11 @@ static const char *RMname_service; /// main function that provides a sample interface for RM clients int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - ACE_TRY_NEW_ENV + try { // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - ""ACE_ENV_ARG_PARAMETER); + ""); Options* options = TheOptions::instance (); @@ -54,7 +54,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (options->write_to_ior_) { - obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + obj = orb->string_to_object (ior); } else if (options->register_with_ns_) @@ -64,8 +64,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Naming Service related operations CORBA::Object_var naming_context_object = - orb->resolve_initial_references ("NameService" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("NameService"); CosNaming::NamingContext_var naming_context = CosNaming::NamingContext::_narrow (naming_context_object.in ()); @@ -83,8 +82,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CIAO::RepositoryManagerDaemon_var rm = - CIAO::RepositoryManagerDaemon::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + CIAO::RepositoryManagerDaemon::_narrow (obj.in ()); if (CORBA::is_nil (rm.in ())) { @@ -187,19 +185,18 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) Deployment::PackageConfiguration *pc = new Deployment::PackageConfiguration (); // Parse the PCD to make sure that there are no package errors. - ACE_TRY + try { CIAO::Config_Handlers::Packaging::PCD_Handler::package_config ("default.pcd", *pc); } - ACE_CATCHALL + catch (...) { ACE_ERROR (( LM_ERROR, "(%P|%t) [RM::retrieve_PC_from_descriptors] Error parsing the PCD\n")); - ACE_THROW (Deployment::PackageError ()); + throw Deployment::PackageError (); } - ACE_ENDTRY; ACE_OS::chdir (cwd); @@ -242,13 +239,11 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->shutdown (1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unknown exception \n"); + ex._tao_print_exception ("Unknown exception \n"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp b/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp index 1084037c178..10d67721cd0 100644 --- a/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp +++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp @@ -73,12 +73,10 @@ private: bool write_ior_file (CORBA::ORB_ptr orb, - CIAO::RepositoryManagerDaemon_ptr obj - ACE_ENV_ARG_DECL) + CIAO::RepositoryManagerDaemon_ptr obj) { CORBA::String_var ior = - orb->object_to_string (obj - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (obj); FILE* RMior_file = ACE_OS::fopen (CIAO::RepositoryManager::RMior, "w"); @@ -100,8 +98,7 @@ write_ior_file (CORBA::ORB_ptr orb, bool register_with_ns (CORBA::ORB_ptr orb, - CIAO::RepositoryManagerDaemon_ptr obj - ACE_ENV_ARG_DECL) + CIAO::RepositoryManagerDaemon_ptr obj) { if (CIAO::RepositoryManager::repoman_name_ != "") CIAO::RepositoryManager::RMname_service = @@ -109,8 +106,7 @@ register_with_ns (CORBA::ORB_ptr orb, // Naming Service related operations CORBA::Object_var naming_context_object = - orb->resolve_initial_references ("NameService" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("NameService"); CosNaming::NamingContext_var naming_context = CosNaming::NamingContext::_narrow (naming_context_object.in ()); @@ -172,15 +168,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { retval = write_ior_file (orb.in (), - RepositoryManagerDaemon.in () - ACE_ENV_ARG_PARAMETER); + RepositoryManagerDaemon.in ()); } else if (CIAO::RepositoryManager::register_with_ns_) { retval = register_with_ns (orb.in (), - RepositoryManagerDaemon.in () - ACE_ENV_ARG_PARAMETER); + RepositoryManagerDaemon.in ()); } if (!retval) @@ -272,15 +266,13 @@ Worker::Worker (CORBA::ORB_ptr orb) int Worker::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { this->orb_->run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; return 0; } diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp index 3e1aa25f63d..91aa4e47460 100644 --- a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp +++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp @@ -220,7 +220,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage ( if (this->names_.find (ACE_CString (installationName), entry) == 0) { if (!replace) - ACE_THROW (Deployment::NameExists ()); + throw Deployment::NameExists (); else deletePackage (installationName); } @@ -258,14 +258,14 @@ void CIAO_RepositoryManagerDaemon_i::installPackage ( if (!HTTP_Get (location, *mb)) { mb->release (); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } // Write file to designated location on disk if (!RM_Helper::write_to_disk (package_path.c_str (), *mb)) { mb->release (); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } mb->release (); @@ -273,7 +273,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage ( else { if (!RM_Helper::copy_from_disk_to_disk (location, package_path.c_str ())) - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } @@ -296,7 +296,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage ( //remove the package remove (package_path.c_str ()); - ACE_THROW (Deployment::PackageError ()); + throw Deployment::PackageError (); } //TODO: move exception throwing out of this func. User boolean error handling!!! @@ -313,7 +313,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage ( //remove the package remove (package_path.c_str ()); - ACE_THROW (Deployment::NameExists ()); + throw Deployment::NameExists (); } //forming the server path info @@ -328,7 +328,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage ( //remove the package remove (package_path.c_str ()); - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw CORBA::NO_IMPLEMENT (); } PC_Updater updater (server_path, package_path); @@ -341,7 +341,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage ( remove_extracted_package (package_path.c_str (), path.c_str ()); //remove the package remove (package_path.c_str ()); - ACE_THROW (Deployment::PackageError ()); + throw Deployment::PackageError (); } @@ -365,7 +365,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage ( remove (pc_path.c_str ()); //throw exception - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } //ALSO NEED THE UUID here @@ -386,7 +386,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage ( remove (pc_path.c_str ()); //throw exception - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } //now add the type interface @@ -425,19 +425,19 @@ void CIAO_RepositoryManagerDaemon_i::createPackage ( if (this->names_.find (ACE_CString (installationName), entry) == 0) { if (!replace) - ACE_THROW (Deployment::NameExists ()); + throw Deployment::NameExists (); else deletePackage (installationName); } // Find if there is a PackageConfiguration with the same uuid. if (this->uuids_.find (ACE_CString (pc.UUID), entry) == 0) - ACE_THROW (Deployment::NameExists ()); + throw Deployment::NameExists (); // Find if the PackageConfiguration has a basePackage. // NOTE: ComponentPackageReferences are currently NOT supported. if (!(pc.basePackage.length () > 0)) - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw CORBA::NO_IMPLEMENT (); // Form the path for the local file ACE_CString path (this->install_root_); @@ -461,14 +461,14 @@ void CIAO_RepositoryManagerDaemon_i::createPackage ( if (!HTTP_Get (baseLocation, *mb)) { mb->release (); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } // Write file to designated location on disk if (!RM_Helper::write_to_disk (package_path.c_str (), *mb)) { mb->release (); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } mb->release (); @@ -476,7 +476,7 @@ void CIAO_RepositoryManagerDaemon_i::createPackage ( else { if (!RM_Helper::copy_from_disk_to_disk (baseLocation, package_path.c_str ())) - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } @@ -499,7 +499,7 @@ void CIAO_RepositoryManagerDaemon_i::createPackage ( remove_extracted_package (package_path.c_str (), path.c_str ()); //remove the package remove (package_path.c_str ()); - ACE_THROW (Deployment::PackageError ()); + throw Deployment::PackageError (); } // Externalize the PackageConfiguration, so that we can access it later on @@ -522,7 +522,7 @@ void CIAO_RepositoryManagerDaemon_i::createPackage ( remove (pc_path.c_str ()); //throw exception - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } // Insert the UUID of the package. @@ -543,7 +543,7 @@ void CIAO_RepositoryManagerDaemon_i::createPackage ( remove (pc_path.c_str ()); //throw exception - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } //now add the type interface @@ -578,7 +578,7 @@ CIAO_RepositoryManagerDaemon_i::findPackageByName (const char * name) PCEntry *entry = 0; if (this->names_.find (ACE_CString (name), entry) != 0) - ACE_THROW (Deployment::NoSuchName ()); + throw Deployment::NoSuchName (); //PackageConfiguration was not found ACE_CString pc_path (entry->int_id_.c_str ()); @@ -618,7 +618,7 @@ CIAO_RepositoryManagerDaemon_i::findPackageByUUID (const char * UUID) PCEntry *entry = 0; if (this->uuids_.find (ACE_CString (UUID), entry) != 0) - ACE_THROW (Deployment::NoSuchName ()); + throw Deployment::NoSuchName (); //PackageConfiguration was not found ACE_CString pc_path (entry->int_id_.c_str ()); @@ -800,7 +800,7 @@ void CIAO_RepositoryManagerDaemon_i::deletePackage ( PCEntry *entry = 0; if (this->names_.find (ACE_CString (installationName), entry) != 0) - ACE_THROW (Deployment::NoSuchName ()); + throw Deployment::NoSuchName (); //cache the package path ACE_CString path (entry->int_id_.c_str ()); @@ -859,7 +859,7 @@ void CIAO_RepositoryManagerDaemon_i::deletePackage ( this->dump (); if (internal_err) - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); else ACE_DEBUG ((LM_INFO, "Successfully deleted \'%s\'\n", installationName)); @@ -890,26 +890,25 @@ CIAO_RepositoryManagerDaemon_i::retrieve_PC_from_package (char* package) ACE_OS::chdir (this->cwd_); ACE_ERROR ((LM_ERROR, "(%P|%t) RepositoryManager: error extracting necessary files\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } Deployment::PackageConfiguration_var pc; //parse the PCD to make sure that there are no package errors - ACE_TRY + try { //CIAO::Config_Handlers::STD_PC_Intf intf (pcd_name.c_str ()); //pc = intf.get_PC (); } - ACE_CATCHALL + catch (...) { ACE_ERROR ((LM_ERROR, "(%P|%t) RepositoryManager: Error parsing the PCD\n")); //change back the the old working dir ACE_OS::chdir (this->cwd_); - ACE_THROW (Deployment::PackageError ()); + throw Deployment::PackageError (); } - ACE_ENDTRY; //able to parse the PC. So lets install the package in the repo //we no longer need the descriptors, so lets erase them! @@ -973,20 +972,19 @@ CIAO_RepositoryManagerDaemon_i::retrieve_PC_from_descriptors (const char* pc_nam Deployment::PackageConfiguration_var pc = new Deployment::PackageConfiguration (); //parse the PCD to make sure that there are no package errors - ACE_TRY + try { CIAO::Config_Handlers::Packaging::PCD_Handler::package_config (pc_name, *pc); } - ACE_CATCHALL + catch (...) { ACE_ERROR ((LM_ERROR, "(%P|%t) [RM::retrieve_PC_from_descriptors] Error parsing the PCD\n")); //change back the the old working dir ACE_OS::chdir (this->cwd_); - ACE_THROW (Deployment::PackageError ()); + throw Deployment::PackageError (); } - ACE_ENDTRY; //able to parse the PC. So lets install the package in the repo //change back the the old working dir diff --git a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp index b2499812711..caa7e0a0f61 100644 --- a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp +++ b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp @@ -117,7 +117,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_OS::fprintf (fp, "\t\tconst char*\n"); ACE_OS::fprintf (fp, - "\t\tACE_ENV_ARG_DECL_WITH_DEFAULTS);\n"); + "\t\t);\n"); } } diff --git a/CIAO/DAnCE/TargetManager/DomainDataManager.cpp b/CIAO/DAnCE/TargetManager/DomainDataManager.cpp index 07667fb785c..da7f59a3b86 100644 --- a/CIAO/DAnCE/TargetManager/DomainDataManager.cpp +++ b/CIAO/DAnCE/TargetManager/DomainDataManager.cpp @@ -220,8 +220,8 @@ int CIAO::DomainDataManager::call_all_node_managers () catch (CORBA::Exception& ex) { ACE_DEBUG ((LM_DEBUG , "TM::Error in calling Join Domain==\n")); - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in " - "DomainDataManager::joinDomain"); + ex._tao_print_exception ( + "Exception caught in ""DomainDataManager::joinDomain"); } } } @@ -579,8 +579,8 @@ void CIAO::DomainDataManager::stop_monitors () catch (CORBA::Exception& ex) { ACE_DEBUG ((LM_DEBUG , "TM::Error in calling Leave Domain\n")); - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in " - "DomainDataManager::leaveDomain"); + ex._tao_print_exception ( + "Exception caught in ""DomainDataManager::leaveDomain"); } } } diff --git a/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp b/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp index 8850b22834f..a39446e7273 100644 --- a/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp +++ b/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp @@ -56,8 +56,7 @@ namespace CIDL_TargetManager_i // Operations from ::Deployment::TargetManager ::Deployment::Domain * - TargetManager_exec_i::getAllResources ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + TargetManager_exec_i::getAllResources () ACE_THROW_SPEC ((CORBA::SystemException)) { return CIAO::DomainDataManager:: @@ -65,8 +64,7 @@ namespace CIDL_TargetManager_i } ::Deployment::Domain * - TargetManager_exec_i::getAvailableResources ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + TargetManager_exec_i::getAvailableResources () ACE_THROW_SPEC ((CORBA::SystemException)) { return CIAO::DomainDataManager:: @@ -75,8 +73,7 @@ namespace CIDL_TargetManager_i void TargetManager_exec_i::commitResources ( - const ::Deployment::DeploymentPlan & plan - ACE_ENV_ARG_DECL_NOT_USED) + const ::Deployment::DeploymentPlan & plan) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Deployment::ResourceNotAvailable, @@ -88,8 +85,7 @@ namespace CIDL_TargetManager_i void TargetManager_exec_i::releaseResources ( - const ::Deployment::DeploymentPlan & plan - ACE_ENV_ARG_DECL_NOT_USED) + const ::Deployment::DeploymentPlan & plan) ACE_THROW_SPEC ((CORBA::SystemException)) { return CIAO::DomainDataManager:: @@ -100,8 +96,7 @@ namespace CIDL_TargetManager_i TargetManager_exec_i::updateDomain ( const ::CORBA::StringSeq & elements , const ::Deployment::Domain & domainSubset , - ::Deployment::DomainUpdateKind updateKind - ACE_ENV_ARG_DECL_NOT_USED) + ::Deployment::DomainUpdateKind updateKind) ACE_THROW_SPEC ((CORBA::SystemException)) { // Your code here. @@ -176,8 +171,7 @@ namespace CIDL_TargetManager_i ::CORBA::Long TargetManagerExt_exec_i::get_pid ( - const char * component_uuid - ACE_ENV_ARG_DECL_NOT_USED) + const char * component_uuid) ACE_THROW_SPEC ((CORBA::SystemException)) { // Your code here. @@ -187,8 +181,7 @@ namespace CIDL_TargetManager_i } ::CIAO::Host_Infos * - TargetManagerExt_exec_i::get_host_cpu ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + TargetManagerExt_exec_i::get_host_cpu () ACE_THROW_SPEC ((CORBA::SystemException)) { // Your code here. @@ -198,8 +191,7 @@ namespace CIDL_TargetManager_i } ::CIAO::Component_Infos * - TargetManagerExt_exec_i::get_component_cpu ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + TargetManagerExt_exec_i::get_component_cpu () ACE_THROW_SPEC ((CORBA::SystemException)) { // Your code here. @@ -212,7 +204,7 @@ namespace CIDL_TargetManager_i ::CIAO::Host_NodeManager_seq * TargetManagerExt_exec_i::get_all_node_managers - (void) + () ACE_THROW_SPEC ((CORBA::SystemException)) { return CIAO::DomainDataManager:: @@ -239,8 +231,7 @@ namespace CIDL_TargetManager_i // Port operations. ::Deployment::CCM_TargetManager_ptr - TargetManagerImpl_exec_i::get_targetMgr ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + TargetManagerImpl_exec_i::get_targetMgr () ACE_THROW_SPEC ((CORBA::SystemException)) { // Your code here. @@ -262,7 +253,6 @@ namespace CIDL_TargetManager_i ::CIAO::CCM_TargetManagerExt_ptr TargetManagerImpl_exec_i ::get_target_manager_ext ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (this->exec_ext_object_.in ())) @@ -277,26 +267,23 @@ namespace CIDL_TargetManager_i void TargetManagerImpl_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) { this->context_ = TargetManagerImpl_Context::_narrow ( - ctx - ACE_ENV_ARG_PARAMETER); + ctx); if (this->context_ == 0) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } void - TargetManagerImpl_exec_i::ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + TargetManagerImpl_exec_i::ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -305,8 +292,7 @@ namespace CIDL_TargetManager_i } void - TargetManagerImpl_exec_i::ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + TargetManagerImpl_exec_i::ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -316,8 +302,7 @@ namespace CIDL_TargetManager_i void - TargetManagerImpl_exec_i::ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + TargetManagerImpl_exec_i::ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -331,8 +316,7 @@ namespace CIDL_TargetManager_i } void - TargetManagerImpl_exec_i::ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + TargetManagerImpl_exec_i::ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -341,8 +325,7 @@ namespace CIDL_TargetManager_i } void - TargetManagerImpl_exec_i::ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + TargetManagerImpl_exec_i::ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -380,8 +363,7 @@ namespace CIDL_TargetManager_i // Implicit operations. ::Components::EnterpriseComponent_ptr - TargetManagerHome_exec_i::create ( - ACE_ENV_SINGLE_ARG_DECL) + TargetManagerHome_exec_i::create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/CIAO/DAnCE/TargetManager/TargetManager_exec.h b/CIAO/DAnCE/TargetManager/TargetManager_exec.h index 7c23c047992..fe419bdab8b 100644 --- a/CIAO/DAnCE/TargetManager/TargetManager_exec.h +++ b/CIAO/DAnCE/TargetManager/TargetManager_exec.h @@ -43,13 +43,11 @@ namespace CIDL_TargetManager_i // Port operations. virtual ::Deployment::CCM_TargetManager_ptr - get_targetMgr ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + get_targetMgr () ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::CIAO::CCM_TargetManagerExt_ptr get_target_manager_ext ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((::CORBA::SystemException)); @@ -57,43 +55,37 @@ namespace CIDL_TargetManager_i virtual void set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); @@ -120,23 +112,19 @@ namespace CIDL_TargetManager_i virtual ::CORBA::Long get_pid ( - const char * component_uuid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const char * component_uuid) ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::CIAO::Host_Infos * - get_host_cpu ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + get_host_cpu () ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::CIAO::Component_Infos * - get_component_cpu ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + get_component_cpu () ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::CIAO::Host_NodeManager_seq * - get_all_node_managers ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + get_all_node_managers () ACE_THROW_SPEC ((CORBA::SystemException)); }; @@ -154,19 +142,16 @@ namespace CIDL_TargetManager_i // Operations from ::Deployment::TargetManager virtual ::Deployment::Domain * - getAllResources ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + getAllResources () ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::Deployment::Domain * - getAvailableResources ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + getAvailableResources () ACE_THROW_SPEC ((CORBA::SystemException)); virtual void commitResources ( - const ::Deployment::DeploymentPlan & plan - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const ::Deployment::DeploymentPlan & plan) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Deployment::ResourceNotAvailable, @@ -174,16 +159,14 @@ namespace CIDL_TargetManager_i virtual void releaseResources ( - const ::Deployment::DeploymentPlan & argname - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const ::Deployment::DeploymentPlan & argname) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void updateDomain ( const ::CORBA::StringSeq & elements, const ::Deployment::Domain & domainSubset, - ::Deployment::DomainUpdateKind updateKind - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::Deployment::DomainUpdateKind updateKind) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -220,8 +203,7 @@ namespace CIDL_TargetManager_i // Implicit operations. virtual ::Components::EnterpriseComponent_ptr - create ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp index d67ff8f07b2..d1ff9b8f67e 100644 --- a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp +++ b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp @@ -52,7 +52,7 @@ main (int argc, char *argv[]) std::vector<NodeAppTest::NodeAppTest_RoundTrip_var> comp_list; //std::vector<NodeAppTest::NodeAppTest_RoundTrip_var>::const_iterator iter; - ACE_TRY_NEW_ENV + try { if (parse_args (argc, argv) != 0) return 1; @@ -61,16 +61,15 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "CompNum: %d\n",comp_num)); CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CIAO::Client_init (orb.in ()); CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Deployment::NodeApplication_var node_app = - Deployment::NodeApplication::_narrow (tmp.in () - ACE_ENV_ARG_PARAMETER); + Deployment::NodeApplication::_narrow (tmp.in ()); if (CORBA::is_nil (node_app.in ())) { @@ -188,7 +187,7 @@ main (int argc, char *argv[]) // Install test component and its home on NodeApplication Deployment::ComponentInfos_var comp_info = - node_app->install (node_info ACE_ENV_ARG_PARAMETER); + node_app->install (node_info); // store the component refs for (i = 0; i < comp_num; ++i) @@ -219,7 +218,7 @@ main (int argc, char *argv[]) CORBA::Long input = i; CORBA::Long output = - (comp_list[i])->cube_long (input ACE_ENV_ARG_PARAMETER); + (comp_list[i])->cube_long (input); if (input*input*input == output) { @@ -245,13 +244,11 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Test success!!\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp index 730f7d1aacb..0969c9ec055 100644 --- a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp +++ b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp @@ -37,10 +37,10 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; @@ -48,11 +48,10 @@ main (int argc, char *argv[]) CIAO::Client_init (orb.in ()); CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Deployment::NodeApplication_var node_app = - Deployment::NodeApplication::_narrow(tmp.in () - ACE_ENV_ARG_PARAMETER); + Deployment::NodeApplication::_narrow(tmp.in ()); if (CORBA::is_nil (node_app.in ())) { @@ -93,7 +92,7 @@ main (int argc, char *argv[]) // Install test component and its home on NodeApplication Deployment::ComponentInfos_var comp_info = - node_app->install (node_info ACE_ENV_ARG_PARAMETER); + node_app->install (node_info); assert (comp_info->length () == 1); //return 1 component objeref @@ -101,8 +100,7 @@ main (int argc, char *argv[]) Components::CCMObject_var objref = (comp_info[i]).component_ref; NodeAppTest::NodeAppTest_RoundTrip_var roundtrip_var = - NodeAppTest::NodeAppTest_RoundTrip::_narrow (objref.in () - ACE_ENV_ARG_PARAMETER); + NodeAppTest::NodeAppTest_RoundTrip::_narrow (objref.in ()); if (CORBA::is_nil (roundtrip_var.in ())) { @@ -115,7 +113,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Try cube_long operation on the Interface \n")); CORBA::Long input = 1L; CORBA::Long output = - roundtrip_var->cube_long (input ACE_ENV_ARG_PARAMETER); + roundtrip_var->cube_long (input); if (input == output) ACE_DEBUG ((LM_DEBUG, "Retrun values matched!!\n")); @@ -132,7 +130,7 @@ main (int argc, char *argv[]) (node_info.impl_infos[0]).impl_infos[0].component_instance_name = CORBA::string_dup ("NodeAppTest_RoundTrip_2"); Deployment::ComponentInfos_var comp_info_new = - node_app->install (node_info ACE_ENV_ARG_PARAMETER); + node_app->install (node_info); assert (comp_info_new->length () == 1); //return 1 component objeref @@ -147,13 +145,11 @@ main (int argc, char *argv[]) orb->destroy (); ACE_DEBUG ((LM_DEBUG, "=====Test success!!\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp index 2ea00fd332d..484e854113d 100644 --- a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp +++ b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp @@ -37,10 +37,10 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; @@ -48,11 +48,10 @@ main (int argc, char *argv[]) CIAO::Client_init (orb.in ()); CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Deployment::NodeApplication_var node_app = - Deployment::NodeApplication::_narrow(tmp.in () - ACE_ENV_ARG_PARAMETER); + Deployment::NodeApplication::_narrow(tmp.in ()); if (CORBA::is_nil (node_app.in ())) { @@ -93,7 +92,7 @@ main (int argc, char *argv[]) // Install test component and its home on NodeApplication Deployment::ComponentInfos_var comp_info = - node_app->install (node_info ACE_ENV_ARG_PARAMETER); + node_app->install (node_info); assert (comp_info->length () == 1); //return 1 component objeref @@ -101,8 +100,7 @@ main (int argc, char *argv[]) Components::CCMObject_var objref = (comp_info[i]).component_ref; NodeAppTest::NodeAppTest_RoundTrip_var roundtrip_var = - NodeAppTest::NodeAppTest_RoundTrip::_narrow (objref.in () - ACE_ENV_ARG_PARAMETER); + NodeAppTest::NodeAppTest_RoundTrip::_narrow (objref.in ()); if (CORBA::is_nil (roundtrip_var.in ())) { @@ -143,7 +141,7 @@ main (int argc, char *argv[]) CORBA::Long input = 1L; CORBA::Long output = - latency_var->cube_long (input ACE_ENV_ARG_PARAMETER); + latency_var->cube_long (input); if (input == output) ACE_DEBUG ((LM_DEBUG, "Retrun values matched!!\n")); @@ -161,13 +159,11 @@ main (int argc, char *argv[]) orb->destroy (); ACE_DEBUG ((LM_DEBUG, "Test success!!\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp index 8b3ea400a89..d239a8db5c5 100644 --- a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp +++ b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp @@ -37,10 +37,10 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; @@ -48,11 +48,10 @@ main (int argc, char *argv[]) CIAO::Client_init (orb.in ()); CORBA::Object_var tmp = - orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(ior); Deployment::NodeApplication_var node_app = - Deployment::NodeApplication::_narrow(tmp.in () - ACE_ENV_ARG_PARAMETER); + Deployment::NodeApplication::_narrow(tmp.in ()); if (CORBA::is_nil (node_app.in ())) { @@ -93,7 +92,7 @@ main (int argc, char *argv[]) // Install test component and its home on NodeApplication Deployment::ComponentInfos_var comp_info = - node_app->install (node_info ACE_ENV_ARG_PARAMETER); + node_app->install (node_info); assert (comp_info->length () == 1); //return 1 component objeref @@ -101,8 +100,7 @@ main (int argc, char *argv[]) Components::CCMObject_var objref = (comp_info[i]).component_ref; NodeAppTest::NodeAppTest_RoundTrip_var roundtrip_var = - NodeAppTest::NodeAppTest_RoundTrip::_narrow (objref.in () - ACE_ENV_ARG_PARAMETER); + NodeAppTest::NodeAppTest_RoundTrip::_narrow (objref.in ()); if (CORBA::is_nil (roundtrip_var.in ())) { @@ -115,7 +113,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Try cube_long operation on the Interface \n")); CORBA::Long input = 1L; CORBA::Long output = - roundtrip_var->cube_long (input ACE_ENV_ARG_PARAMETER); + roundtrip_var->cube_long (input); if (input == output) ACE_DEBUG ((LM_DEBUG, "Retrun values matched!!\n")); @@ -132,13 +130,11 @@ main (int argc, char *argv[]) orb->destroy (); ACE_DEBUG ((LM_DEBUG, "Test success!!\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp index 5ca3706b72c..8cbd9270bd0 100644 --- a/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp +++ b/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp @@ -20,24 +20,21 @@ namespace CIDL_RoundTrip_Impl } NodeAppTest::CCM_LatencyTest_ptr - RoundTrip_exec_i::get_facet_1 ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + RoundTrip_exec_i::get_facet_1 () ACE_THROW_SPEC ((CORBA::SystemException)) { return new LatencyTest_Impl; } NodeAppTest::CCM_LatencyTest_ptr - RoundTrip_exec_i::get_facet_2 ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + RoundTrip_exec_i::get_facet_2 () ACE_THROW_SPEC ((CORBA::SystemException)) { return new LatencyTest_Impl; } CORBA::Long - RoundTrip_exec_i::cube_long (CORBA::Long data - ACE_ENV_ARG_DECL_NOT_USED) + RoundTrip_exec_i::cube_long (CORBA::Long data) ACE_THROW_SPEC ((CORBA::SystemException)) { return data * data * data; @@ -45,8 +42,7 @@ namespace CIDL_RoundTrip_Impl // Operations from Components::SessionComponent void - RoundTrip_exec_i::set_session_context (Components::SessionContext_ptr - ACE_ENV_ARG_DECL_NOT_USED) + RoundTrip_exec_i::set_session_context (Components::SessionContext_ptr) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -58,7 +54,7 @@ namespace CIDL_RoundTrip_Impl } void - RoundTrip_exec_i::ccm_activate (void) + RoundTrip_exec_i::ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -70,7 +66,7 @@ namespace CIDL_RoundTrip_Impl } void - RoundTrip_exec_i::ccm_passivate (void) + RoundTrip_exec_i::ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -81,7 +77,7 @@ namespace CIDL_RoundTrip_Impl } void - RoundTrip_exec_i::ccm_remove (void) + RoundTrip_exec_i::ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -92,7 +88,7 @@ namespace CIDL_RoundTrip_Impl } void - RoundTrip_exec_i::ciao_preactivate (void) + RoundTrip_exec_i::ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -104,7 +100,7 @@ namespace CIDL_RoundTrip_Impl } void - RoundTrip_exec_i::ciao_postactivate (void) + RoundTrip_exec_i::ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -123,7 +119,7 @@ namespace CIDL_RoundTrip_Impl } ::Components::EnterpriseComponent_ptr - RoundTripHome_exec_i::create (void) + RoundTripHome_exec_i::create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -132,8 +128,7 @@ namespace CIDL_RoundTrip_Impl // Implementation for the probided inferface. CORBA::Long - LatencyTest_Impl::cube_long (CORBA::Long data - ACE_ENV_ARG_DECL_NOT_USED) + LatencyTest_Impl::cube_long (CORBA::Long data) ACE_THROW_SPEC ((CORBA::SystemException)) { return data*data*data; diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h b/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h index e2fe68279be..2df0ce868c8 100644 --- a/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h +++ b/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h @@ -38,40 +38,38 @@ namespace CIDL_RoundTrip_Impl RoundTrip_exec_i (); /// Operation to test the data - virtual CORBA::Long cube_long (CORBA::Long data - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Long cube_long (CORBA::Long data) ACE_THROW_SPEC ((CORBA::SystemException)); /* virtual ::NodeAppTest::CCM_LatencyTest* - get_latency (void) + get_latency () ACE_THROW_SPEC ((CORBA::SystemException)); */ NodeAppTest::CCM_LatencyTest_ptr - get_facet_1(void) + get_facet_1() ACE_THROW_SPEC ((CORBA::SystemException)); NodeAppTest::CCM_LatencyTest_ptr - get_facet_2(void) + get_facet_2() ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent - virtual void set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_activate (void) + virtual void ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_passivate (void) + virtual void ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_remove (void) + virtual void ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); @@ -79,11 +77,11 @@ namespace CIDL_RoundTrip_Impl void pulse (void); // CIAO defined methods - virtual void ciao_preactivate (void) + virtual void ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ciao_postactivate (void) + virtual void ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); @@ -109,8 +107,7 @@ namespace CIDL_RoundTrip_Impl { } - virtual CORBA::Long cube_long (CORBA::Long data - ACE_ENV_ARG_DECL) + virtual CORBA::Long cube_long (CORBA::Long data) ACE_THROW_SPEC ((CORBA::SystemException)); }; @@ -130,7 +127,7 @@ namespace CIDL_RoundTrip_Impl // Implicit home operations. virtual ::Components::EnterpriseComponent_ptr - create (void) + create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); diff --git a/CIAO/RACE/Controller/Component/Controller_exec.cpp b/CIAO/RACE/Controller/Component/Controller_exec.cpp index ee97899b0cf..1606e03a867 100644 --- a/CIAO/RACE/Controller/Component/Controller_exec.cpp +++ b/CIAO/RACE/Controller/Component/Controller_exec.cpp @@ -18,20 +18,19 @@ namespace CIAO // Supported operations. void - Controller_exec_i::start (void) + Controller_exec_i::start () ACE_THROW_SPEC ((::CORBA::SystemException)) {} void - Controller_exec_i::stop (void) + Controller_exec_i::stop () ACE_THROW_SPEC ((::CORBA::SystemException)) {} // Attribute operations. ::CORBA::Double - Controller_exec_i::sampling_period ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Controller_exec_i::sampling_period () ACE_THROW_SPEC ((CORBA::SystemException)) { // Your code here. @@ -44,26 +43,23 @@ namespace CIAO void Controller_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) { this->context_ = Controller_Context::_narrow ( - ctx - ACE_ENV_ARG_PARAMETER); + ctx); if (this->context_ == 0) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } void - Controller_exec_i::ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Controller_exec_i::ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -72,8 +68,7 @@ namespace CIAO } void - Controller_exec_i::ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Controller_exec_i::ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -82,8 +77,7 @@ namespace CIAO } void - Controller_exec_i::ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Controller_exec_i::ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -92,8 +86,7 @@ namespace CIAO } void - Controller_exec_i::ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Controller_exec_i::ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -102,8 +95,7 @@ namespace CIAO } void - Controller_exec_i::ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Controller_exec_i::ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -134,8 +126,7 @@ namespace CIAO // Implicit operations. ::Components::EnterpriseComponent_ptr - Controller_Home_exec_i::create ( - ACE_ENV_SINGLE_ARG_DECL) + Controller_Home_exec_i::create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/CIAO/RACE/Controller/Component/Controller_exec.h b/CIAO/RACE/Controller/Component/Controller_exec.h index 7cd230246eb..def356fef65 100644 --- a/CIAO/RACE/Controller/Component/Controller_exec.h +++ b/CIAO/RACE/Controller/Component/Controller_exec.h @@ -28,16 +28,15 @@ namespace CIAO virtual ~Controller_exec_i (void); // Supported operations. - virtual void start (void) + virtual void start () ACE_THROW_SPEC ((::CORBA::SystemException)); - virtual void stop (void) + virtual void stop () ACE_THROW_SPEC ((::CORBA::SystemException)); // Attribute operations. virtual ::CORBA::Double - sampling_period ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + sampling_period () ACE_THROW_SPEC ((CORBA::SystemException)); // Port operations. @@ -46,43 +45,37 @@ namespace CIAO virtual void set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); @@ -110,8 +103,7 @@ namespace CIAO // Implicit operations. virtual ::Components::EnterpriseComponent_ptr - create ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); diff --git a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.cpp b/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.cpp index 4c201339d55..9d1603361ab 100644 --- a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.cpp +++ b/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.cpp @@ -49,26 +49,23 @@ namespace CIAO void Interactive_Input_Adapter_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) { this->context_ = Interactive_Input_Adapter_Context::_narrow ( - ctx - ACE_ENV_ARG_PARAMETER); + ctx); if (this->context_ == 0) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } void - Interactive_Input_Adapter_exec_i::ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Interactive_Input_Adapter_exec_i::ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -77,8 +74,7 @@ namespace CIAO } void - Interactive_Input_Adapter_exec_i::ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Interactive_Input_Adapter_exec_i::ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -87,8 +83,7 @@ namespace CIAO } void - Interactive_Input_Adapter_exec_i::ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Interactive_Input_Adapter_exec_i::ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -97,8 +92,7 @@ namespace CIAO } void - Interactive_Input_Adapter_exec_i::ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Interactive_Input_Adapter_exec_i::ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -107,8 +101,7 @@ namespace CIAO } void - Interactive_Input_Adapter_exec_i::ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Interactive_Input_Adapter_exec_i::ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -139,8 +132,7 @@ namespace CIAO // Implicit operations. ::Components::EnterpriseComponent_ptr - Interactive_Input_Adapter_Home_exec_i::create ( - ACE_ENV_SINGLE_ARG_DECL) + Interactive_Input_Adapter_Home_exec_i::create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.h b/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.h index d272dbb5865..d16fbb76110 100644 --- a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.h +++ b/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.h @@ -56,43 +56,37 @@ namespace CIAO virtual void set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); @@ -120,8 +114,7 @@ namespace CIAO // Implicit operations. virtual ::Components::EnterpriseComponent_ptr - create ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); diff --git a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp b/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp index c06e6460e03..4318902bc32 100644 --- a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp +++ b/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp @@ -42,8 +42,7 @@ namespace CIAO void LocationUpdater_exec_i::push_deployment ( - ::CIAO::RACE::Deploy_Input * ev - ACE_ENV_ARG_DECL_NOT_USED) + ::CIAO::RACE::Deploy_Input * ev) ACE_THROW_SPEC ((CORBA::SystemException)) { bool plan_exists = false; @@ -103,7 +102,7 @@ namespace CIAO ACE_ERROR ((LM_ERROR, "Unable to acquire RepositoryManagerDaemon's objref\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } //now obtian the corresponding PackageConfiguration from @@ -126,7 +125,7 @@ namespace CIAO ACE_ERROR ((LM_ERROR, "Error! Package not found! Location update failed!\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } catch (CORBA::Exception &) @@ -134,7 +133,7 @@ namespace CIAO ACE_ERROR ((LM_ERROR, "Error! General exception! Location update failed!\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } //now update the plan @@ -196,26 +195,23 @@ namespace CIAO void LocationUpdater_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) { this->context_ = LocationUpdater_Context::_narrow ( - ctx - ACE_ENV_ARG_PARAMETER); + ctx); if (this->context_ == 0) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } void - LocationUpdater_exec_i::ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + LocationUpdater_exec_i::ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -224,8 +220,7 @@ namespace CIAO } void - LocationUpdater_exec_i::ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + LocationUpdater_exec_i::ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -234,8 +229,7 @@ namespace CIAO } void - LocationUpdater_exec_i::ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + LocationUpdater_exec_i::ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -244,8 +238,7 @@ namespace CIAO } void - LocationUpdater_exec_i::ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + LocationUpdater_exec_i::ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -254,8 +247,7 @@ namespace CIAO } void - LocationUpdater_exec_i::ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + LocationUpdater_exec_i::ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -286,8 +278,7 @@ namespace CIAO // Implicit operations. ::Components::EnterpriseComponent_ptr - LocationUpdater_Home_exec_i::create ( - ACE_ENV_SINGLE_ARG_DECL) + LocationUpdater_Home_exec_i::create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.h b/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.h index 14649ef550c..e3eb2f92fb2 100644 --- a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.h +++ b/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.h @@ -38,51 +38,44 @@ namespace CIAO virtual void push_deployment ( - ::CIAO::RACE::Deploy_Input *ev - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::CIAO::RACE::Deploy_Input *ev) ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent virtual void set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); @@ -110,8 +103,7 @@ namespace CIAO // Implicit operations. virtual ::Components::EnterpriseComponent_ptr - create ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); diff --git a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.cpp b/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.cpp index acd59314845..dd78aafb8b5 100644 --- a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.cpp +++ b/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.cpp @@ -42,8 +42,7 @@ namespace CIAO void PlanGenerator_exec_i::push_deployment ( - ::CIAO::RACE::Deploy_Input * ev - ACE_ENV_ARG_DECL_NOT_USED) + ::CIAO::RACE::Deploy_Input * ev) ACE_THROW_SPEC ((CORBA::SystemException)) { try @@ -72,7 +71,7 @@ namespace CIAO ACE_ERROR ((LM_ERROR, "Unable to acquire RepositoryManagerDaemon's objref\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } //now obtian the corresponding PackageConfiguration from @@ -95,7 +94,7 @@ namespace CIAO ACE_ERROR ((LM_ERROR, "Error! Package not found! Location update failed!\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } catch (CORBA::Exception &) @@ -103,7 +102,7 @@ namespace CIAO ACE_ERROR ((LM_ERROR, "Error! General exception! Location update failed!\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } //now create the plan @@ -149,26 +148,23 @@ namespace CIAO void PlanGenerator_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) { this->context_ = PlanGenerator_Context::_narrow ( - ctx - ACE_ENV_ARG_PARAMETER); + ctx); if (this->context_ == 0) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } void - PlanGenerator_exec_i::ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + PlanGenerator_exec_i::ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -177,8 +173,7 @@ namespace CIAO } void - PlanGenerator_exec_i::ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + PlanGenerator_exec_i::ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -187,8 +182,7 @@ namespace CIAO } void - PlanGenerator_exec_i::ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + PlanGenerator_exec_i::ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -197,8 +191,7 @@ namespace CIAO } void - PlanGenerator_exec_i::ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + PlanGenerator_exec_i::ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -207,8 +200,7 @@ namespace CIAO } void - PlanGenerator_exec_i::ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + PlanGenerator_exec_i::ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -239,8 +231,7 @@ namespace CIAO // Implicit operations. ::Components::EnterpriseComponent_ptr - PlanGenerator_Home_exec_i::create ( - ACE_ENV_SINGLE_ARG_DECL) + PlanGenerator_Home_exec_i::create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.h b/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.h index e72e0329e5b..76fd200c58b 100644 --- a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.h +++ b/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.h @@ -38,51 +38,44 @@ namespace CIAO virtual void push_deployment ( - ::CIAO::RACE::Deploy_Input *ev - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::CIAO::RACE::Deploy_Input *ev) ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent virtual void set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); @@ -110,8 +103,7 @@ namespace CIAO // Implicit operations. virtual ::Components::EnterpriseComponent_ptr - create ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); diff --git a/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp b/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp index 9369e885702..26288a3b96c 100644 --- a/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp +++ b/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp @@ -43,8 +43,7 @@ namespace CIAO ::CORBA::Boolean PlanEgress_exec_i::output_plan ( - const ::Deployment::DeploymentPlan & /* plan */ - ACE_ENV_ARG_DECL_NOT_USED) + const ::Deployment::DeploymentPlan & /* plan */) ACE_THROW_SPEC ((CORBA::SystemException)) { // Your code here. @@ -70,8 +69,7 @@ namespace CIAO // Port operations. ::CIAO::RACE::CCM_PlanEgress_ptr - XML_Output_Adapter_exec_i::get_plan_egress ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + XML_Output_Adapter_exec_i::get_plan_egress () ACE_THROW_SPEC ((CORBA::SystemException)) { // Your code here. @@ -82,26 +80,23 @@ namespace CIAO void XML_Output_Adapter_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) { this->context_ = XML_Output_Adapter_Context::_narrow ( - ctx - ACE_ENV_ARG_PARAMETER); + ctx); if (this->context_ == 0) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } void - XML_Output_Adapter_exec_i::ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + XML_Output_Adapter_exec_i::ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -110,8 +105,7 @@ namespace CIAO } void - XML_Output_Adapter_exec_i::ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + XML_Output_Adapter_exec_i::ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -120,8 +114,7 @@ namespace CIAO } void - XML_Output_Adapter_exec_i::ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + XML_Output_Adapter_exec_i::ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -130,8 +123,7 @@ namespace CIAO } void - XML_Output_Adapter_exec_i::ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + XML_Output_Adapter_exec_i::ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -140,8 +132,7 @@ namespace CIAO } void - XML_Output_Adapter_exec_i::ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + XML_Output_Adapter_exec_i::ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -172,8 +163,7 @@ namespace CIAO // Implicit operations. ::Components::EnterpriseComponent_ptr - XML_Output_Adapter_Home_exec_i::create ( - ACE_ENV_SINGLE_ARG_DECL) + XML_Output_Adapter_Home_exec_i::create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h b/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h index 5f91f85fd0c..2dc45207a3e 100644 --- a/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h +++ b/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h @@ -50,8 +50,7 @@ namespace CIAO virtual ::CORBA::Boolean output_plan ( - const ::Deployment::DeploymentPlan & plan - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const ::Deployment::DeploymentPlan & plan) ACE_THROW_SPEC ((CORBA::SystemException)); }; @@ -70,51 +69,44 @@ namespace CIAO // Port operations. virtual ::CIAO::RACE::CCM_PlanEgress_ptr - get_plan_egress ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + get_plan_egress () ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent virtual void set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); @@ -142,8 +134,7 @@ namespace CIAO // Implicit operations. virtual ::Components::EnterpriseComponent_ptr - create ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); diff --git a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.cpp b/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.cpp index fba135ec9a9..09e976afbbe 100644 --- a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.cpp +++ b/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.cpp @@ -43,8 +43,7 @@ namespace CIAO void PlanIngress_exec_i::analyze_plan ( - const ::Deployment::DeploymentPlan & /* plan */ - ACE_ENV_ARG_DECL_NOT_USED) + const ::Deployment::DeploymentPlan & /* plan */) ACE_THROW_SPEC ((CORBA::SystemException)) { // Your code here. @@ -67,8 +66,7 @@ namespace CIAO // Attribute operations. ::CIAO::RACE::RACE_Classifications * - Plan_Analyzer_exec_i::classes ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Plan_Analyzer_exec_i::classes () ACE_THROW_SPEC ((CORBA::SystemException)) { // Your code here. @@ -78,8 +76,7 @@ namespace CIAO // Port operations. ::CIAO::RACE::CCM_PlanIngress_ptr - Plan_Analyzer_exec_i::get_plan_ingress ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Plan_Analyzer_exec_i::get_plan_ingress () ACE_THROW_SPEC ((CORBA::SystemException)) { // Your code here. @@ -90,26 +87,23 @@ namespace CIAO void Plan_Analyzer_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) { this->context_ = Plan_Analyzer_Context::_narrow ( - ctx - ACE_ENV_ARG_PARAMETER); + ctx); if (this->context_ == 0) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } void - Plan_Analyzer_exec_i::ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Plan_Analyzer_exec_i::ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -118,8 +112,7 @@ namespace CIAO } void - Plan_Analyzer_exec_i::ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Plan_Analyzer_exec_i::ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -128,8 +121,7 @@ namespace CIAO } void - Plan_Analyzer_exec_i::ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Plan_Analyzer_exec_i::ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -138,8 +130,7 @@ namespace CIAO } void - Plan_Analyzer_exec_i::ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Plan_Analyzer_exec_i::ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -148,8 +139,7 @@ namespace CIAO } void - Plan_Analyzer_exec_i::ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Plan_Analyzer_exec_i::ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -180,8 +170,7 @@ namespace CIAO // Implicit operations. ::Components::EnterpriseComponent_ptr - Plan_Analyzer_Home_exec_i::create ( - ACE_ENV_SINGLE_ARG_DECL) + Plan_Analyzer_Home_exec_i::create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.h b/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.h index 39a77efb1f7..93318713481 100644 --- a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.h +++ b/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.h @@ -50,8 +50,7 @@ namespace CIAO virtual void analyze_plan ( - const ::Deployment::DeploymentPlan & plan - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const ::Deployment::DeploymentPlan & plan) ACE_THROW_SPEC ((CORBA::SystemException)); }; @@ -68,58 +67,50 @@ namespace CIAO // Attribute operations. virtual ::CIAO::RACE::RACE_Classifications * - classes ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + classes () ACE_THROW_SPEC ((CORBA::SystemException)); // Port operations. virtual ::CIAO::RACE::CCM_PlanIngress_ptr - get_plan_ingress ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + get_plan_ingress () ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent virtual void set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); @@ -147,8 +138,7 @@ namespace CIAO // Implicit operations. virtual ::Components::EnterpriseComponent_ptr - create ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); diff --git a/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.cpp b/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.cpp index d8cebb94e01..a149a785ce6 100644 --- a/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.cpp +++ b/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.cpp @@ -44,8 +44,7 @@ namespace CIAO void Planner_Manager_I_exec_i::execute_planners ( const ::Deployment::DeploymentPlan & /* plan */, - const ::CIAO::RACE::PlannerFlow & /* flow */ - ACE_ENV_ARG_DECL_NOT_USED) + const ::CIAO::RACE::PlannerFlow & /* flow */) ACE_THROW_SPEC ((CORBA::SystemException)) { // Your code here. @@ -68,8 +67,7 @@ namespace CIAO // Attribute operations. ::CIAO::RACE::RACE_Classifications * - Planner_Manager_exec_i::classes ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Planner_Manager_exec_i::classes () ACE_THROW_SPEC ((CORBA::SystemException)) { // Your code here. @@ -79,8 +77,7 @@ namespace CIAO // Port operations. ::CIAO::RACE::CCM_Planner_Manager_I_ptr - Planner_Manager_exec_i::get_planner_manager_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Planner_Manager_exec_i::get_planner_manager_i () ACE_THROW_SPEC ((CORBA::SystemException)) { // Your code here. @@ -91,26 +88,23 @@ namespace CIAO void Planner_Manager_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) { this->context_ = Planner_Manager_Context::_narrow ( - ctx - ACE_ENV_ARG_PARAMETER); + ctx); if (this->context_ == 0) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } void - Planner_Manager_exec_i::ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Planner_Manager_exec_i::ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -119,8 +113,7 @@ namespace CIAO } void - Planner_Manager_exec_i::ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Planner_Manager_exec_i::ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -129,8 +122,7 @@ namespace CIAO } void - Planner_Manager_exec_i::ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Planner_Manager_exec_i::ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -139,8 +131,7 @@ namespace CIAO } void - Planner_Manager_exec_i::ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Planner_Manager_exec_i::ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -149,8 +140,7 @@ namespace CIAO } void - Planner_Manager_exec_i::ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Planner_Manager_exec_i::ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -181,8 +171,7 @@ namespace CIAO // Implicit operations. ::Components::EnterpriseComponent_ptr - Planner_Manager_Home_exec_i::create ( - ACE_ENV_SINGLE_ARG_DECL) + Planner_Manager_Home_exec_i::create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.h b/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.h index f3688075017..1ca6114e850 100644 --- a/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.h +++ b/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.h @@ -51,8 +51,7 @@ namespace CIAO virtual void execute_planners ( const ::Deployment::DeploymentPlan & plan, - const ::CIAO::RACE::PlannerFlow & flow - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const ::CIAO::RACE::PlannerFlow & flow) ACE_THROW_SPEC ((CORBA::SystemException)); }; @@ -69,58 +68,50 @@ namespace CIAO // Attribute operations. virtual ::CIAO::RACE::RACE_Classifications * - classes ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + classes () ACE_THROW_SPEC ((CORBA::SystemException)); // Port operations. virtual ::CIAO::RACE::CCM_Planner_Manager_I_ptr - get_planner_manager_i ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + get_planner_manager_i () ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent virtual void set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); @@ -148,8 +139,7 @@ namespace CIAO // Implicit operations. virtual ::Components::EnterpriseComponent_ptr - create ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); diff --git a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.cpp b/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.cpp index 2cf81493b92..ad3370c4366 100644 --- a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.cpp +++ b/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.cpp @@ -43,8 +43,7 @@ namespace CIAO ::CORBA::Boolean Planner_I_exec_i::process_plan ( - ::Deployment::DeploymentPlan & /* plan */ - ACE_ENV_ARG_DECL_NOT_USED) + ::Deployment::DeploymentPlan & /* plan */) ACE_THROW_SPEC ((CORBA::SystemException)) { // Your code here. @@ -68,8 +67,7 @@ namespace CIAO // Attribute operations. char * - SimpleBinPacker_exec_i::name ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + SimpleBinPacker_exec_i::name () ACE_THROW_SPEC ((CORBA::SystemException)) { // Your code here. @@ -78,16 +76,14 @@ namespace CIAO void SimpleBinPacker_exec_i::name ( - const char * /* name */ - ACE_ENV_ARG_DECL_NOT_USED) + const char * /* name */) ACE_THROW_SPEC ((CORBA::SystemException)) { // Your code here. } char * - SimpleBinPacker_exec_i::type ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + SimpleBinPacker_exec_i::type () ACE_THROW_SPEC ((CORBA::SystemException)) { // Your code here. @@ -96,8 +92,7 @@ namespace CIAO void SimpleBinPacker_exec_i::type ( - const char * /* type */ - ACE_ENV_ARG_DECL_NOT_USED) + const char * /* type */) ACE_THROW_SPEC ((CORBA::SystemException)) { // Your code here. @@ -106,8 +101,7 @@ namespace CIAO // Port operations. ::CIAO::RACE::CCM_Planner_I_ptr - SimpleBinPacker_exec_i::get_planner_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + SimpleBinPacker_exec_i::get_planner_i () ACE_THROW_SPEC ((CORBA::SystemException)) { // Your code here. @@ -118,26 +112,23 @@ namespace CIAO void SimpleBinPacker_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) { this->context_ = SimpleBinPacker_Context::_narrow ( - ctx - ACE_ENV_ARG_PARAMETER); + ctx); if (this->context_ == 0) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } void - SimpleBinPacker_exec_i::ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + SimpleBinPacker_exec_i::ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -146,8 +137,7 @@ namespace CIAO } void - SimpleBinPacker_exec_i::ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + SimpleBinPacker_exec_i::ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -156,8 +146,7 @@ namespace CIAO } void - SimpleBinPacker_exec_i::ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + SimpleBinPacker_exec_i::ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -166,8 +155,7 @@ namespace CIAO } void - SimpleBinPacker_exec_i::ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + SimpleBinPacker_exec_i::ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -176,8 +164,7 @@ namespace CIAO } void - SimpleBinPacker_exec_i::ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + SimpleBinPacker_exec_i::ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -208,8 +195,7 @@ namespace CIAO // Implicit operations. ::Components::EnterpriseComponent_ptr - SimpleBinPacker_Home_exec_i::create ( - ACE_ENV_SINGLE_ARG_DECL) + SimpleBinPacker_Home_exec_i::create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.h b/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.h index f71cac2a844..b0b70703c79 100644 --- a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.h +++ b/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.h @@ -50,8 +50,7 @@ namespace CIAO virtual ::CORBA::Boolean process_plan ( - ::Deployment::DeploymentPlan & plan - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::Deployment::DeploymentPlan & plan) ACE_THROW_SPEC ((CORBA::SystemException)); }; @@ -68,75 +67,64 @@ namespace CIAO // Attribute operations. virtual char * - name ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + name () ACE_THROW_SPEC ((CORBA::SystemException)); virtual void name ( - const char * - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const char *) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * - type ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + type () ACE_THROW_SPEC ((CORBA::SystemException)); virtual void type ( - const char * - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const char *) ACE_THROW_SPEC ((CORBA::SystemException)); // Port operations. virtual ::CIAO::RACE::CCM_Planner_I_ptr - get_planner_i ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + get_planner_i () ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent virtual void set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); @@ -164,8 +152,7 @@ namespace CIAO // Implicit operations. virtual ::Components::EnterpriseComponent_ptr - create ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); diff --git a/CIAO/ciao/Container_Base.cpp b/CIAO/ciao/Container_Base.cpp index 22b208ffee2..63507fede32 100644 --- a/CIAO/ciao/Container_Base.cpp +++ b/CIAO/ciao/Container_Base.cpp @@ -88,8 +88,7 @@ namespace CIAO int Session_Container::init (const char *name, - const CORBA::PolicyList *more_policies - ACE_ENV_ARG_DECL) + const CORBA::PolicyList *more_policies) ACE_THROW_SPEC ((CORBA::SystemException)) { CIAO_TRACE ("Session_Container::init"); @@ -106,8 +105,7 @@ namespace CIAO } CORBA::Object_var poa_object = - this->orb_->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) { @@ -117,20 +115,17 @@ namespace CIAO } PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); this->create_component_POA (name, more_policies, - root_poa.in () - ACE_ENV_ARG_PARAMETER); + root_poa.in ()); ACE_CString port_poa_name (name); port_poa_name += ":Port_POA"; this->create_facet_consumer_POA (port_poa_name.c_str (), more_policies, - root_poa.in () - ACE_ENV_ARG_PARAMETER); + root_poa.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -143,8 +138,7 @@ namespace CIAO void Session_Container::create_component_POA (const char *name, const CORBA::PolicyList *p, - PortableServer::POA_ptr root - ACE_ENV_ARG_DECL) + PortableServer::POA_ptr root) { CIAO_TRACE ("Session_Container::create_component_POA"); @@ -166,16 +160,14 @@ namespace CIAO this->component_poa_ = root->create_POA (name, poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); } void Session_Container::create_facet_consumer_POA ( const char *name, const CORBA::PolicyList *p, - PortableServer::POA_ptr root - ACE_ENV_ARG_DECL) + PortableServer::POA_ptr root) { CIAO_TRACE ("Session_Container::create_facet_consumer_POA"); @@ -192,19 +184,16 @@ namespace CIAO policies.length (p_length + 3); policies[0] = - root->create_id_assignment_policy (PortableServer::USER_ID - ACE_ENV_ARG_PARAMETER); + root->create_id_assignment_policy (PortableServer::USER_ID); // Servant Manager Policy policies[1] = root->create_request_processing_policy - (PortableServer::USE_SERVANT_MANAGER - ACE_ENV_ARG_PARAMETER); + (PortableServer::USE_SERVANT_MANAGER); // Servant Retention Policy policies[2] = - root->create_servant_retention_policy (PortableServer::RETAIN - ACE_ENV_ARG_PARAMETER); + root->create_servant_retention_policy (PortableServer::RETAIN); for (CORBA::ULong i = 0; i < p_length; ++i) { @@ -214,8 +203,7 @@ namespace CIAO this->facet_cons_poa_ = root->create_POA (name, poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); ACE_NEW_THROW_EX (this->sa_, Servant_Activator (this->orb_.in ()), @@ -223,14 +211,12 @@ namespace CIAO this->facet_cons_poa_->set_servant_manager ( this->sa_ - ACE_ENV_ARG_PARAMETER ); } CORBA::Object_ptr Session_Container::install_servant (PortableServer::Servant p, - Container::OA_Type t - ACE_ENV_ARG_DECL) + Container::OA_Type t) ACE_THROW_SPEC ((CORBA::SystemException)) { CIAO_TRACE ("Session_Container::install_servant"); @@ -247,30 +233,25 @@ namespace CIAO } PortableServer::ObjectId_var oid = - tmp->activate_object (p - ACE_ENV_ARG_PARAMETER); + tmp->activate_object (p); CORBA::Object_var objref = - tmp->id_to_reference (oid.in () - ACE_ENV_ARG_PARAMETER); + tmp->id_to_reference (oid.in ()); return objref._retn (); } CORBA::Object_ptr Session_Container::install_component (PortableServer::Servant p, - PortableServer::ObjectId_out oid - ACE_ENV_ARG_DECL) + PortableServer::ObjectId_out oid) ACE_THROW_SPEC ((CORBA::SystemException)) { CIAO_TRACE ("Session_Container::install_component"); PortableServer::ObjectId_var id = - this->component_poa_->activate_object (p - ACE_ENV_ARG_PARAMETER); + this->component_poa_->activate_object (p); CORBA::Object_var objref = - this->component_poa_->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + this->component_poa_->id_to_reference (id.in ()); oid = id._retn (); @@ -288,8 +269,7 @@ namespace CIAO const char *exe_entrypt, const char *sv_dll_name, const char *sv_entrypt, - const char *ins_name - ACE_ENV_ARG_DECL) + const char *ins_name) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::UnknownImplId, Deployment::ImplEntryPointNotFound, @@ -470,8 +450,7 @@ namespace CIAO PortableServer::Servant home_servant = screator (home_executor.in (), this, - ins_name - ACE_ENV_ARG_PARAMETER); + ins_name); if (home_servant == 0) { @@ -486,32 +465,27 @@ namespace CIAO CORBA::Object_var objref = this->install_servant (home_servant, - Container::Component - ACE_ENV_ARG_PARAMETER); + Container::Component); Components::CCMHome_var homeref = - Components::CCMHome::_narrow (objref.in () - ACE_ENV_ARG_PARAMETER); + Components::CCMHome::_narrow (objref.in ()); return homeref._retn (); } void - Session_Container::ciao_uninstall_home (Components::CCMHome_ptr homeref - ACE_ENV_ARG_DECL) + Session_Container::ciao_uninstall_home (Components::CCMHome_ptr homeref) ACE_THROW_SPEC ((CORBA::SystemException)) { CIAO_TRACE ("Session_Container::ciao_uninstall_home"); this->uninstall (homeref, - Container::Component - ACE_ENV_ARG_PARAMETER); + Container::Component); } void Session_Container::uninstall (CORBA::Object_ptr objref, - Container::OA_Type t - ACE_ENV_ARG_DECL) + Container::OA_Type t) ACE_THROW_SPEC ((CORBA::SystemException)) { CIAO_TRACE ("Session_Container::uninstall"); @@ -528,17 +502,14 @@ namespace CIAO } PortableServer::ObjectId_var oid = - tmp->reference_to_id (objref - ACE_ENV_ARG_PARAMETER); + tmp->reference_to_id (objref); - tmp->deactivate_object (oid.in () - ACE_ENV_ARG_PARAMETER); + tmp->deactivate_object (oid.in ()); } void Session_Container::uninstall (PortableServer::Servant svt, - Container::OA_Type t - ACE_ENV_ARG_DECL) + Container::OA_Type t) ACE_THROW_SPEC ((CORBA::SystemException)) { CIAO_TRACE ("Session_Container::uninstall"); @@ -554,27 +525,22 @@ namespace CIAO } PortableServer::ObjectId_var oid - = tmp->servant_to_id (svt - ACE_ENV_ARG_PARAMETER); + = tmp->servant_to_id (svt); - tmp->deactivate_object (oid.in () - ACE_ENV_ARG_PARAMETER); + tmp->deactivate_object (oid.in ()); } void Session_Container::uninstall_component (Components::CCMObject_ptr objref, - PortableServer::ObjectId_out oid - ACE_ENV_ARG_DECL) + PortableServer::ObjectId_out oid) ACE_THROW_SPEC ((CORBA::SystemException)) { CIAO_TRACE ("Session_Container::uninstall_component"); PortableServer::ObjectId_var id = - this->component_poa_->reference_to_id (objref - ACE_ENV_ARG_PARAMETER); + this->component_poa_->reference_to_id (objref); - this->component_poa_->deactivate_object (id.in () - ACE_ENV_ARG_PARAMETER); + this->component_poa_->deactivate_object (id.in ()); oid = id._retn (); } @@ -583,15 +549,13 @@ namespace CIAO Session_Container::add_servant_map ( PortableServer::ObjectId &, Dynamic_Component_Servant_Base* - ACE_ENV_ARG_DECL_NOT_USED ) { CIAO_TRACE ("Session_Container::add_servant_map"); } void - Session_Container::deactivate_facet (const PortableServer::ObjectId & - ACE_ENV_ARG_DECL_NOT_USED) + Session_Container::deactivate_facet (const PortableServer::ObjectId &) ACE_THROW_SPEC ((CORBA::SystemException)) { CIAO_TRACE ("Session_Container::deactivate_facet"); @@ -600,15 +564,13 @@ namespace CIAO void Session_Container::delete_servant_map ( PortableServer::ObjectId & - ACE_ENV_ARG_DECL_NOT_USED ) { CIAO_TRACE ("Session_Container::delete_servant_map"); } CORBA::Object_ptr - Session_Container::get_home_objref (PortableServer::Servant - ACE_ENV_ARG_DECL) + Session_Container::get_home_objref (PortableServer::Servant) ACE_THROW_SPEC ((CORBA::SystemException)) { CIAO_TRACE ("Session_Container::get_home_objref"); @@ -618,8 +580,7 @@ namespace CIAO CORBA::Object_ptr Session_Container::generate_reference (const char *obj_id, const char *repo_id, - Container::OA_Type t - ACE_ENV_ARG_DECL) + Container::OA_Type t) { CIAO_TRACE ("Session_Container::generate_reference"); @@ -649,8 +610,7 @@ namespace CIAO CORBA::Object_var objref = tmp->create_reference_with_id (oid.in (), - repo_id - ACE_ENV_ARG_PARAMETER); + repo_id); return objref._retn (); } diff --git a/CIAO/ciao/Container_Base.h b/CIAO/ciao/Container_Base.h index cbde8a4d6c0..551a1670d5b 100644 --- a/CIAO/ciao/Container_Base.h +++ b/CIAO/ciao/Container_Base.h @@ -75,8 +75,7 @@ namespace CIAO /// Initialize the container with a name. virtual int init (const char *name = 0, - const CORBA::PolicyList *more_policies = 0 - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const CORBA::PolicyList *more_policies = 0) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; /// Install a new home @@ -86,7 +85,6 @@ namespace CIAO const char *sv_dll_name, const char *sv_entrypt, const char *ins_name - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::UnknownImplId, @@ -94,27 +92,22 @@ namespace CIAO Deployment::InstallationFailure)) = 0; // Uninstall a servant for component or home. - virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Uninstall a servant for component. virtual void uninstall_component (::Components::CCMObject_ptr objref, - PortableServer::ObjectId_out oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableServer::ObjectId_out oid) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // @@Jai, please see the Session Container class for comments. // @@ Jai, do you really need the environment variable? virtual void add_servant_map (PortableServer::ObjectId &oid, - Dynamic_Component_Servant_Base* servant - ACE_ENV_ARG_DECL) = 0; + Dynamic_Component_Servant_Base* servant) = 0; - virtual void delete_servant_map (PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL) = 0; + virtual void delete_servant_map (PortableServer::ObjectId &oid) = 0; - virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; protected: @@ -185,8 +178,7 @@ namespace CIAO /// Initialize the container with a name. virtual int init (const char *name = 0, - const CORBA::PolicyList *more_policies = 0 - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const CORBA::PolicyList *more_policies = 0) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -207,7 +199,6 @@ namespace CIAO const char *sv_dll_name, const char *sv_entrypt, const char *ins_name - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::UnknownImplId, @@ -215,55 +206,46 @@ namespace CIAO Deployment::InstallationFailure)); /// Uninstall a servant for component or home. - virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref) ACE_THROW_SPEC ((CORBA::SystemException)); /// Uninstall a servant for component. virtual void uninstall_component (::Components::CCMObject_ptr objref, - PortableServer::ObjectId_out oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableServer::ObjectId_out oid) ACE_THROW_SPEC ((CORBA::SystemException)); /// Install a servant for component or home. virtual CORBA::Object_ptr install_servant (PortableServer::Servant p, - Container::OA_Type t - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + Container::OA_Type t) ACE_THROW_SPEC ((CORBA::SystemException)); /// Install a component servant. CORBA::Object_ptr install_component (PortableServer::Servant p, - PortableServer::ObjectId_out oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableServer::ObjectId_out oid) ACE_THROW_SPEC ((CORBA::SystemException)); /// Get an object reference to a component or home from the servant. - virtual CORBA::Object_ptr get_objref (PortableServer::Servant p - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Object_ptr get_objref (PortableServer::Servant p) ACE_THROW_SPEC ((CORBA::SystemException)); /// Uninstall a servant for component or home. void uninstall (CORBA::Object_ptr objref, - Container::OA_Type t - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + Container::OA_Type t) ACE_THROW_SPEC ((CORBA::SystemException)); /// Uninstall a servant for component or home. void uninstall (PortableServer::Servant svt, - Container::OA_Type t - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + Container::OA_Type t) ACE_THROW_SPEC ((CORBA::SystemException)); // @@Jai, please consider naming this method as // "add_servant_to_map ()" to be more descriptive. virtual void add_servant_map (PortableServer::ObjectId &oid, - Dynamic_Component_Servant_Base* servant - ACE_ENV_ARG_DECL); + Dynamic_Component_Servant_Base* servant); // @@Jai, please consider naming this method as // "delete_servant_from_map ()" to be more descriptive. - virtual void delete_servant_map (PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL); + virtual void delete_servant_map (PortableServer::ObjectId &oid); // @@Jai, could yo please add documentation? /* @@ -274,20 +256,17 @@ namespace CIAO * deactivate_facet from the Swapping_Conatiner's interface. It * would make the base container interface much cleaner. */ - virtual void deactivate_facet (const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL) + virtual void deactivate_facet (const PortableServer::ObjectId &oid) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p) ACE_THROW_SPEC ((CORBA::SystemException)); /// Analog of the POA method that creates an object reference from /// an object id string. CORBA::Object_ptr generate_reference (const char *obj_id, const char *repo_id, - Container::OA_Type t - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + Container::OA_Type t); /// Return the servant activator factory that activates the /// servants for facets and consumers. @@ -302,14 +281,12 @@ namespace CIAO */ void create_component_POA (const char *name, const CORBA::PolicyList *p, - PortableServer::POA_ptr root - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + PortableServer::POA_ptr root); /// Create POA for the facets and consumers alone. void create_facet_consumer_POA (const char *name, const CORBA::PolicyList *p, - PortableServer::POA_ptr root - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + PortableServer::POA_ptr root); /// Not allowed to be Session_Container (void); diff --git a/CIAO/ciao/Container_Base.inl b/CIAO/ciao/Container_Base.inl index 0d6aeef9bcc..5d178c2024c 100644 --- a/CIAO/ciao/Container_Base.inl +++ b/CIAO/ciao/Container_Base.inl @@ -1,12 +1,10 @@ // $Id$ -*- C++ -*- ACE_INLINE CORBA::Object_ptr -CIAO::Session_Container::get_objref (PortableServer::Servant p - ACE_ENV_ARG_DECL) +CIAO::Session_Container::get_objref (PortableServer::Servant p) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->the_POA ()->servant_to_reference (p - ACE_ENV_ARG_PARAMETER); + return this->the_POA ()->servant_to_reference (p); } ACE_INLINE CIAO::Servant_Activator * diff --git a/CIAO/ciao/Context_Impl_Base.cpp b/CIAO/ciao/Context_Impl_Base.cpp index 6b31dedf392..9c377124e60 100644 --- a/CIAO/ciao/Context_Impl_Base.cpp +++ b/CIAO/ciao/Context_Impl_Base.cpp @@ -24,7 +24,6 @@ namespace CIAO Components::Principal_ptr Context_Impl_Base::get_caller_principal ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -34,7 +33,6 @@ namespace CIAO Components::CCMHome_ptr Context_Impl_Base::get_CCM_home ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -43,7 +41,6 @@ namespace CIAO CORBA::Boolean Context_Impl_Base::get_rollback_only ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, Components::IllegalState)) @@ -53,7 +50,6 @@ namespace CIAO Components::Transaction::UserTransaction_ptr Context_Impl_Base::get_user_transaction ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, Components::IllegalState)) @@ -65,7 +61,6 @@ namespace CIAO CORBA::Boolean Context_Impl_Base::is_caller_in_role ( const char * /* role */ - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -74,12 +69,11 @@ namespace CIAO void Context_Impl_Base::set_rollback_only ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, Components::IllegalState)) { - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw CORBA::NO_IMPLEMENT (); } // CIAO-specific. diff --git a/CIAO/ciao/Context_Impl_Base.h b/CIAO/ciao/Context_Impl_Base.h index 60852390099..189a9f3aba2 100644 --- a/CIAO/ciao/Context_Impl_Base.h +++ b/CIAO/ciao/Context_Impl_Base.h @@ -68,30 +68,29 @@ namespace CIAO // Operations from ::Components::CCMContext. virtual Components::Principal_ptr - get_caller_principal (void) + get_caller_principal () ACE_THROW_SPEC ((CORBA::SystemException)); virtual Components::CCMHome_ptr - get_CCM_home (void) + get_CCM_home () ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean - get_rollback_only (void) + get_rollback_only () ACE_THROW_SPEC ((CORBA::SystemException, Components::IllegalState)); virtual Components::Transaction::UserTransaction_ptr - get_user_transaction (void) + get_user_transaction () ACE_THROW_SPEC ((CORBA::SystemException, Components::IllegalState)); virtual CORBA::Boolean - is_caller_in_role (const char *role - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + is_caller_in_role (const char *role) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void - set_rollback_only (void) + set_rollback_only () ACE_THROW_SPEC ((CORBA::SystemException, Components::IllegalState)); diff --git a/CIAO/ciao/Context_Impl_T.cpp b/CIAO/ciao/Context_Impl_T.cpp index a33c11a0ae5..94bc0ac65eb 100644 --- a/CIAO/ciao/Context_Impl_T.cpp +++ b/CIAO/ciao/Context_Impl_T.cpp @@ -36,7 +36,6 @@ namespace CIAO typename COMP_VAR> CORBA::Object_ptr Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::get_CCM_object ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, Components::IllegalState)) @@ -45,23 +44,19 @@ namespace CIAO { CORBA::Object_var obj; - ACE_TRY + try { obj = - this->container_->get_objref (this->servant_ - ACE_ENV_ARG_PARAMETER); + this->container_->get_objref (this->servant_); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught Exception \n"); + ex._tao_print_exception ("Caught Exception \n"); return CORBA::Object::_nil (); } - ACE_ENDTRY; - this->component_ = COMP::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + this->component_ = COMP::_narrow (obj.in ()); if (CORBA::is_nil (this->component_.in ())) { diff --git a/CIAO/ciao/Context_Impl_T.h b/CIAO/ciao/Context_Impl_T.h index 411311a745f..a9918af0d36 100644 --- a/CIAO/ciao/Context_Impl_T.h +++ b/CIAO/ciao/Context_Impl_T.h @@ -82,7 +82,7 @@ namespace CIAO // Operations from ::Components::SessionContext. virtual CORBA::Object_ptr - get_CCM_object (void) + get_CCM_object () ACE_THROW_SPEC ((CORBA::SystemException, Components::IllegalState)); diff --git a/CIAO/ciao/Cookies.cpp b/CIAO/ciao/Cookies.cpp index e90b71252ea..74d02a3cd18 100644 --- a/CIAO/ciao/Cookies.cpp +++ b/CIAO/ciao/Cookies.cpp @@ -57,7 +57,7 @@ namespace CIAO //======================================================== CORBA::ValueBase * - Map_Key_Cookie_init::create_for_unmarshal (void) + Map_Key_Cookie_init::create_for_unmarshal () { CORBA::ValueBase *ret_val = 0; @@ -65,8 +65,6 @@ namespace CIAO CIAO::Map_Key_Cookie, CORBA::NO_MEMORY ()); - // @@ (OO) An "ACE_CHECK_RETURN (0) is missing here. - return ret_val; } diff --git a/CIAO/ciao/Cookies.h b/CIAO/ciao/Cookies.h index 95ebc3cf2de..72cad6f5744 100644 --- a/CIAO/ciao/Cookies.h +++ b/CIAO/ciao/Cookies.h @@ -61,7 +61,7 @@ namespace CIAO public: virtual ~Map_Key_Cookie_init (void); - virtual CORBA::ValueBase *create_for_unmarshal (void); + virtual CORBA::ValueBase *create_for_unmarshal (); }; } diff --git a/CIAO/ciao/Dynamic_Component_Activator.cpp b/CIAO/ciao/Dynamic_Component_Activator.cpp index 1400766070d..cdce36fb96f 100644 --- a/CIAO/ciao/Dynamic_Component_Activator.cpp +++ b/CIAO/ciao/Dynamic_Component_Activator.cpp @@ -21,8 +21,7 @@ namespace CIAO PortableServer::Servant Dynamic_Component_Activator::incarnate (const PortableServer::ObjectId &oid, - PortableServer::POA_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableServer::POA_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -43,8 +42,7 @@ namespace CIAO PortableServer::POA_ptr , PortableServer::Servant , CORBA::Boolean , - CORBA::Boolean - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Boolean) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/CIAO/ciao/Dynamic_Component_Activator.h b/CIAO/ciao/Dynamic_Component_Activator.h index 504d8887ed9..aec2aaf79f5 100644 --- a/CIAO/ciao/Dynamic_Component_Activator.h +++ b/CIAO/ciao/Dynamic_Component_Activator.h @@ -65,8 +65,7 @@ namespace CIAO */ PortableServer::Servant incarnate ( const PortableServer::ObjectId &oid, - PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL) + PortableServer::POA_ptr poa) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); @@ -74,8 +73,7 @@ namespace CIAO PortableServer::POA_ptr adapter, PortableServer::Servant servant, CORBA::Boolean cleanup_in_progress, - CORBA::Boolean remaining_activations - ACE_ENV_ARG_DECL) + CORBA::Boolean remaining_activations) ACE_THROW_SPEC ((CORBA::SystemException)); void add_servant_map (PortableServer::ObjectId &oid, diff --git a/CIAO/ciao/Dynamic_Component_Servant_Base.h b/CIAO/ciao/Dynamic_Component_Servant_Base.h index 0e826cf40ab..ac849ad9e53 100644 --- a/CIAO/ciao/Dynamic_Component_Servant_Base.h +++ b/CIAO/ciao/Dynamic_Component_Servant_Base.h @@ -37,8 +37,7 @@ namespace CIAO virtual ~Dynamic_Component_Servant_Base (void); virtual PortableServer::Servant - create (PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0; + create (PortableServer::ObjectId &oid) = 0; virtual void destroy (PortableServer::ObjectId &oid) = 0; diff --git a/CIAO/ciao/Dynamic_Component_Servant_T.cpp b/CIAO/ciao/Dynamic_Component_Servant_T.cpp index 65da5124040..a69d568264a 100644 --- a/CIAO/ciao/Dynamic_Component_Servant_T.cpp +++ b/CIAO/ciao/Dynamic_Component_Servant_T.cpp @@ -53,20 +53,17 @@ namespace CIAO template <typename COMP_SVNT> PortableServer::Servant Dynamic_Component_Servant<COMP_SVNT>::create ( - PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL) + PortableServer::ObjectId &oid) { CIAO::Swap_Exec_var swap_exec = - CIAO::Swap_Exec::_narrow (this->executor_.in () - ACE_ENV_ARG_PARAMETER); + CIAO::Swap_Exec::_narrow (this->executor_.in ()); ::Components::EnterpriseComponent_var ciao_ec = swap_exec->incarnate (); typedef typename COMP_SVNT::_exec_type exec_type; typename COMP_SVNT::_exec_type::_var_type ciao_comp = - exec_type::_narrow (ciao_ec.in () - ACE_ENV_ARG_PARAMETER); + exec_type::_narrow (ciao_ec.in ()); /// @@ Jai, should you be using ACE_NEW_THROW_EX here? COMP_SVNT *svt = new COMP_SVNT (ciao_comp.in (), diff --git a/CIAO/ciao/Dynamic_Component_Servant_T.h b/CIAO/ciao/Dynamic_Component_Servant_T.h index 5ca9fab815e..6d38bf85399 100644 --- a/CIAO/ciao/Dynamic_Component_Servant_T.h +++ b/CIAO/ciao/Dynamic_Component_Servant_T.h @@ -45,8 +45,7 @@ namespace CIAO virtual ~Dynamic_Component_Servant (void); virtual PortableServer::Servant - create (PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + create (PortableServer::ObjectId &oid); virtual void destroy (PortableServer::ObjectId &oid); diff --git a/CIAO/ciao/Home_Servant_Impl_Base.cpp b/CIAO/ciao/Home_Servant_Impl_Base.cpp index 81c62eb6110..f96c2ac684d 100644 --- a/CIAO/ciao/Home_Servant_Impl_Base.cpp +++ b/CIAO/ciao/Home_Servant_Impl_Base.cpp @@ -17,7 +17,6 @@ namespace CIAO CORBA::IRObject_ptr Home_Servant_Impl_Base::get_component_def ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -27,7 +26,6 @@ namespace CIAO CORBA::IRObject_ptr Home_Servant_Impl_Base::get_home_def ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/CIAO/ciao/Home_Servant_Impl_Base.h b/CIAO/ciao/Home_Servant_Impl_Base.h index e47ee03b1c0..f7744ea6b48 100644 --- a/CIAO/ciao/Home_Servant_Impl_Base.h +++ b/CIAO/ciao/Home_Servant_Impl_Base.h @@ -50,11 +50,11 @@ namespace CIAO // Operations for CCMHome interface. virtual ::CORBA::IRObject_ptr - get_component_def (void) + get_component_def () ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::CORBA::IRObject_ptr - get_home_def (void) + get_home_def () ACE_THROW_SPEC ((CORBA::SystemException)); virtual void diff --git a/CIAO/ciao/Home_Servant_Impl_T.cpp b/CIAO/ciao/Home_Servant_Impl_T.cpp index 236aeffbda8..5dc7e68243b 100644 --- a/CIAO/ciao/Home_Servant_Impl_T.cpp +++ b/CIAO/ciao/Home_Servant_Impl_T.cpp @@ -53,7 +53,6 @@ namespace CIAO EXEC, COMP_SVNT>::remove_component ( ::Components::CCMObject_ptr comp - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, Components::RemoveFailure)) @@ -61,8 +60,7 @@ namespace CIAO CIAO_TRACE ("Home_Servant_Impl<>::remove_component"); PortableServer::ObjectId_var oid = - this->container_->the_POA ()->reference_to_id (comp - ACE_ENV_ARG_PARAMETER); + this->container_->the_POA ()->reference_to_id (comp); Components::CCMObject_var ccm_obj_var = Components::CCMObject::_nil (); if (objref_map_.find (oid.in (), ccm_obj_var) != 0) @@ -73,12 +71,11 @@ namespace CIAO typedef typename COMP_SVNT::_stub_type stub_type; typename COMP_SVNT::_stub_var_type _ciao_comp = - stub_type::_narrow (ccm_obj_var.in () - ACE_ENV_ARG_PARAMETER); + stub_type::_narrow (ccm_obj_var.in ()); if (CORBA::is_nil (_ciao_comp.in ())) { - ACE_THROW (Components::RemoveFailure ()); + throw Components::RemoveFailure (); } _ciao_comp->remove (); @@ -119,7 +116,6 @@ namespace CIAO Home_Servant_Impl<BASE_SKEL, EXEC, COMP_SVNT>::create_component ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, Components::CreateFailure)) @@ -138,7 +134,6 @@ namespace CIAO Home_Servant_Impl<BASE_SKEL, EXEC, COMP_SVNT>::create ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, Components::CreateFailure)) @@ -156,11 +151,9 @@ namespace CIAO typedef typename COMP_SVNT::_exec_type exec_type; typename COMP_SVNT::_exec_type::_var_type _ciao_comp = - exec_type::_narrow (_ciao_ec.in () - ACE_ENV_ARG_PARAMETER); + exec_type::_narrow (_ciao_ec.in ()); - return this->_ciao_activate_component (_ciao_comp.in () - ACE_ENV_ARG_PARAMETER); + return this->_ciao_activate_component (_ciao_comp.in ()); } // CIAO-specific operations. @@ -173,19 +166,16 @@ namespace CIAO EXEC, COMP_SVNT>::_ciao_activate_component ( typename COMP_SVNT::_exec_type::_ptr_type exe - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { CIAO_TRACE ("Home_Servant_Impl<>::_ciao_activate_component"); CORBA::Object_var hobj = - this->container_->get_objref (this - ACE_ENV_ARG_PARAMETER); + this->container_->get_objref (this); Components::CCMHome_var home = - Components::CCMHome::_narrow (hobj.in () - ACE_ENV_ARG_PARAMETER); + Components::CCMHome::_narrow (hobj.in ()); typedef typename COMP_SVNT::_stub_type stub_type; COMP_SVNT *svt = 0; @@ -202,17 +192,14 @@ namespace CIAO CORBA::Object_var objref = this->container_->install_component (svt, - oid.out () - ACE_ENV_ARG_PARAMETER); + oid.out ()); typedef typename COMP_SVNT::_stub_type stub_type; typename COMP_SVNT::_stub_var_type ho = - stub_type::_narrow (objref.in () - ACE_ENV_ARG_PARAMETER); + stub_type::_narrow (objref.in ()); Components::CCMObject_var ccmobjref = - Components::CCMObject::_narrow (objref.in () - ACE_ENV_ARG_PARAMETER); + Components::CCMObject::_narrow (objref.in ()); this->objref_map_.bind ( oid.in (), @@ -229,7 +216,6 @@ namespace CIAO EXEC, COMP_SVNT>::_ciao_passivate_component ( typename COMP_SVNT::_stub_ptr_type comp - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -237,8 +223,7 @@ namespace CIAO PortableServer::ObjectId_var oid; this->container_->uninstall_component (comp, - oid.out () - ACE_ENV_ARG_PARAMETER); + oid.out ()); } } diff --git a/CIAO/ciao/Home_Servant_Impl_T.h b/CIAO/ciao/Home_Servant_Impl_T.h index 1c2f9eab3ff..c29ba00615a 100644 --- a/CIAO/ciao/Home_Servant_Impl_T.h +++ b/CIAO/ciao/Home_Servant_Impl_T.h @@ -57,22 +57,21 @@ namespace CIAO // Operations for CCMHome interface. virtual void - remove_component (Components::CCMObject_ptr comp - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + remove_component (Components::CCMObject_ptr comp) ACE_THROW_SPEC ((CORBA::SystemException, Components::RemoveFailure)); // Operations for keyless home interface. virtual ::Components::CCMObject_ptr - create_component (void) + create_component () ACE_THROW_SPEC ((CORBA::SystemException, Components::CreateFailure)); // Operations for implicit home interface. virtual typename COMP_SVNT::_stub_ptr_type - create (void) + create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CreateFailure)); @@ -83,13 +82,11 @@ namespace CIAO // CIAO-specific operations. typename COMP_SVNT::_stub_ptr_type - _ciao_activate_component (typename COMP_SVNT::_exec_type::_ptr_type exe - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + _ciao_activate_component (typename COMP_SVNT::_exec_type::_ptr_type exe) ACE_THROW_SPEC ((CORBA::SystemException)); void - _ciao_passivate_component (typename COMP_SVNT::_stub_ptr_type comp - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + _ciao_passivate_component (typename COMP_SVNT::_stub_ptr_type comp) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/CIAO/ciao/NodeApp_CB_Impl.cpp b/CIAO/ciao/NodeApp_CB_Impl.cpp index 81f42ff4fa6..c87e80f9333 100644 --- a/CIAO/ciao/NodeApp_CB_Impl.cpp +++ b/CIAO/ciao/NodeApp_CB_Impl.cpp @@ -11,8 +11,7 @@ NodeApplication_Callback_Impl (CORBA::ORB_ptr o, poa_ (PortableServer::POA::_duplicate (p)), nam_ (Deployment::NodeApplicationManager::_duplicate (s)) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { //@@ Note: this properties is useless unless // we have some specific properties for the callback obj. @@ -22,13 +21,11 @@ NodeApplication_Callback_Impl (CORBA::ORB_ptr o, CORBA::NO_MEMORY ()); this->properties_ = tmp; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "NodeApp_CB_Impl::Constructor\t\n"); - ACE_RE_THROW; + ex._tao_print_exception ("NodeApp_CB_Impl::Constructor\t\n"); + throw; } - ACE_ENDTRY; } CIAO::NodeApplication_Callback_Impl::~NodeApplication_Callback_Impl () @@ -44,8 +41,7 @@ CIAO::NodeApplication_Callback_Impl::_default_POA (void) Deployment::NodeApplicationManager_ptr CIAO::NodeApplication_Callback_Impl::register_node_application ( Deployment::NodeApplication_ptr na, - Deployment::Properties_out properties - ACE_ENV_ARG_DECL_NOT_USED) + Deployment::Properties_out properties) ACE_THROW_SPEC ((CORBA::SystemException)) { properties = this->properties_._retn (); diff --git a/CIAO/ciao/NodeApp_CB_Impl.h b/CIAO/ciao/NodeApp_CB_Impl.h index 95cc3de30e5..bd5c5fd7711 100644 --- a/CIAO/ciao/NodeApp_CB_Impl.h +++ b/CIAO/ciao/NodeApp_CB_Impl.h @@ -53,8 +53,7 @@ namespace CIAO /// NodeApplicationManager Deployment::NodeApplicationManager_ptr register_node_application (Deployment::NodeApplication_ptr na, - Deployment::Properties_out properties - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + Deployment::Properties_out properties) ACE_THROW_SPEC ((CORBA::SystemException)); Deployment::NodeApplication_ptr get_nodeapp_ref (void); diff --git a/CIAO/ciao/Port_Activator.h b/CIAO/ciao/Port_Activator.h index db047575405..f3914d7d786 100644 --- a/CIAO/ciao/Port_Activator.h +++ b/CIAO/ciao/Port_Activator.h @@ -67,12 +67,10 @@ namespace CIAO * specifications. */ virtual PortableServer::Servant activate ( - const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL) = 0; + const PortableServer::ObjectId &oid) = 0; virtual void deactivate ( - const PortableServer::Servant servant - ACE_ENV_ARG_DECL) = 0; + const PortableServer::Servant servant) = 0; protected: /// The object ID that is used to activate the servant within the diff --git a/CIAO/ciao/Port_Activator_T.cpp b/CIAO/ciao/Port_Activator_T.cpp index d140f1c6091..b6bc950a642 100644 --- a/CIAO/ciao/Port_Activator_T.cpp +++ b/CIAO/ciao/Port_Activator_T.cpp @@ -35,8 +35,7 @@ namespace CIAO typename COMP_SERV> void Port_Activator_T<SERV, EXEC, CONTEXT, COMP_SERV>::deactivate ( - const PortableServer::Servant servant - ACE_ENV_ARG_DECL) + const PortableServer::Servant servant) { SERVANT *s = dynamic_cast<SERVANT *> (servant); s->_remove_ref (); @@ -48,8 +47,7 @@ namespace CIAO typename COMP_SERV> PortableServer::Servant Port_Activator_T<SERV, EXEC, CONTEXT, COMP_SERV>::activate ( - const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL) + const PortableServer::ObjectId &oid) { CORBA::String_var str = PortableServer::ObjectId_to_string (oid); diff --git a/CIAO/ciao/Port_Activator_T.h b/CIAO/ciao/Port_Activator_T.h index 8afa788b655..bf159c89b4e 100644 --- a/CIAO/ciao/Port_Activator_T.h +++ b/CIAO/ciao/Port_Activator_T.h @@ -53,12 +53,10 @@ namespace CIAO /// Template method from the base class, please see the base class /// documentation for details. PortableServer::Servant activate ( - const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL); + const PortableServer::ObjectId &oid); void deactivate ( - const PortableServer::Servant servant - ACE_ENV_ARG_DECL); + const PortableServer::Servant servant); private: /// The executor diff --git a/CIAO/ciao/Servant_Activator.cpp b/CIAO/ciao/Servant_Activator.cpp index ba85f87dcaf..c0e1bc93d9d 100644 --- a/CIAO/ciao/Servant_Activator.cpp +++ b/CIAO/ciao/Servant_Activator.cpp @@ -38,8 +38,7 @@ namespace CIAO bool Servant_Activator::update_port_activator ( - const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL_NOT_USED) + const PortableServer::ObjectId &oid) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var str = @@ -66,8 +65,7 @@ namespace CIAO PortableServer::Servant Servant_Activator::incarnate (const PortableServer::ObjectId &oid, - PortableServer::POA_ptr - ACE_ENV_ARG_DECL) + PortableServer::POA_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -114,8 +112,7 @@ namespace CIAO ACE_DEBUG ((LM_DEBUG, "Activating Port %s\n", str.in ())); - return this->pa_[t]->activate (oid - ACE_ENV_ARG_PARAMETER); + return this->pa_[t]->activate (oid); } } } @@ -128,8 +125,7 @@ namespace CIAO PortableServer::POA_ptr , PortableServer::Servant servant, CORBA::Boolean , - CORBA::Boolean - ACE_ENV_ARG_DECL) + CORBA::Boolean) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var str = @@ -157,8 +153,7 @@ namespace CIAO { ACE_DEBUG ((LM_DEBUG, "Deactivating Port %s\n", str.in ())); - this->pa_[t]->deactivate (servant - ACE_ENV_ARG_PARAMETER); + this->pa_[t]->deactivate (servant); } } } diff --git a/CIAO/ciao/Servant_Activator.h b/CIAO/ciao/Servant_Activator.h index 551388de004..9a3cfc58644 100644 --- a/CIAO/ciao/Servant_Activator.h +++ b/CIAO/ciao/Servant_Activator.h @@ -57,8 +57,7 @@ namespace CIAO virtual ~Servant_Activator (void); - bool update_port_activator (const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL) + bool update_port_activator (const PortableServer::ObjectId &oid) ACE_THROW_SPEC ((CORBA::SystemException)); /// Template methods overridden to get callbacks. @@ -69,8 +68,7 @@ namespace CIAO */ PortableServer::Servant incarnate ( const PortableServer::ObjectId &oid, - PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL) + PortableServer::POA_ptr poa) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); @@ -78,8 +76,7 @@ namespace CIAO PortableServer::POA_ptr adapter, PortableServer::Servant servant, CORBA::Boolean cleanup_in_progress, - CORBA::Boolean remaining_activations - ACE_ENV_ARG_DECL) + CORBA::Boolean remaining_activations) ACE_THROW_SPEC ((CORBA::SystemException)); /// Local helper methods diff --git a/CIAO/ciao/Servant_Impl_Base.cpp b/CIAO/ciao/Servant_Impl_Base.cpp index 00352996a97..7ea606c2c7b 100644 --- a/CIAO/ciao/Servant_Impl_Base.cpp +++ b/CIAO/ciao/Servant_Impl_Base.cpp @@ -23,7 +23,6 @@ namespace CIAO ::Components::PrimaryKeyBase * Servant_Impl_Base::get_primary_key ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::NoKeyAvailable)) @@ -33,7 +32,6 @@ namespace CIAO CORBA::IRObject_ptr Servant_Impl_Base::get_component_def ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -43,7 +41,6 @@ namespace CIAO void Servant_Impl_Base::configuration_complete ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidConfiguration)) @@ -53,12 +50,11 @@ namespace CIAO void Servant_Impl_Base::remove ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, Components::RemoveFailure)) { - ACE_TRY + try { // Removing Facets Components::FacetDescriptions_var facets = @@ -69,15 +65,15 @@ namespace CIAO { PortableServer::ObjectId_var facet_id = this->container_->the_facet_cons_POA ()->reference_to_id - (facets[i]->facet_ref () ACE_ENV_ARG_PARAMETER); + (facets[i]->facet_ref ()); CIAO::Servant_Activator *sa = this->container_->ports_servant_activator (); - sa->update_port_activator (facet_id.in () ACE_ENV_ARG_PARAMETER); + sa->update_port_activator (facet_id.in ()); this->container_->the_facet_cons_POA ()->deactivate_object - (facet_id ACE_ENV_ARG_PARAMETER); + (facet_id); } // Removed Facets @@ -91,14 +87,14 @@ namespace CIAO { PortableServer::ObjectId_var cons_id = this->container_->the_facet_cons_POA ()->reference_to_id - (consumers[j]->consumer () ACE_ENV_ARG_PARAMETER); + (consumers[j]->consumer ()); CIAO::Servant_Activator *sa = this->container_->ports_servant_activator (); - sa->update_port_activator (cons_id.in () ACE_ENV_ARG_PARAMETER); + sa->update_port_activator (cons_id.in ()); this->container_->the_facet_cons_POA ()->deactivate_object - (cons_id ACE_ENV_ARG_PARAMETER); + (cons_id); } Components::SessionComponent_var temp = this->get_executor (); @@ -108,29 +104,24 @@ namespace CIAO this->container_->get_objref (this); Components::CCMObject_var ccmobjref = - Components::CCMObject::_narrow (objref.in () - ACE_ENV_ARG_PARAMETER); + Components::CCMObject::_narrow (objref.in ()); PortableServer::ObjectId_var oid; this->container_->uninstall_component (ccmobjref.in (), - oid.out () - ACE_ENV_ARG_PARAMETER); + oid.out ()); this->home_servant_->update_component_map (oid); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Port not active\n"); + ex._tao_print_exception ("Port not active\n"); } - ACE_ENDTRY; } ::Components::ConnectionDescriptions * Servant_Impl_Base::get_connections ( const char * /* name */ - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)) @@ -140,7 +131,6 @@ namespace CIAO ::Components::ComponentPortDescription * Servant_Impl_Base::get_all_ports ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -177,7 +167,6 @@ namespace CIAO CORBA::Object_ptr Servant_Impl_Base::provide_facet ( const char *name - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)) @@ -202,7 +191,6 @@ namespace CIAO Components::FacetDescriptions * Servant_Impl_Base::get_named_facets ( const ::Components::NameList & names - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)) @@ -234,7 +222,6 @@ namespace CIAO ::Components::FacetDescriptions * Servant_Impl_Base::get_all_facets ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -262,7 +249,6 @@ namespace CIAO ::Components::ConsumerDescriptions * Servant_Impl_Base::get_all_consumers ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -292,7 +278,6 @@ namespace CIAO ::Components::EventConsumerBase_ptr Servant_Impl_Base::get_consumer ( const char *sink_name - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)) @@ -318,7 +303,6 @@ namespace CIAO ::Components::ConsumerDescriptions * Servant_Impl_Base::get_named_consumers ( const ::Components::NameList & names - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)) @@ -351,7 +335,6 @@ namespace CIAO ::Components::EmitterDescriptions * Servant_Impl_Base::get_named_emitters ( const ::Components::NameList & /* names */ - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)) @@ -362,7 +345,6 @@ namespace CIAO ::Components::ReceptacleDescriptions * Servant_Impl_Base::get_all_receptacles ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -397,7 +379,6 @@ namespace CIAO ::Components::ReceptacleDescriptions * Servant_Impl_Base::get_named_receptacles ( const ::Components::NameList & /* names */ - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)) @@ -408,7 +389,6 @@ namespace CIAO ::Components::PublisherDescriptions * Servant_Impl_Base::get_named_publishers ( const ::Components::NameList & /* names */ - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)) @@ -419,13 +399,12 @@ namespace CIAO /// Protected operations. void Servant_Impl_Base::add_facet (const char *port_name, - ::CORBA::Object_ptr port_ref - ACE_ENV_ARG_DECL) + ::CORBA::Object_ptr port_ref) ACE_THROW_SPEC (( ::CORBA::SystemException)) { if (0 == port_name || ::CORBA::is_nil (port_ref)) { - ACE_THROW ( ::CORBA::BAD_PARAM ()); + throw ::CORBA::BAD_PARAM (); return; } @@ -567,13 +546,12 @@ namespace CIAO Servant_Impl_Base::add_consumer ( const char *port_name, ::Components::EventConsumerBase_ptr port_ref - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( ::CORBA::SystemException)) { if (0 == port_name || ::CORBA::is_nil (port_ref)) { - ACE_THROW ( ::CORBA::BAD_PARAM ()); + throw ::CORBA::BAD_PARAM (); return; } @@ -654,7 +632,7 @@ namespace CIAO } ::Components::StandardConfigurator_ptr - Servant_Impl_Base::get_standard_configurator (void) + Servant_Impl_Base::get_standard_configurator () ACE_THROW_SPEC ((CORBA::SystemException)) { // Create the configurator servant. @@ -672,8 +650,7 @@ namespace CIAO } PortableServer::POA_ptr - Servant_Impl_Base::_default_POA ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Servant_Impl_Base::_default_POA () { return PortableServer::POA::_duplicate (container_->the_POA ()); diff --git a/CIAO/ciao/Servant_Impl_Base.h b/CIAO/ciao/Servant_Impl_Base.h index ee315457202..89e5293264f 100644 --- a/CIAO/ciao/Servant_Impl_Base.h +++ b/CIAO/ciao/Servant_Impl_Base.h @@ -61,114 +61,103 @@ namespace CIAO /// Operations for CCMObject interface. virtual ::Components::PrimaryKeyBase * - get_primary_key (void) + get_primary_key () ACE_THROW_SPEC ((CORBA::SystemException, Components::NoKeyAvailable)); virtual CORBA::IRObject_ptr - get_component_def (void) + get_component_def () ACE_THROW_SPEC ((CORBA::SystemException)); virtual Components::SessionComponent_ptr - get_executor (void) + get_executor () ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual void - configuration_complete (void) + configuration_complete () ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidConfiguration)); virtual void - remove (void) + remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::RemoveFailure)); virtual ::Components::ConnectionDescriptions * - get_connections (const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + get_connections (const char *name) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)); virtual ::Components::ComponentPortDescription * - get_all_ports (void) + get_all_ports () ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Object_ptr - provide_facet (const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + provide_facet (const char *name) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)); virtual ::Components::FacetDescriptions * - get_named_facets (const ::Components::NameList & names - ACE_ENV_ARG_DECL) + get_named_facets (const ::Components::NameList & names) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)); virtual ::Components::FacetDescriptions * - get_all_facets (void) + get_all_facets () ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::Components::ConsumerDescriptions * - get_all_consumers (void) + get_all_consumers () ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::Components::EventConsumerBase_ptr - get_consumer (const char *sink_name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + get_consumer (const char *sink_name) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)); virtual ::Components::ConsumerDescriptions * - get_named_consumers (const ::Components::NameList & names - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + get_named_consumers (const ::Components::NameList & names) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)); virtual ::Components::EmitterDescriptions * - get_named_emitters (const ::Components::NameList & names - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + get_named_emitters (const ::Components::NameList & names) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)); virtual ::Components::ReceptacleDescriptions * - get_named_receptacles (const ::Components::NameList & names - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + get_named_receptacles (const ::Components::NameList & names) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)); virtual ::Components::ReceptacleDescriptions * - get_all_receptacles (void) + get_all_receptacles () ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::Components::PublisherDescriptions * - get_named_publishers (const ::Components::NameList & names - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + get_named_publishers (const ::Components::NameList & names) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)); /// Operation to set attributes on the component. - virtual void set_attributes (const Components::ConfigValues &descr - ACE_ENV_ARG_DECL) = 0; + virtual void set_attributes (const Components::ConfigValues &descr) = 0; // Creates and returns the StandardConfigurator for the component. virtual ::Components::StandardConfigurator_ptr - get_standard_configurator (void) + get_standard_configurator () ACE_THROW_SPEC ((CORBA::SystemException)); /// Override that returns the (passed-in) default POA of our member /// component's container, to ensure that we get registered /// to that POA when _this() is called. virtual PortableServer::POA_ptr _default_POA ( - ACE_ENV_SINGLE_ARG_DECL ); protected: void add_facet (const char *port_name, - ::CORBA::Object_ptr port_ref - ACE_ENV_ARG_DECL) + ::CORBA::Object_ptr port_ref) ACE_THROW_SPEC (( ::CORBA::SystemException)); CORBA::Object_ptr lookup_facet (const char *port_name); @@ -182,8 +171,7 @@ namespace CIAO ::Components::Cookie * cookie); void add_consumer (const char *port_name, - ::Components::EventConsumerBase_ptr port_ref - ACE_ENV_ARG_DECL) + ::Components::EventConsumerBase_ptr port_ref) ACE_THROW_SPEC (( ::CORBA::SystemException)); ::Components::EventConsumerBase_ptr lookup_consumer ( diff --git a/CIAO/ciao/Servant_Impl_T.cpp b/CIAO/ciao/Servant_Impl_T.cpp index 2bf809efdfa..8925ce3b213 100644 --- a/CIAO/ciao/Servant_Impl_T.cpp +++ b/CIAO/ciao/Servant_Impl_T.cpp @@ -32,12 +32,11 @@ namespace CIAO { // ********************************************************************** /* - ACE_TRY_NEW_ENV + try { ::Components::SessionComponent_var scom = ::Components::SessionComponent::_narrow ( this->executor_.in () - ACE_ENV_ARG_PARAMETER ); if (! ::CORBA::is_nil (scom.in ())) @@ -45,10 +44,9 @@ namespace CIAO scom->ccm_remove (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; */ // ********************************************************************* @@ -63,7 +61,6 @@ namespace CIAO CORBA::Boolean Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::same_component ( CORBA::Object_ptr object_ref - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -78,8 +75,7 @@ namespace CIAO ::CORBA::Object_var me = this->context_->get_CCM_object (); - return me->_is_equivalent (the_other.in () - ACE_ENV_ARG_PARAMETER); + return me->_is_equivalent (the_other.in ()); } @@ -88,7 +84,6 @@ namespace CIAO typename CONTEXT> ::Components::CCMHome_ptr Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::get_ccm_home ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -100,14 +95,12 @@ namespace CIAO typename CONTEXT> Components::SessionComponent_ptr Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::get_executor ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { ::Components::SessionComponent_var temp = ::Components::SessionComponent::_narrow ( this->executor_.in () - ACE_ENV_ARG_PARAMETER ); return temp._retn (); } @@ -117,14 +110,12 @@ namespace CIAO typename CONTEXT> CORBA::Object_ptr Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::_get_component ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { ::Components::SessionContext_var sc = ::Components::SessionContext::_narrow ( this->context_ - ACE_ENV_ARG_PARAMETER ); if (! ::CORBA::is_nil (sc.in ())) @@ -135,7 +126,6 @@ namespace CIAO ::Components::EntityContext_var ec = ::Components::EntityContext::_narrow ( this->context_ - ACE_ENV_ARG_PARAMETER ); if (! ::CORBA::is_nil (ec.in ())) @@ -154,7 +144,6 @@ namespace CIAO typename CONTEXT> void Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::activate_component ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -173,14 +162,12 @@ namespace CIAO typename CONTEXT> void Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { ::Components::SessionComponent_var temp = ::Components::SessionComponent::_narrow ( this->executor_.in () - ACE_ENV_ARG_PARAMETER ); if (! ::CORBA::is_nil (temp.in ())) @@ -197,14 +184,12 @@ namespace CIAO typename EXEC, typename CONTEXT> void - Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_activate ( - ACE_ENV_SINGLE_ARG_DECL) + Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_activate () ACE_THROW_SPEC ((CORBA::SystemException)) { ::Components::SessionComponent_var temp = ::Components::SessionComponent::_narrow ( this->executor_.in () - ACE_ENV_ARG_PARAMETER ); if (! ::CORBA::is_nil (temp.in ())) @@ -222,14 +207,12 @@ namespace CIAO typename CONTEXT> void Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { ::Components::SessionComponent_var temp = ::Components::SessionComponent::_narrow ( this->executor_.in () - ACE_ENV_ARG_PARAMETER ); if (! ::CORBA::is_nil (temp.in ())) @@ -247,7 +230,6 @@ namespace CIAO typename CONTEXT> CORBA::Boolean Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::is_activated ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -259,7 +241,6 @@ namespace CIAO typename CONTEXT> void Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_passivate ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -267,7 +248,6 @@ namespace CIAO ::Components::SessionComponent_var temp = ::Components::SessionComponent::_narrow ( this->executor_.in () - ACE_ENV_ARG_PARAMETER ); if (! ::CORBA::is_nil (temp.in ())) diff --git a/CIAO/ciao/Servant_Impl_T.h b/CIAO/ciao/Servant_Impl_T.h index 0a57e05f18b..5fb7f7c3cf3 100644 --- a/CIAO/ciao/Servant_Impl_T.h +++ b/CIAO/ciao/Servant_Impl_T.h @@ -55,47 +55,46 @@ namespace CIAO // Operations for CCMObject interface. virtual CORBA::Boolean - same_component (CORBA::Object_ptr object_ref - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + same_component (CORBA::Object_ptr object_ref) ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::Components::CCMHome_ptr - get_ccm_home (void) + get_ccm_home () ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Object_ptr - _get_component (void) + _get_component () ACE_THROW_SPEC ((CORBA::SystemException)); virtual Components::SessionComponent_ptr - get_executor (void) + get_executor () ACE_THROW_SPEC ((CORBA::SystemException)); // CIAO-specific operations. void - ciao_preactivate (void) + ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException)); void - ciao_activate (void) + ciao_activate () ACE_THROW_SPEC ((CORBA::SystemException)); void - ciao_postactivate (void) + ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException)); /// @@NOTE: The busted operation. void - ciao_passivate (void) + ciao_passivate () ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean - is_activated (void) + is_activated () ACE_THROW_SPEC ((CORBA::SystemException)); void - activate_component (void) + activate_component () ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/CIAO/ciao/Server_init.cpp b/CIAO/ciao/Server_init.cpp index 8e1428382d0..2342b7a0483 100644 --- a/CIAO/ciao/Server_init.cpp +++ b/CIAO/ciao/Server_init.cpp @@ -71,22 +71,21 @@ namespace CIAO CosNaming::NamingContext_var tmpCtxVar; - ACE_TRY + try { tmpCtxVar = nc->bind_new_context(name); ACE_DEBUG ((LM_DEBUG, "Bound Context.\n\n")); } - ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex) + catch (const CosNaming::NamingContext::AlreadyBound& ex) { ACE_DEBUG ((LM_DEBUG, "Context Already Bound.\n\n")); } - ACE_CATCH (CosNaming::NamingContext::NotFound, nf) + catch (const CosNaming::NamingContext::NotFound& nf) { ACE_DEBUG ((LM_DEBUG, "Context not found.\n\n")); isNotFound = true; lengthMissing = nf.rest_of_name.length(); } - ACE_ENDTRY; if (lengthMissing == name.length()) { @@ -124,17 +123,16 @@ namespace CIAO CORBA::String_var newSCName = nc->to_string(name); ACE_DEBUG ((LM_DEBUG, "The name is: %s\n", newSCName.in ())); - ACE_TRY + try { nc->rebind(name, obj); } - ACE_CATCH (CosNaming::NamingContext::NotFound, ex ) + catch (const CosNaming::NamingContext::NotFound& ex) { ACE_DEBUG ((LM_DEBUG, "Name not found, doing new bind.\n")); nc->bind(name, obj); } - ACE_ENDTRY; } //--------------------------------------------------------------------------------------------- diff --git a/CIAO/ciao/StandardConfigurator_Impl.cpp b/CIAO/ciao/StandardConfigurator_Impl.cpp index 0ec13d15c00..b1ca2033d21 100644 --- a/CIAO/ciao/StandardConfigurator_Impl.cpp +++ b/CIAO/ciao/StandardConfigurator_Impl.cpp @@ -22,18 +22,15 @@ namespace CIAO void StandardConfigurator_Impl::set_configuration ( - const Components::ConfigValues &descr - ACE_ENV_ARG_DECL) + const Components::ConfigValues &descr) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->component_->set_attributes (descr - ACE_ENV_ARG_PARAMETER); + this->component_->set_attributes (descr); } void StandardConfigurator_Impl::configure ( - Components::CCMObject_ptr - ACE_ENV_ARG_DECL_NOT_USED) + Components::CCMObject_ptr) ACE_THROW_SPEC ((CORBA::SystemException, Components::WrongComponentType)) { diff --git a/CIAO/ciao/StandardConfigurator_Impl.h b/CIAO/ciao/StandardConfigurator_Impl.h index 558137b64d5..1c1f800d6c2 100644 --- a/CIAO/ciao/StandardConfigurator_Impl.h +++ b/CIAO/ciao/StandardConfigurator_Impl.h @@ -55,13 +55,11 @@ namespace CIAO /// being configured, i.e, the template method from /// StandardConfigurator interface. virtual void set_configuration ( - const Components::ConfigValues & descr - ACE_ENV_ARG_DECL) + const Components::ConfigValues & descr) ACE_THROW_SPEC ((CORBA::SystemException)); void configure ( - Components::CCMObject_ptr comp - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + Components::CCMObject_ptr comp) ACE_THROW_SPEC ((CORBA::SystemException, Components::WrongComponentType)); diff --git a/CIAO/ciao/Swapping_Container.cpp b/CIAO/ciao/Swapping_Container.cpp index cd96af8c92a..aff7ab93113 100644 --- a/CIAO/ciao/Swapping_Container.cpp +++ b/CIAO/ciao/Swapping_Container.cpp @@ -34,27 +34,22 @@ namespace CIAO } CORBA::Object_ptr - Swapping_Container::get_home_objref (PortableServer::Servant p - ACE_ENV_ARG_DECL) + Swapping_Container::get_home_objref (PortableServer::Servant p) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->the_home_servant_POA ()->servant_to_reference (p - ACE_ENV_ARG_PARAMETER); + return this->the_home_servant_POA ()->servant_to_reference (p); } void - Swapping_Container::deactivate_facet (const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL) + Swapping_Container::deactivate_facet (const PortableServer::ObjectId &oid) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->the_facet_cons_POA ()->deactivate_object (oid - ACE_ENV_ARG_PARAMETER); + this->the_facet_cons_POA ()->deactivate_object (oid); } int Swapping_Container::init (const char *name, - const CORBA::PolicyList *more_policies - ACE_ENV_ARG_DECL) + const CORBA::PolicyList *more_policies) ACE_THROW_SPEC ((CORBA::SystemException)) { char buffer[MAXPATHLEN]; @@ -68,8 +63,7 @@ namespace CIAO } CORBA::Object_var poa_object = - this->orb_->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -77,24 +71,20 @@ namespace CIAO -1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); this->create_servant_POA (name, more_policies, - root_poa.in () - ACE_ENV_ARG_PARAMETER); + root_poa.in ()); this->create_home_servant_POA ("home servant POA", more_policies, - root_poa.in () - ACE_ENV_ARG_PARAMETER); + root_poa.in ()); - this->create_connections_POA (root_poa.in () - ACE_ENV_ARG_PARAMETER); + this->create_connections_POA (root_poa.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -122,8 +112,7 @@ namespace CIAO void Swapping_Container::create_home_servant_POA (const char *name, const CORBA::PolicyList *p, - PortableServer::POA_ptr root - ACE_ENV_ARG_DECL) + PortableServer::POA_ptr root) { CORBA::PolicyList policies (0); @@ -137,14 +126,12 @@ namespace CIAO this->home_servant_poa_ = root->create_POA (name, poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); } void Swapping_Container::create_connections_POA ( - PortableServer::POA_ptr root - ACE_ENV_ARG_DECL) + PortableServer::POA_ptr root) { PortableServer::POAManager_var poa_manager = root->the_POAManager (); @@ -153,41 +140,35 @@ namespace CIAO policies.length (3); policies[0] = - root->create_id_assignment_policy (PortableServer::USER_ID - ACE_ENV_ARG_PARAMETER); + root->create_id_assignment_policy (PortableServer::USER_ID); policies[1] = root->create_request_processing_policy - (PortableServer::USE_SERVANT_MANAGER - ACE_ENV_ARG_PARAMETER); + (PortableServer::USE_SERVANT_MANAGER); // Servant Retention Policy policies[2] = - root->create_servant_retention_policy (PortableServer::RETAIN - ACE_ENV_ARG_PARAMETER); + root->create_servant_retention_policy (PortableServer::RETAIN); this->facet_cons_poa_ = root->create_POA ("facet_consumer_poa", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); ACE_NEW_THROW_EX (this->sa_, Servant_Activator (this->orb_.in ()), CORBA::NO_MEMORY ()); this->facet_cons_poa_->set_servant_manager ( - this->sa_ - ACE_ENV_ARG_PARAMETER); + this->sa_); } void Swapping_Container::create_servant_POA (const char *name, const CORBA::PolicyList *p, - PortableServer::POA_ptr root - ACE_ENV_ARG_DECL) + PortableServer::POA_ptr root) { // @@ Jai, see how this method more or less does things (like // setting policies) like create_connections_POA (). Could you @@ -203,56 +184,47 @@ namespace CIAO CORBA::ULong policy_length = policies.length (); policies.length (policy_length + 1); policies[policy_length] = - root->create_id_assignment_policy (PortableServer::USER_ID - ACE_ENV_ARG_PARAMETER); + root->create_id_assignment_policy (PortableServer::USER_ID); policy_length = policies.length (); policies.length (policy_length + 1); policies[policy_length] = root->create_request_processing_policy ( - PortableServer::USE_SERVANT_MANAGER - ACE_ENV_ARG_PARAMETER); + PortableServer::USE_SERVANT_MANAGER); policy_length = policies.length (); policies.length (policy_length + 1); policies[policy_length] = - root->create_servant_retention_policy (PortableServer::RETAIN - ACE_ENV_ARG_PARAMETER); + root->create_servant_retention_policy (PortableServer::RETAIN); this->component_poa_ = root->create_POA (name, poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); ACE_NEW_THROW_EX (this->dsa_, Dynamic_Component_Activator (this->orb_.in ()), CORBA::NO_MEMORY ()); this->component_poa_->set_servant_manager ( - this->dsa_ - ACE_ENV_ARG_PARAMETER); + this->dsa_); } void - Swapping_Container::ciao_uninstall_home (Components::CCMHome_ptr homeref - ACE_ENV_ARG_DECL) + Swapping_Container::ciao_uninstall_home (Components::CCMHome_ptr homeref) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POA_ptr tmp = this->home_servant_poa_.in (); PortableServer::ObjectId_var oid = - tmp->reference_to_id (homeref - ACE_ENV_ARG_PARAMETER); + tmp->reference_to_id (homeref); - tmp->deactivate_object (oid.in () - ACE_ENV_ARG_PARAMETER); + tmp->deactivate_object (oid.in ()); } CORBA::Object_ptr Swapping_Container::install_servant (PortableServer::Servant p, - Container::OA_Type t - ACE_ENV_ARG_DECL) + Container::OA_Type t) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POA_ptr tmp = 0; @@ -265,12 +237,10 @@ namespace CIAO tmp = this->facet_cons_poa_.in (); PortableServer::ObjectId_var oid - = tmp->activate_object (p - ACE_ENV_ARG_PARAMETER); + = tmp->activate_object (p); CORBA::Object_var objref - = tmp->id_to_reference (oid.in () - ACE_ENV_ARG_PARAMETER); + = tmp->id_to_reference (oid.in ()); return objref._retn (); } diff --git a/CIAO/ciao/Swapping_Container.h b/CIAO/ciao/Swapping_Container.h index 99be4aa474f..98231eef33c 100644 --- a/CIAO/ciao/Swapping_Container.h +++ b/CIAO/ciao/Swapping_Container.h @@ -48,25 +48,20 @@ namespace CIAO /// Initialize the container with a name. virtual int init (const char *name = 0, - const CORBA::PolicyList *more_policies = 0 - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const CORBA::PolicyList *more_policies = 0) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Object_ptr install_servant (PortableServer::Servant p, - Container::OA_Type t - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + Container::OA_Type t) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Object_ptr get_objref (PortableServer::Servant p - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Object_ptr get_objref (PortableServer::Servant p) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void add_servant_map (PortableServer::ObjectId &oid, @@ -74,8 +69,7 @@ namespace CIAO virtual void delete_servant_map (PortableServer::ObjectId &oid); - virtual void deactivate_facet (const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL) + virtual void deactivate_facet (const PortableServer::ObjectId &oid) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::POA_ptr the_home_servant_POA (void) const; @@ -85,16 +79,13 @@ namespace CIAO /// Create POA for the component. void create_servant_POA (const char *name, const CORBA::PolicyList *p, - PortableServer::POA_ptr root - ACE_ENV_ARG_DECL); + PortableServer::POA_ptr root); void create_home_servant_POA (const char *name, const CORBA::PolicyList *p, - PortableServer::POA_ptr root - ACE_ENV_ARG_DECL); + PortableServer::POA_ptr root); - void create_connections_POA (PortableServer::POA_ptr root - ACE_ENV_ARG_DECL); + void create_connections_POA (PortableServer::POA_ptr root); protected: unsigned long number_; diff --git a/CIAO/ciao/Swapping_Container.inl b/CIAO/ciao/Swapping_Container.inl index b2c00a33346..079569724d7 100644 --- a/CIAO/ciao/Swapping_Container.inl +++ b/CIAO/ciao/Swapping_Container.inl @@ -1,10 +1,8 @@ // $Id$ ACE_INLINE CORBA::Object_ptr -CIAO::Swapping_Container::get_objref (PortableServer::Servant p - ACE_ENV_ARG_DECL) +CIAO::Swapping_Container::get_objref (PortableServer::Servant p) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->the_POA ()->servant_to_reference (p - ACE_ENV_ARG_PARAMETER); + return this->the_POA ()->servant_to_reference (p); } diff --git a/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp b/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp index d222e722818..3f1caa25d71 100644 --- a/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp +++ b/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp @@ -18,7 +18,6 @@ namespace CIAO CORBA::IRObject_ptr Swapping_Home_Servant_Impl_Base::get_component_def ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -28,7 +27,6 @@ namespace CIAO CORBA::IRObject_ptr Swapping_Home_Servant_Impl_Base::get_home_def ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h b/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h index 878af2d5d0c..8302d80d16f 100644 --- a/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h +++ b/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h @@ -47,11 +47,11 @@ namespace CIAO // Operations for CCMHome interface. virtual ::CORBA::IRObject_ptr - get_component_def (void) + get_component_def () ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::CORBA::IRObject_ptr - get_home_def (void) + get_home_def () ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp b/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp index 7626549fa51..a349718949e 100644 --- a/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp +++ b/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp @@ -40,16 +40,14 @@ namespace CIAO PortableServer::ObjectId_var oid = PortableServer::string_to_ObjectId (this->obj_id_); - ACE_TRY_NEW_ENV; + try { - this->container_->delete_servant_map (oid ACE_ENV_ARG_PARAMETER); + this->container_->delete_servant_map (oid); } - ACE_CATCHANY; + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "~Swapping_Home_Servant_Impl\t\n"); + ex._tao_print_exception ("~Swapping_Home_Servant_Impl\t\n"); } - ACE_ENDTRY; for (DYNAMIC_SERVANT_MAP_ITERATOR iter = this->dynamic_servant_map_.begin (); @@ -69,7 +67,6 @@ namespace CIAO EXEC, COMP_SVNT>::remove_component ( ::Components::CCMObject_ptr - ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException, Components::RemoveFailure)) @@ -94,7 +91,6 @@ namespace CIAO Swapping_Home_Servant_Impl<BASE_SKEL, EXEC, COMP_SVNT>::create_component ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, Components::CreateFailure)) @@ -111,7 +107,6 @@ namespace CIAO Swapping_Home_Servant_Impl<BASE_SKEL, EXEC, COMP_SVNT>::create ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, Components::CreateFailure)) @@ -126,8 +121,7 @@ namespace CIAO ::Components::EnterpriseComponent_var _ciao_ec = this->executor_->create (); - return this->_ciao_activate_component (_ciao_ec.in () - ACE_ENV_ARG_PARAMETER); + return this->_ciao_activate_component (_ciao_ec.in ()); } // CIAO-specific operations. @@ -140,17 +134,14 @@ namespace CIAO EXEC, COMP_SVNT>::_ciao_activate_component ( ::Components::EnterpriseComponent_ptr ec - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var hobj = - this->container_->get_home_objref (this - ACE_ENV_ARG_PARAMETER); + this->container_->get_home_objref (this); Components::CCMHome_var home = - Components::CCMHome::_narrow (hobj.in () - ACE_ENV_ARG_PARAMETER); + Components::CCMHome::_narrow (hobj.in ()); PortableServer::ObjectId_var oid = PortableServer::string_to_ObjectId (this->obj_id_); @@ -159,8 +150,7 @@ namespace CIAO this->container_->generate_reference ( this->obj_id_, this->repo_id_, - Container::Component - ACE_ENV_ARG_PARAMETER); + Container::Component); Dynamic_Component_Servant_Base *svt = new Dynamic_Component_Servant<COMP_SVNT> (ec, @@ -169,14 +159,13 @@ namespace CIAO this, this->container_); - this->container_->add_servant_map (oid, svt ACE_ENV_ARG_PARAMETER); + this->container_->add_servant_map (oid, svt); this->dynamic_servant_map_.bind (oid.in (), svt); typedef typename COMP_SVNT::_stub_type stub_type; typename COMP_SVNT::_stub_var_type ho = - stub_type::_narrow (objref.in () - ACE_ENV_ARG_PARAMETER); + stub_type::_narrow (objref.in ()); return ho._retn (); } @@ -209,15 +198,13 @@ namespace CIAO EXEC, COMP_SVNT>::_ciao_passivate_component ( typename COMP_SVNT::_stub_ptr_type comp - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid; this->container_->uninstall_component (comp, - oid.out () - ACE_ENV_ARG_PARAMETER); + oid.out ()); COMP_SVNT *servant = 0; diff --git a/CIAO/ciao/Swapping_Servant_Home_Impl_T.h b/CIAO/ciao/Swapping_Servant_Home_Impl_T.h index c08a0fc8d8b..db85bbce784 100644 --- a/CIAO/ciao/Swapping_Servant_Home_Impl_T.h +++ b/CIAO/ciao/Swapping_Servant_Home_Impl_T.h @@ -59,22 +59,21 @@ namespace CIAO // Operations for CCMHome interface. virtual void - remove_component (Components::CCMObject_ptr comp - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + remove_component (Components::CCMObject_ptr comp) ACE_THROW_SPEC ((CORBA::SystemException, Components::RemoveFailure)); // Operations for keyless home interface. virtual ::Components::CCMObject_ptr - create_component (void) + create_component () ACE_THROW_SPEC ((CORBA::SystemException, Components::CreateFailure)); // Operations for implicit home interface. virtual typename COMP_SVNT::_stub_ptr_type - create (void) + create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CreateFailure)); @@ -85,13 +84,11 @@ namespace CIAO // CIAO-specific operations. typename COMP_SVNT::_stub_ptr_type - _ciao_activate_component (::Components::EnterpriseComponent_ptr ec - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + _ciao_activate_component (::Components::EnterpriseComponent_ptr ec) ACE_THROW_SPEC ((CORBA::SystemException)); void - _ciao_passivate_component (typename COMP_SVNT::_stub_ptr_type comp - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + _ciao_passivate_component (typename COMP_SVNT::_stub_ptr_type comp) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/CIAO/ciao/Upgradeable_Context_Impl_T.cpp b/CIAO/ciao/Upgradeable_Context_Impl_T.cpp index cac18e9d2c6..9431da4c67a 100644 --- a/CIAO/ciao/Upgradeable_Context_Impl_T.cpp +++ b/CIAO/ciao/Upgradeable_Context_Impl_T.cpp @@ -37,7 +37,6 @@ namespace CIAO void Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::deactivate_facet ( const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -46,7 +45,7 @@ namespace CIAO PortableServer::string_to_ObjectId (obj_id); */ - this->container_->deactivate_facet (oid ACE_ENV_ARG_PARAMETER); + this->container_->deactivate_facet (oid); } template <typename BASE_CTX, @@ -56,17 +55,16 @@ namespace CIAO void Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>:: remove_facet ( - CORBA::Object_ptr reference - ACE_ENV_ARG_DECL) + CORBA::Object_ptr reference) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = this->container_->the_facet_cons_POA ()->reference_to_id - (reference ACE_ENV_ARG_PARAMETER); + (reference); - this->update_port_activator (oid.in () ACE_ENV_ARG_PARAMETER); + this->update_port_activator (oid.in ()); - this->deactivate_facet (oid.in () ACE_ENV_ARG_PARAMETER); + this->deactivate_facet (oid.in ()); } template <typename BASE_CTX, @@ -76,8 +74,7 @@ namespace CIAO void Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>:: update_port_activator ( - const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL) + const PortableServer::ObjectId &oid) ACE_THROW_SPEC ((CORBA::SystemException)) { /* @@ -87,7 +84,7 @@ namespace CIAO CIAO::Servant_Activator *sa = this->container_->ports_servant_activator (); - sa->update_port_activator (oid ACE_ENV_ARG_PARAMETER); + sa->update_port_activator (oid); } } diff --git a/CIAO/ciao/Upgradeable_Context_Impl_T.h b/CIAO/ciao/Upgradeable_Context_Impl_T.h index dc8d3269fcf..53e171b8eda 100644 --- a/CIAO/ciao/Upgradeable_Context_Impl_T.h +++ b/CIAO/ciao/Upgradeable_Context_Impl_T.h @@ -46,23 +46,19 @@ namespace CIAO virtual ~Upgradeable_Context_Impl (void); virtual void - deactivate_facet (const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + deactivate_facet (const PortableServer::ObjectId &oid) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void - update_port_activator (const PortableServer::ObjectId &oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + update_port_activator (const PortableServer::ObjectId &oid) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void - remove_facet (CORBA::Object_ptr reference - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + remove_facet (CORBA::Object_ptr reference) ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::Components::ConsumerDescriptions * - get_registered_consumers (const char *publisher_name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + get_registered_consumers (const char *publisher_name) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::InvalidName, ::Components::InvalidConnection)) = 0; diff --git a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp index ad5aba294bf..9f6729ea0ef 100644 --- a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp +++ b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp @@ -25,8 +25,7 @@ namespace CIAO EventServiceBase::ciao_push_event ( ::Components::EventBase * evt, const char * source_id, - ::CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::CORBA::TypeCode_ptr tc) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::BadEventType)) diff --git a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h index cec5777ae6e..be9e8f68e36 100644 --- a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h +++ b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h @@ -56,8 +56,7 @@ namespace CIAO * @c supplier_config. */ virtual void connect_event_supplier ( - Supplier_Config_ptr supplier_config - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + Supplier_Config_ptr supplier_config) ACE_THROW_SPEC (( CORBA::SystemException)) = 0; @@ -68,8 +67,7 @@ namespace CIAO * @c consumer_config. */ virtual void connect_event_consumer ( - Consumer_Config_ptr consumer_config - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + Consumer_Config_ptr consumer_config) ACE_THROW_SPEC (( CORBA::SystemException)) = 0; @@ -79,8 +77,7 @@ namespace CIAO * Disconnects the event supplier associated with this object. */ virtual void disconnect_event_supplier ( - const char * consumer_id - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + const char * consumer_id) ACE_THROW_SPEC (( CORBA::SystemException, Components::InvalidConnection)) = 0; @@ -91,8 +88,7 @@ namespace CIAO * Disconnects the event consumer with UUID @c consumer_id. */ virtual void disconnect_event_consumer ( - const char * consumer_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const char * consumer_id) ACE_THROW_SPEC (( CORBA::SystemException, Components::InvalidConnection)) = 0; @@ -103,20 +99,18 @@ namespace CIAO * Pushes event @c ev to all consumers. */ virtual void push_event ( - Components::EventBase * ev - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + Components::EventBase * ev) ACE_THROW_SPEC (( CORBA::SystemException)) = 0; /** - * Pushes event @c ev to all consumers. The source id of the + * Pushes event @c ev to all consumers. The source id of the * supplier is specified through @c source_id. */ virtual void ciao_push_event ( ::Components::EventBase * evt, const char * source_id, - ::CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::CORBA::TypeCode_ptr tc) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::BadEventType)); @@ -127,23 +121,19 @@ namespace CIAO { public: virtual void start_conjunction_group ( - ::CORBA::Long size - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::CORBA::Long size) ACE_THROW_SPEC ((::CORBA::SystemException)) = 0; virtual void start_disjunction_group ( - ::CORBA::Long size - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::CORBA::Long size) ACE_THROW_SPEC ((::CORBA::SystemException)) = 0; virtual void insert_source ( - const char * source_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const char * source_id) ACE_THROW_SPEC ((::CORBA::SystemException)) = 0; virtual void insert_type ( - ::CORBA::Long event_type - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::CORBA::Long event_type) ACE_THROW_SPEC ((::CORBA::SystemException)) = 0; }; } diff --git a/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp b/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp index b96b5230a96..1ef5b1ad889 100644 --- a/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp +++ b/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp @@ -71,8 +71,7 @@ namespace CIAO // to multiple event suppliers. void RTEventService::connect_event_supplier ( - Supplier_Config_ptr supplier_config - ACE_ENV_ARG_DECL) + Supplier_Config_ptr supplier_config) ACE_THROW_SPEC (( CORBA::SystemException)) { @@ -82,12 +81,11 @@ namespace CIAO } RTEvent_Supplier_Config_ptr rt_config = - RTEvent_Supplier_Config::_narrow (supplier_config - ACE_ENV_ARG_PARAMETER); + RTEvent_Supplier_Config::_narrow (supplier_config); if (CORBA::is_nil (rt_config)) { - ACE_THROW (CORBA::BAD_PARAM ()); + throw CORBA::BAD_PARAM (); } // Get a proxy push consumer from the EventChannel. @@ -116,8 +114,7 @@ namespace CIAO 1); proxy_push_consumer->connect_push_supplier (push_supplier.in (), - supplier_qos.get_SupplierQOS () - ACE_ENV_ARG_PARAMETER); + supplier_qos.get_SupplierQOS ()); this->proxy_consumer_map_.bind ( @@ -127,8 +124,7 @@ namespace CIAO void RTEventService::connect_event_consumer ( - Consumer_Config_ptr consumer_config - ACE_ENV_ARG_DECL) + Consumer_Config_ptr consumer_config) ACE_THROW_SPEC (( CORBA::SystemException)) { @@ -138,12 +134,11 @@ namespace CIAO } RTEvent_Consumer_Config_ptr rt_config = - RTEvent_Consumer_Config::_narrow (consumer_config - ACE_ENV_ARG_PARAMETER); + RTEvent_Consumer_Config::_narrow (consumer_config); if (CORBA::is_nil (rt_config)) { - ACE_THROW (CORBA::BAD_PARAM ()); + throw CORBA::BAD_PARAM (); } Components::EventConsumerBase_var consumer = @@ -187,7 +182,7 @@ namespace CIAO proxy_supplier->connect_push_consumer (push_consumer.in (), qos.in () //qos_factory.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + ); ACE_CString consumer_id = consumer_config->consumer_id (); @@ -197,8 +192,7 @@ namespace CIAO void RTEventService::disconnect_event_supplier ( - const char * connection_id - ACE_ENV_ARG_DECL) + const char * connection_id) ACE_THROW_SPEC (( CORBA::SystemException, Components::InvalidConnection)) @@ -209,14 +203,12 @@ namespace CIAO this->proxy_consumer_map_.unbind (connection_id, proxy_consumer); - proxy_consumer->disconnect_push_consumer ( - ACE_ENV_SINGLE_ARG_PARAMETER); + proxy_consumer->disconnect_push_consumer (); } void RTEventService::disconnect_event_consumer ( - const char * connection_id - ACE_ENV_ARG_DECL) + const char * connection_id) ACE_THROW_SPEC (( CORBA::SystemException, Components::InvalidConnection)) @@ -225,14 +217,12 @@ namespace CIAO this->proxy_supplier_map_.unbind (connection_id, proxy_supplier); - proxy_supplier->disconnect_push_supplier ( - ACE_ENV_SINGLE_ARG_PARAMETER); + proxy_supplier->disconnect_push_supplier (); } void RTEventService::push_event ( - Components::EventBase * ev - ACE_ENV_ARG_DECL) + Components::EventBase * ev) ACE_THROW_SPEC (( CORBA::SystemException)) { @@ -247,8 +237,7 @@ namespace CIAO RTEventService::ciao_push_event ( Components::EventBase * ev, const char * source_id, - CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) + CORBA::TypeCode_ptr tc) ACE_THROW_SPEC (( CORBA::SystemException, Components::BadEventType)) @@ -291,10 +280,10 @@ namespace CIAO ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) - RTEventService::ciao_push_event, " "Error in finding the proxy consumer object.\n")); - ACE_THROW (Components::BadEventType ()); + throw Components::BadEventType (); } - proxy_consumer->push (events ACE_ENV_ARG_PARAMETER); + proxy_consumer->push (events); } void @@ -333,8 +322,7 @@ namespace CIAO RTEventService::create_addr_serv ( const char * name, ::CORBA::UShort port, - const char * address - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const char * address) ACE_THROW_SPEC (( ::CORBA::SystemException)) { @@ -381,8 +369,7 @@ namespace CIAO ::CORBA::Boolean RTEventService::create_sender ( - const char * addr_serv_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const char * addr_serv_id) ACE_THROW_SPEC (( ::CORBA::SystemException)) { @@ -405,8 +392,7 @@ namespace CIAO TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender = TAO_ECG_UDP_Sender::create(); sender->init (this->rt_event_channel_.in (), addr_srv.in (), - endpoint - ACE_ENV_ARG_PARAMETER); + endpoint); // Setup the subscription and connect to the EC ACE_ConsumerQOS_Factory cons_qos_fact; @@ -423,8 +409,7 @@ namespace CIAO RTEventService::create_receiver ( const char * addr_serv_id, ::CORBA::Boolean is_multicast, - ::CORBA::UShort listen_port - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::CORBA::UShort listen_port) ACE_THROW_SPEC (( ::CORBA::SystemException)) { @@ -504,7 +489,7 @@ namespace CIAO ::RtecEventChannelAdmin::EventChannel_ptr - RTEventService::tao_rt_event_channel (void) + RTEventService::tao_rt_event_channel () ACE_THROW_SPEC ((::CORBA::SystemException)) { return this->rt_event_channel_.in (); @@ -561,7 +546,7 @@ namespace CIAO ACE_OS::printf("%s\n", out.str().c_str()); // printf is synchronized Components::EventBase * ev = 0; - ACE_TRY + try { TAO::Unknown_IDL_Type *unk = dynamic_cast<TAO::Unknown_IDL_Type *> (events[i].data.any_value.impl ()); @@ -570,8 +555,7 @@ namespace CIAO if (for_reading >> ev) { ev->_add_ref (); - this->event_consumer_->push_event (ev - ACE_ENV_ARG_PARAMETER); + this->event_consumer_->push_event (ev); } else { @@ -579,14 +563,12 @@ namespace CIAO "failed to extract event\n")); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_ERROR ((LM_ERROR, "CORBA EXCEPTION caught\n")); - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "RTEventServiceConsumer_impl::push()\n"); + ex._tao_print_exception ("RTEventServiceConsumer_impl::push()\n"); } - ACE_ENDTRY; } } @@ -627,8 +609,7 @@ namespace CIAO void RTEvent_Supplier_Config_impl::supplier_id ( - const char * supplier_id - ACE_ENV_ARG_DECL) + const char * supplier_id) ACE_THROW_SPEC (( CORBA::SystemException)) { @@ -660,8 +641,7 @@ namespace CIAO } CONNECTION_ID - RTEvent_Supplier_Config_impl::supplier_id ( - ACE_ENV_SINGLE_ARG_DECL) + RTEvent_Supplier_Config_impl::supplier_id () ACE_THROW_SPEC (( CORBA::SystemException)) { @@ -669,8 +649,7 @@ namespace CIAO } EventServiceType - RTEvent_Supplier_Config_impl::service_type ( - ACE_ENV_SINGLE_ARG_DECL) + RTEvent_Supplier_Config_impl::service_type () ACE_THROW_SPEC (( CORBA::SystemException)) { @@ -678,8 +657,7 @@ namespace CIAO } RtecEventChannelAdmin::SupplierQOS * - RTEvent_Supplier_Config_impl::rt_event_qos ( - ACE_ENV_SINGLE_ARG_DECL) + RTEvent_Supplier_Config_impl::rt_event_qos () ACE_THROW_SPEC (( CORBA::SystemException)) { @@ -691,8 +669,7 @@ namespace CIAO } void - RTEvent_Supplier_Config_impl::destroy ( - ACE_ENV_SINGLE_ARG_DECL) + RTEvent_Supplier_Config_impl::destroy () ACE_THROW_SPEC (( CORBA::SystemException)) { @@ -719,7 +696,7 @@ namespace CIAO void RTEvent_Consumer_Config_impl::start_conjunction_group ( - CORBA::Long size ACE_ENV_ARG_DECL) + CORBA::Long size) ACE_THROW_SPEC (( CORBA::SystemException)) { @@ -731,8 +708,7 @@ namespace CIAO void RTEvent_Consumer_Config_impl::start_disjunction_group ( - CORBA::Long size - ACE_ENV_ARG_DECL) + CORBA::Long size) ACE_THROW_SPEC (( CORBA::SystemException)) { @@ -745,8 +721,7 @@ namespace CIAO void RTEvent_Consumer_Config_impl::insert_source ( - const char * source_id - ACE_ENV_ARG_DECL) + const char * source_id) ACE_THROW_SPEC (( CORBA::SystemException)) { @@ -761,8 +736,7 @@ namespace CIAO void RTEvent_Consumer_Config_impl::insert_type ( - ::CORBA::Long event_type - ACE_ENV_ARG_DECL) + ::CORBA::Long event_type) ACE_THROW_SPEC ((::CORBA::SystemException)) { if (event_type == 0L) @@ -774,8 +748,7 @@ namespace CIAO void RTEvent_Consumer_Config_impl::consumer_id ( - const char * consumer_id - ACE_ENV_ARG_DECL) + const char * consumer_id) ACE_THROW_SPEC (( CORBA::SystemException)) { @@ -792,8 +765,7 @@ namespace CIAO void RTEvent_Consumer_Config_impl::consumer ( - Components::EventConsumerBase_ptr consumer - ACE_ENV_ARG_DECL) + Components::EventConsumerBase_ptr consumer) ACE_THROW_SPEC (( CORBA::SystemException)) { @@ -801,8 +773,7 @@ namespace CIAO } CONNECTION_ID - RTEvent_Consumer_Config_impl::consumer_id ( - ACE_ENV_SINGLE_ARG_DECL) + RTEvent_Consumer_Config_impl::consumer_id () ACE_THROW_SPEC (( CORBA::SystemException)) { @@ -811,8 +782,7 @@ namespace CIAO EventServiceType - RTEvent_Consumer_Config_impl::service_type ( - ACE_ENV_SINGLE_ARG_DECL) + RTEvent_Consumer_Config_impl::service_type () ACE_THROW_SPEC (( CORBA::SystemException)) { @@ -820,8 +790,7 @@ namespace CIAO } Components::EventConsumerBase_ptr - RTEvent_Consumer_Config_impl::consumer ( - ACE_ENV_SINGLE_ARG_DECL) + RTEvent_Consumer_Config_impl::consumer () ACE_THROW_SPEC (( CORBA::SystemException)) { @@ -834,8 +803,7 @@ namespace CIAO } RtecEventChannelAdmin::ConsumerQOS * - RTEvent_Consumer_Config_impl::rt_event_qos ( - ACE_ENV_SINGLE_ARG_DECL) + RTEvent_Consumer_Config_impl::rt_event_qos () ACE_THROW_SPEC (( CORBA::SystemException)) { @@ -848,8 +816,7 @@ namespace CIAO } void - RTEvent_Consumer_Config_impl::destroy ( - ACE_ENV_SINGLE_ARG_DECL) + RTEvent_Consumer_Config_impl::destroy () ACE_THROW_SPEC (( CORBA::SystemException)) { diff --git a/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h b/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h index a5b0d3741d9..7737643b0a4 100644 --- a/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h +++ b/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h @@ -69,43 +69,37 @@ namespace CIAO ACE_THROW_SPEC ((CORBA::SystemException)); virtual void connect_event_supplier ( - CIAO::Supplier_Config_ptr supplier_config - ACE_ENV_ARG_DECL) + CIAO::Supplier_Config_ptr supplier_config) ACE_THROW_SPEC (( CORBA::SystemException)); virtual void connect_event_consumer ( - CIAO::Consumer_Config_ptr consumer_config - ACE_ENV_ARG_DECL) + CIAO::Consumer_Config_ptr consumer_config) ACE_THROW_SPEC (( CORBA::SystemException)); virtual void disconnect_event_supplier ( - const char * consumer_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const char * consumer_id) ACE_THROW_SPEC (( CORBA::SystemException, Components::InvalidConnection)); virtual void disconnect_event_consumer ( - const char * connection_id - ACE_ENV_ARG_DECL) + const char * connection_id) ACE_THROW_SPEC (( CORBA::SystemException, Components::InvalidConnection)); virtual void push_event ( - Components::EventBase * ev - ACE_ENV_ARG_DECL) + Components::EventBase * ev) ACE_THROW_SPEC (( CORBA::SystemException)); virtual void ciao_push_event ( Components::EventBase * evt, const char * source_id, - CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::TypeCode_ptr tc) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::BadEventType)); @@ -113,27 +107,23 @@ namespace CIAO virtual ::CORBA::Boolean create_addr_serv ( const char * name, ::CORBA::UShort port, - const char * address - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const char * address) ACE_THROW_SPEC (( ::CORBA::SystemException)); virtual ::CORBA::Boolean create_sender ( - const char * addr_serv_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const char * addr_serv_id) ACE_THROW_SPEC (( ::CORBA::SystemException)); virtual ::CORBA::Boolean create_receiver ( const char * addr_serv_id, ::CORBA::Boolean is_multicast, - ::CORBA::UShort listen_port - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::CORBA::UShort listen_port) ACE_THROW_SPEC (( ::CORBA::SystemException)); virtual ::RtecEventChannelAdmin::EventChannel_ptr tao_rt_event_channel ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((::CORBA::SystemException)); @@ -208,8 +198,7 @@ namespace CIAO RTEventServiceSupplier_impl ( PortableServer::POA_ptr poa); - virtual void disconnect_push_supplier ( - ACE_ENV_SINGLE_ARG_DECL) + virtual void disconnect_push_supplier () ACE_THROW_SPEC (( CORBA::SystemException)); @@ -237,8 +226,7 @@ namespace CIAO ACE_THROW_SPEC (( CORBA::SystemException)); - virtual void disconnect_push_consumer ( - ACE_ENV_SINGLE_ARG_DECL) + virtual void disconnect_push_consumer () ACE_THROW_SPEC (( CORBA::SystemException)); @@ -267,47 +255,46 @@ namespace CIAO virtual ~RTEvent_Consumer_Config_impl (void); - virtual void start_conjunction_group (CORBA::Long size ACE_ENV_ARG_DECL) + virtual void start_conjunction_group (CORBA::Long size) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void start_disjunction_group (CORBA::Long size ACE_ENV_ARG_DECL) + virtual void start_disjunction_group (CORBA::Long size) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void insert_source (const char * source_id ACE_ENV_ARG_DECL) + virtual void insert_source (const char * source_id) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void insert_type (::CORBA::Long event_type - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void insert_type (::CORBA::Long event_type) ACE_THROW_SPEC ((::CORBA::SystemException)); - virtual void consumer_id (const char * consumer_id ACE_ENV_ARG_DECL) + virtual void consumer_id (const char * consumer_id) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CONNECTION_ID consumer_id (void) + virtual CONNECTION_ID consumer_id () ACE_THROW_SPEC ((CORBA::SystemException)); - //virtual void supplier_id (const char * supplier_id ACE_ENV_ARG_DECL) + //virtual void supplier_id (const char * supplier_id) // ACE_THROW_SPEC ((CORBA::SystemException)); - //virtual CONNECTION_ID supplier_id (void) + //virtual CONNECTION_ID supplier_id () // ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void consumer (Components::EventConsumerBase_ptr consumer ACE_ENV_ARG_DECL) + virtual void consumer (Components::EventConsumerBase_ptr consumer) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual Components::EventConsumerBase_ptr consumer (void) + virtual Components::EventConsumerBase_ptr consumer () ACE_THROW_SPEC ((CORBA::SystemException)); - virtual EventServiceType service_type (void) + virtual EventServiceType service_type () ACE_THROW_SPEC ((CORBA::SystemException)); //@@ (GD) There should be a place where the deployment tool could // set up the rt_event_qos properties for Consumer Config. - virtual RtecEventChannelAdmin::ConsumerQOS * rt_event_qos (void) + virtual RtecEventChannelAdmin::ConsumerQOS * rt_event_qos () ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (void) + virtual void destroy () ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -339,22 +326,22 @@ namespace CIAO virtual ~RTEvent_Supplier_Config_impl (void); - void supplier_id (const char * supplier_id ACE_ENV_ARG_DECL) + void supplier_id (const char * supplier_id) ACE_THROW_SPEC ((CORBA::SystemException)); - CONNECTION_ID supplier_id (void) + CONNECTION_ID supplier_id () ACE_THROW_SPEC ((CORBA::SystemException)); - EventServiceType service_type (void) + EventServiceType service_type () ACE_THROW_SPEC ((CORBA::SystemException)); //@@ (GD) There should be a place where the deployment tool could // set up the rt_event_qos properties for Supplier Config. - RtecEventChannelAdmin::SupplierQOS * rt_event_qos (void) + RtecEventChannelAdmin::SupplierQOS * rt_event_qos () ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (void) + virtual void destroy () ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp b/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp index d04a8528e9a..cdce7218291 100644 --- a/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp +++ b/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp @@ -23,8 +23,7 @@ SimpleAddressServer::get_addr (const RtecEventComm::EventHeader&, /* void SimpleAddressServer::get_ip_address (const RtecEventComm::EventHeader&, - RtecUDPAdmin::UDP_IP_Address_out address - ACE_ENV_ARG_DECL) + RtecUDPAdmin::UDP_IP_Address_out address) throw (CORBA::SystemException) { address = new RtecUDPAdmin::UDP_IP_Address; diff --git a/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h b/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h index 9e149226d53..5a69d3171dc 100644 --- a/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h +++ b/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h @@ -28,8 +28,7 @@ public: /* virtual void get_ip_address (const RtecEventComm::EventHeader& header, - RtecUDPAdmin::UDP_IP_Address_out address - ACE_ENV_ARG_DECL) + RtecUDPAdmin::UDP_IP_Address_out address) throw (CORBA::SystemException); */ private: diff --git a/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp b/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp index fd35f47a555..aedbcd3769b 100644 --- a/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp +++ b/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp @@ -33,7 +33,7 @@ // get_component implementation. CORBA::Object_ptr -[ciao module name]::[facet type]_Servant::_get_component (void) +[ciao module name]::[facet type]_Servant::_get_component () ACE_THROW_SPEC ((CORBA::SystemException)) { ::Components::SessionContext_var sc = @@ -64,7 +64,7 @@ CORBA::Object_ptr // [receptacle name]Connections typedef'ed as a sequence of // struct [receptacle name]Connection. [receptacle name]Connections * -[ciao module name]::[component name]_Context::get_connections_[receptacle name] (void) +[ciao module name]::[component name]_Context::get_connections_[receptacle name] () ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Strategized locking here. @@ -93,13 +93,11 @@ CORBA::Object_ptr ##foreach [event name] with [eventtype] in (list of all event sources) generate: void -[ciao module name]::[component name]_Context::push_[event name] ([eventtype] *ev - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Context::push_[event name] ([eventtype] *ev) ACE_THROW_SPEC ((CORBA::SystemException)) { ## if [event name] belongs to an 'emits' port - this->ciao_emits_[event name]_consumer_->push_[event name] (ev - ACE_ENV_ARG_PARAMETER); + this->ciao_emits_[event name]_consumer_->push_[event name] (ev); ## else [event name] belongs to a 'publishes' port ACE_Active_Map_Manager<[eventtype]Consumer_var>::iterator @@ -112,8 +110,7 @@ void ACE_Active_Map_Manager<[eventtype]Consumer_var>::ENTRY &entry = *iter; [eventtype]Consumer_var c = [eventtype]Consumer::_narrow (entry.int_id_.in ()); - c->push_[eventtype] (ev - ACE_ENV_ARG_PARAMETER); + c->push_[eventtype] (ev); } ## endif [event name] } @@ -124,8 +121,7 @@ void // Operations for publishes interfaces. ##foreach [publish name] with [eventtype] in (list of all publishers) generate: ::Components::Cookie * -[ciao module name]::[component name]_Context::subscribe_[publish name] ([eventtype]Consumer_ptr c - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Context::subscribe_[publish name] ([eventtype]Consumer_ptr c) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::ExceededConnectionLimit)) { @@ -146,8 +142,7 @@ void } [eventtype]Consumer_ptr -[ciao module name]::[component name]_Context::unsubscribe_[publish name] (::Components::Cookie *ck - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Context::unsubscribe_[publish name] (::Components::Cookie *ck) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::InvalidConnection)) { @@ -172,7 +167,7 @@ void ## if [receptacle name] is a simplex receptacle ('uses') [uses type]_ptr -[ciao module name]::[component name]_Context::get_connection_[receptacle name] (void) +[ciao module name]::[component name]_Context::get_connection_[receptacle name] () ACE_THROW_SPEC ((CORBA::SystemException)) { return [uses type]::_duplicate (this->ciao_uses_[receptacle name]_.in ()); @@ -180,29 +175,28 @@ void // Simplex [receptacle name] connection management operations void -[ciao module name]::[component name]_Context::connect_[receptacle name] ([uses type]_ptr c - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Context::connect_[receptacle name] ([uses type]_ptr c) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::AlreadyConnected, ::Components::InvalidConnection)) { if (! CORBA::is_nil (this->ciao_uses_[receptacle name]_.in ())) - ACE_THROW (::Components::AlreadyConnected ()); + throw ::Components::AlreadyConnected (); if (CORBA::is_nil (c)) - ACE_THROW (::Components::InvalidConnection ()); + throw ::Components::InvalidConnection (); // When do we throw InvalidConnection exception? this->ciao_uses_[receptacle name]_ = [uses type]::_duplicate (c); } [uses type]_ptr -[ciao module name]::[component name]_Context::disconnect_[receptacle name] (void) +[ciao module name]::[component name]_Context::disconnect_[receptacle name] () ACE_THROW_SPEC ((CORBA::SystemException, ::Components::NoConnection)) { if (CORBA::is_nil (this->ciao_uses_[receptacle name]_.in ())) - ACE_THROW (::Components::NoConnection ()); + throw ::Components::NoConnection (); return this->ciao_uses_[receptacle name]_._retn (); } @@ -210,8 +204,7 @@ void ## else ([receptacle name] is a multiplex ('uses multiple') receptacle) // Multiplex [receptacle name] connection management operations ::Components::Cookie * -[ciao module name]::[component name]_Context::connect_[receptacle name] ([uses type]_ptr c - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Context::connect_[receptacle name] ([uses type]_ptr c) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::ExceedConnectionLimit, ::Components::InvalidConnection)) @@ -233,8 +226,7 @@ void } [uses type]_ptr -[ciao module name]::[component name]_Context::disconnect_[receptacle name] (::Components::Cookie *ck - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Context::disconnect_[receptacle name] (::Components::Cookie *ck) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::InvalidConnection)) { @@ -257,7 +249,7 @@ void // Operations for ::Components::SessionContext interface CORBA::Object_ptr -[ciao module name]::[component name]_Context::get_CCM_object (void) +[ciao module name]::[component name]_Context::get_CCM_object () ACE_THROW_SPEC ((CORBA::SystemException, Components::IllegalState)) { @@ -267,11 +259,9 @@ CORBA::Object_ptr if (CORBA::is_nil (this->component_.in ())) { - CORBA::Object_var obj = this->container_->get_objref (this->servant_ - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var obj = this->container_->get_objref (this->servant_); - this->component_ = [component name]::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + this->component_ = [component name]::_narrow (obj.in ()); if (CORBA::is_nil (this->component_.in ())) ACE_THROW_RETURN (CORBA::INTERNAL (), 0); // This should not happen... @@ -291,41 +281,36 @@ CORBA::Object_ptr { this->context_ = new [ciao module name]::[component name]_Context (h, c, this); - ACE_TRY_NEW_ENV + try { Components::SessionComponent_var scom = - Components::SessionComponent::_narrow (exe - ACE_ENV_ARG_PARAMETER); + Components::SessionComponent::_narrow (exe); if (! CORBA::is_nil (scom.in ())) - scom->set_session_context (this->context_ - ACE_ENV_ARG_PARAMETER); + scom->set_session_context (this->context_); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // @@ Ignore any exceptions? What happens if // set_session_context throws an CCMException? } - ACE_ENDTRY; } [ciao module name]::[component name]_Servant::~[component name]_Servant (void) { - ACE_TRY_NEW_ENV + try { Components::SessionComponent_var scom = - Components::SessionComponent::_narrow (this->executor_.in () - ACE_ENV_ARG_PARAMETER); + Components::SessionComponent::_narrow (this->executor_.in ()); if (! CORBA::is_nil (scom.in ())) scom->ccm_remove (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // @@ Ignore any exceptions? What happens if // set_session_context throws an CCMException? } - ACE_ENDTRY; this->context_->_remove_ref (); } @@ -333,7 +318,7 @@ CORBA::Object_ptr ##foreach [facet name] with [facet type] in (list of all provided interfaces) generate: [facet type]_ptr -[ciao module name]::[component name]_Servant::provide_[facet name] (void) +[ciao module name]::[component name]_Servant::provide_[facet name] () ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (this->provide_[facet name]_.in ())) @@ -348,11 +333,9 @@ CORBA::Object_ptr this->context_); PortableServer::ServantBase_var safe_servant (svt); - CORBA::Object_var obj = this->container_->install_servant (svt - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var obj = this->container_->install_servant (svt); - [facet type]_var fo = [facet type]::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + [facet type]_var fo = [facet type]::_narrow (obj.in ()); this->provide_[facet name]_ = fo; } @@ -368,27 +351,25 @@ CORBA::Object_ptr // Inherit from ::Compopnents::EventBConsumerBase void -[ciao module name]::[component name]_Servant::[eventtype]Consumer_[consumer name]_Servant::push_event (EventBase *ev - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Servant::[eventtype]Consumer_[consumer name]_Servant::push_event (EventBase *ev) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::BadEventType)) { [eventtype]_var ev_type = [eventtype]::_downcast (ev); if (ev_type != 0) { - this->push_[eventtype] (ev_type.in () - ACE_ENV_ARG_PARAMETER); + this->push_[eventtype] (ev_type.in ()); return; } // @@ This include the case when we receive a parent eventtype of [eventtype] - ACE_THROW (::Components::BadEventType ()); + throw ::Components::BadEventType (); } // get_component implementation. [eventtype]Consumer_ptr -[ciao module name]::[component name]_Servant::get_consumer_[consumer name] (void) +[ciao module name]::[component name]_Servant::get_consumer_[consumer name] () ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (this->consumes_[consumer name]_.in ())) @@ -398,11 +379,9 @@ void this->context_); PortableServer::ServantBase_var safe_servant (svt); - CORBA::Object_var obj = this->container_->install_servant (svt - ACE_ENV_ARG_PARAMETER); + CORBA::Object_var obj = this->container_->install_servant (svt); - [eventtype]Consumer_var eco = [eventtype]Consumer::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + [eventtype]Consumer_var eco = [eventtype]Consumer::_narrow (obj.in ()); this->consumes_[consumer name]_ = eco; } @@ -414,8 +393,7 @@ void // Operations for Navigation interface CORBA::Object_ptr -[ciao module name]::[component name]_Servant::provide_facet (const char * name - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Servant::provide_facet (const char * name) ACE_THROW_SPEC ((CORBA::SystemException , Components::InvalidName)) { @@ -436,7 +414,7 @@ CORBA::Object_ptr } ::Components::FacetDescriptions * -[ciao module name]::[component name]_Servant::get_all_facets (void) +[ciao module name]::[component name]_Servant::get_all_facets () ACE_THROW_SPEC ((CORBA::SystemException)) { ::Components::FacetDescriptions_var collection @@ -465,8 +443,7 @@ CORBA::Object_ptr } ::Components::FacetDescriptions * -[ciao module name]::[component name]_Servant::get_named_facets (const Components::NameList & names - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Servant::get_named_facets (const Components::NameList & names) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)) { @@ -498,8 +475,7 @@ CORBA::Object_ptr } CORBA::Boolean -[ciao module name]::[component name]_Servant::same_component (CORBA::Object_ptr object_ref - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Servant::same_component (CORBA::Object_ptr object_ref) ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (object_ref)) @@ -509,15 +485,13 @@ CORBA::Boolean CORBA::Object_var me = this->context_->get_CCM_object (); - return me->_is_equivalent (object_ref - ACE_ENV_ARG_PARAMETER); + return me->_is_equivalent (object_ref); } // Operations for Receptacles interface ::Components::Cookie * [ciao module name]::[component name]_Servant::connect (const char * name, - CORBA::Object_ptr connection - ACE_ENV_ARG_DECL) + CORBA::Object_ptr connection) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName, Components::InvalidConnection, @@ -532,19 +506,16 @@ CORBA::Boolean if (ACE_OS_String::strcmp (name, "[receptacle name]") == 0) { [uses type]_var _ciao_conn = - [uses type]::_narrow (connection - ACE_ENV_ARG_PARAMETER); + [uses type]::_narrow (connection); if (CORBA::is_nil (_ciao_conn.in ())) ACE_THROW_RETURN (::Components::InvalidConnection (), 0); ## if [receptacle name] is a simplex receptacle ('uses') - this->connect_[receptacle name] (_caio_conn.in () - ACE_ENV_ARG_PARAMETER); + this->connect_[receptacle name] (_caio_conn.in ()); return 0; ## else ([receptacle name] is a multiplex ('uses multiple') receptacle) - return this->connect_[receptacle name] (_ciao_conn.in () - ACE_ENV_ARG_PARAMETER); + return this->connect_[receptacle name] (_ciao_conn.in ()); ## endif [receptacle name] } ##end foreach [receptacle name] with [uses type] @@ -562,8 +533,7 @@ CORBA::Boolean CORBA::Object_ptr [ciao module name]::[component name]_Servant::disconnect (const char * name, - Components::Cookie *ck - ACE_ENV_ARG_DECL) + Components::Cookie *ck) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName, Components::InvalidConnection, @@ -579,8 +549,7 @@ CORBA::Object_ptr ## if [receptacle name] is a simplex receptacle ('uses') return this->disconnect_[receptacle name] (); ## else ([receptacle name] is a multiplex ('uses multiple') receptacle) - return this->connect_[receptacle name] (ck - ACE_ENV_ARG_PARAMETER); + return this->connect_[receptacle name] (ck); ## endif [receptacle name] ##end foreach [receptacle name] with [uses type] @@ -588,8 +557,7 @@ CORBA::Object_ptr } ::Components::ConnectionDescriptions * -[ciao module name]::[component name]_Servant::get_connections (const char * name - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Servant::get_connections (const char * name) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)) { @@ -621,7 +589,7 @@ CORBA::Object_ptr } ::Components::ReceptacleDescriptions * -[ciao module name]::[component name]_Servant::get_all_receptacles (void) +[ciao module name]::[component name]_Servant::get_all_receptacles () ACE_THROW_SPEC ((CORBA::SystemException)) { ::Components::ReceptacleDescriptions_var retv = @@ -640,8 +608,7 @@ CORBA::Object_ptr ## else ([receptacle name] is a multiplex ('uses multiple') receptacle) retv[i]->is_multiple (1); ## endif [receptacle name] - retv[i]->connections (*this->get_connections ("[receptacle name]" - ACE_ENV_ARG_PARAMETER)); + retv[i]->connections (*this->get_connections ("[receptacle name]")); ++i; ##end foreach [receptacle name] with [uses type] @@ -649,8 +616,7 @@ CORBA::Object_ptr } ::Components::ReceptacleDescriptions * -[ciao module name]::[component name]_Servant::get_named_receptacles (const Components::NameList & names - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Servant::get_named_receptacles (const Components::NameList & names) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)) { @@ -672,8 +638,7 @@ CORBA::Object_ptr ## else ([receptacle name] is a multiplex ('uses multiple') receptacle) retv[i]->is_multiple (1); ## endif [receptacle name] - retv[i]->connections (*this->get_connections ("[receptacle name]" - ACE_ENV_ARG_PARAMETER)); + retv[i]->connections (*this->get_connections ("[receptacle name]")); } ##end foreach [receptacle name] with [uses type] else @@ -684,8 +649,7 @@ CORBA::Object_ptr // Operations for Events interface ::Components::EventConsumerBase_ptr -[ciao module name]::[component name]_Servant::get_consumer (const char * sink_name - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Servant::get_consumer (const char * sink_name) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)) { @@ -702,8 +666,7 @@ CORBA::Object_ptr ::Components::Cookie * [ciao module name]::[component name]_Servant::subscribe (const char * publisher_name, - Components::EventConsumerBase_ptr subscriber - ACE_ENV_ARG_DECL) + Components::EventConsumerBase_ptr subscriber) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName, Components::InvalidConnection, @@ -717,14 +680,12 @@ CORBA::Object_ptr if (ACE_OS_String::strcmp (publisher_name, "[publish name]") == 0) { [eventtype]Consumer_var _ciao_consumer = - [eventtype]Consumer::_narrow (subscriber - ACE_ENV_ARG_PARAMETER); + [eventtype]Consumer::_narrow (subscriber); if (CORBA::is_nil (_ciao_consumer.in ())) ACE_THROW_RETURN (Components::InvalidConnection (), 0); - return this->subscribe_[publish name] (_ciao_consumer.in () - ACE_ENV_ARG_PARAMETER); + return this->subscribe_[publish name] (_ciao_consumer.in ()); } ##end foreach [publish name] with [eventtype] @@ -733,8 +694,7 @@ CORBA::Object_ptr ::Components::EventConsumerBase_ptr [ciao module name]::[component name]_Servant::unsubscribe (const char * publisher_name, - Components::Cookie *ck - ACE_ENV_ARG_DECL) + Components::Cookie *ck) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName, Components::InvalidConnection)) @@ -746,8 +706,7 @@ CORBA::Object_ptr ##foreach [publish name] with [eventtype] in (list of all publishers) generate: if (ACE_OS_String::strcmp (publisher_name, "[publish name]") == 0) { - return this->unsubscribe_[publish name] (ck - ACE_ENV_ARG_PARAMETER); + return this->unsubscribe_[publish name] (ck); } ##end foreach [publish name] with [eventtype] @@ -756,8 +715,7 @@ CORBA::Object_ptr void [ciao module name]::[component name]_Servant::connect_consumer (const char * emitter_name, - Components::EventConsumerBase_ptr consumer - ACE_ENV_ARG_DECL) + Components::EventConsumerBase_ptr consumer) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName, Components::AlreadyConnected, @@ -765,30 +723,27 @@ void { // @@ We can omit this if clause if there's no emitter in this component. if (emitter_name == 0) - ACE_THROW (Components::InvalidName ()); + throw Components::InvalidName (); ##foreach [emit name] with [eventtype] in (list of all emitters) generate: if (ACE_OS_String::strcmp (emitter_name, "[emit name]") == 0) { [eventtype]Consumer_var _ciao_consumer = - [eventtype]Consumer::_narrow (consumer - ACE_ENV_ARG_PARAMETER); + [eventtype]Consumer::_narrow (consumer); if (CORBA::is_nil (_ciao_consumer.in ())) - ACE_THROW (Components::InvalidConnection); + throw Components::InvalidConnection; - this->connect_[emit name] (_ciao_consumer.in () - ACE_ENV_ARG_PARAMETER); + this->connect_[emit name] (_ciao_consumer.in ()); return; } ##end foreach [emit name] with [eventtype] - ACE_THROW (Components::InvalidName ()); + throw Components::InvalidName (); } ::Components::EventConsumerBase_ptr -[ciao module name]::[component name]_Servant::disconnect_consumer (const char * source_name - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Servant::disconnect_consumer (const char * source_name) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName, Components::NoConnection)) @@ -808,7 +763,7 @@ void } ::Components::ConsumerDescriptions * -[ciao module name]::[component name]_Servant::get_all_consumers (void) +[ciao module name]::[component name]_Servant::get_all_consumers () ACE_THROW_SPEC ((CORBA::SystemException)) { ::Components::ConsumerDescriptions_var retv = @@ -833,8 +788,7 @@ void } ::Components::ConsumerDescriptions * -[ciao module name]::[component name]_Servant::get_named_consumers (const Components::NameList & names - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Servant::get_named_consumers (const Components::NameList & names) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)) { @@ -865,7 +819,7 @@ void } ::Components::EmitterDescriptions * -[ciao module name]::[component name]_Servant::get_all_emitters (void) +[ciao module name]::[component name]_Servant::get_all_emitters () ACE_THROW_SPEC ((CORBA::SystemException)) { ::Components::EmitterDescriptions_var retv = @@ -887,8 +841,7 @@ void } ::Components::EmitterDescriptions * -[ciao module name]::[component name]_Servant::get_named_emitters (const Components::NameList & names - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Servant::get_named_emitters (const Components::NameList & names) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)) { @@ -916,7 +869,7 @@ void } ::Components::PublisherDescriptions * -[ciao module name]::[component name]_Servant::get_all_publishers (void) +[ciao module name]::[component name]_Servant::get_all_publishers () ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ to-do @@ -927,8 +880,7 @@ void } ::Components::PublisherDescriptions * -[ciao module name]::[component name]_Servant::get_named_publishers (const Components::NameList & names - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Servant::get_named_publishers (const Components::NameList & names) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)) { @@ -941,7 +893,7 @@ void // Operations for CCMObject interface ::CORBA::IRObject_ptr -[ciao module name]::[component name]_Servant::get_component_def (void) +[ciao module name]::[component name]_Servant::get_component_def () ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ to-do: Connect to an IfR? @@ -949,14 +901,14 @@ void } ::Components::CCMHome_ptr -[ciao module name]::[component name]_Servant::get_ccm_home (void) +[ciao module name]::[component name]_Servant::get_ccm_home () ACE_THROW_SPEC ((CORBA::SystemException)) { return this->context_->get_CCM_home (); } ::Components::PrimaryKeyBase * -[ciao module name]::[component name]_Servant::get_primary_key (void) +[ciao module name]::[component name]_Servant::get_primary_key () ACE_THROW_SPEC ((CORBA::SystemException, Components::NoKeyAvailable)) { @@ -965,7 +917,7 @@ void } void -[ciao module name]::[component name]_Servant::configuration_complete (void) +[ciao module name]::[component name]_Servant::configuration_complete () ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidConfiguration)) { @@ -974,7 +926,7 @@ void } void -[ciao module name]::[component name]_Servant::remove (void) +[ciao module name]::[component name]_Servant::remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::RemoveFailure)) { @@ -984,7 +936,7 @@ void } ::Components::ComponentPortDescription * -[ciao module name]::[component name]_Servant::get_all_ports (void) +[ciao module name]::[component name]_Servant::get_all_ports () ACE_THROW_SPEC ((CORBA::SystemException)) { ::Components::ComponentPortDescription_var retv = @@ -1016,7 +968,7 @@ void // get_component implementation. CORBA::Object_ptr -[ciao module name]::[component name]_Servant::_get_component (void) +[ciao module name]::[component name]_Servant::_get_component () ACE_THROW_SPEC ((CORBA::SystemException)) { ::Components::SessionContext_var sc = @@ -1037,24 +989,22 @@ CORBA::Object_ptr } void -[ciao module name]::[component name]_Servant::_ciao_activate (void) +[ciao module name]::[component name]_Servant::_ciao_activate () ACE_THROW_SPEC ((CORBA::SystemException)) { ::Components::SessionComponent_var temp = - ::Components::SessionComponent::_narrow (this->executor_.in () - ACE_ENV_ARG_PARAMETER); + ::Components::SessionComponent::_narrow (this->executor_.in ()); if (! CORBA::is_nil (temp.in ())) temp->ccm_activate (); } void -[ciao module name]::[component name]_Servant::_ciao_passivate (void) +[ciao module name]::[component name]_Servant::_ciao_passivate () ACE_THROW_SPEC ((CORBA::SystemException)) { ::Components::SessionComponent_var temp = - ::Components::SessionComponent::_narrow (this->executor_.in () - ACE_ENV_ARG_PARAMETER); + ::Components::SessionComponent::_narrow (this->executor_.in ()); if (! CORBA::is_nil (temp.in ())) temp->ccm_passivate (); @@ -1065,17 +1015,14 @@ void ////////////////////////////////////////////////////////////////// [component name]_ptr -[ciao module name]::[home name]_Servant::_ciao_activate_component (CCM_[component name]_ptr exe - ACE_ENV_SINGLE_ARG_DECL) +[ciao module name]::[home name]_Servant::_ciao_activate_component (CCM_[component name]_ptr exe) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var hobj - = this->container_->get_objref (this - ACE_ENV_ARG_PARAMETER); + = this->container_->get_objref (this); ::Components::CCMHome_var home - = ::Components::CCMHome::_narrow (hobj.in () - ACE_ENV_ARG_PARAMETER); + = ::Components::CCMHome::_narrow (hobj.in ()); [ciao module name]::[component name]_Servant *svt = new [ciao module name]::[component name]_Servant (exe, @@ -1086,14 +1033,12 @@ void CORBA::Object_var objref = this->container_->install_component (svt, - oid.out () - ACE_ENV_ARG_PARAMETER); + oid.out ()); svt->_ciao_activate (); [component name]_var ho - = [component name]::_narrow (objref.in () - ACE_ENV_ARG_PARAMETER); + = [component name]::_narrow (objref.in ()); if (this->component_map_.bind (oid.in (), svt) == 0) { @@ -1104,15 +1049,13 @@ void } void -[ciao module name]::[home name]_Servant::_ciao_passivate_component ([component name]_ptr comp - ACE_ENV_SINGLE_ARG_DECL) +[ciao module name]::[home name]_Servant::_ciao_passivate_component ([component name]_ptr comp) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid; this->container_->uninstall_component (comp, - oid.out () - ACE_ENV_ARG_PARAMETER); + oid.out ()); [ciao module name]::[component name]_Servant *servant = 0; if (this->component_map_.unbind (oid.in (), servant) == 0) @@ -1126,7 +1069,7 @@ void // Operations for Implicit Home interface [component name]_ptr -[ciao module name]::[home name]_Servant::create (void) +[ciao module name]::[home name]_Servant::create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CreateFailure)) { @@ -1137,50 +1080,43 @@ void this->executor_->create (); CCM_[component name]_var _ciao_comp - = CCM_[component name]::_narrow (_ciao_ec.in () - ACE_ENV_ARG_PARAMETER); + = CCM_[component name]::_narrow (_ciao_ec.in ()); - return this->_ciao_activate_component (_ciao_comp.in () - ACE_ENV_ARG_PARAMETER); + return this->_ciao_activate_component (_ciao_comp.in ()); } // Operations for CCMHome interface void -[ciao module name]::[home name]_Servant::remove_component (Components::CCMObject_ptr comp - ACE_ENV_ARG_DECL) +[ciao module name]::[home name]_Servant::remove_component (Components::CCMObject_ptr comp) ACE_THROW_SPEC ((CORBA::SystemException, Components::RemoveFailure)) { [component name]_var _ciao_comp - = [component name]::_narrow (comp - ACE_ENV_ARG_PARAMETER); + = [component name]::_narrow (comp); if (CORBA::is_nil (_ciao_comp.in ())) - ACE_THROW (CORBA::INTERNAL ()); // What is the right exception to throw here? + throw CORBA::INTERNAL (); // What is the right exception to throw here? // @@ It seems to me that we need to make sure this is a component // generated by this home before calling remove on this component. - _ciao_comp->remove (ACE_ENV_ARG_PARAMETER); + _ciao_comp->remove (); // Removing the object reference? get the servant from the POA with // the objref, and call remove() on the component, deactivate the // component, and then remove-ref the servant? - this->_ciao_passivate_component (_ciao_comp.in () - ACE_ENV_ARG_PARAMETER); + this->_ciao_passivate_component (_ciao_comp.in ()); } extern "C" [SERVANT]_Export ::PortableServer::Servant create[home name]_Servant (::Components::HomeExecutorBase_ptr p, - CIAO::Session_Container *c - ACE_ENV_ARG_DECL); + CIAO::Session_Container *c); { if (p == 0) return 0; CCM_[home name]_var x - = CCM_[home name]::_narrow (p - ACE_ENV_ARG_PARAMETER); + = CCM_[home name]::_narrow (p); if (CORBA::is_nil (x.in ())) return 0; diff --git a/CIAO/docs/templates/CIAO_Glue_Session_Template.h b/CIAO/docs/templates/CIAO_Glue_Session_Template.h index 902b5034d2f..25c7813db53 100644 --- a/CIAO/docs/templates/CIAO_Glue_Session_Template.h +++ b/CIAO/docs/templates/CIAO_Glue_Session_Template.h @@ -70,7 +70,7 @@ namespace CIAO_GLUE // get_component implementation. virtual CORBA::Object_ptr - _get_component (void) + _get_component () ACE_THROW_SPEC ((CORBA::SystemException)); protected: @@ -108,55 +108,53 @@ namespace CIAO_GLUE ##foreach [receptacle name] with [uses type] in (list of all 'uses' interfaces) generate: ## if [receptacle name] is a simplex receptacle ('uses') [uses type]_ptr - get_connection_[receptacle name] (void) + get_connection_[receptacle name] () ACE_THROW_SPEC ((CORBA::SystemException)); ## else ([receptacle name] is a multiplex ('uses multiple') receptacle) // [receptacle name]Connections typedef'ed as a sequence of // struct [receptacle name]Connection. [receptacle name]Connections * - get_connections_[receptacle name] (void); + get_connections_[receptacle name] (); ACE_THROW_SPEC ((CORBA::SystemException)); ## endif [receptacle name] ##end foreach [receptacle name] with [uses type] ##foreach [event name] with [eventtype] in (list of all event sources) generate: - void push_[event name] ([eventtype] *ev - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + void push_[event name] ([eventtype] *ev) ACE_THROW_SPEC ((CORBA::SystemException)); ##end foreach [event name] with [eventtype] // Operations for ::Components::CCMContext virtual ::Components::Principal_ptr - get_caller_principal (void) + get_caller_principal () ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::Components::CCMHome_ptr - get_CCM_home (void) + get_CCM_home () ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean - get_rollback_only (void) + get_rollback_only () ACE_THROW_SPEC ((CORBA::SystemException, Components::IllegalState)); virtual ::Components::Transaction::UserTransaction_ptr - get_user_transaction (void) + get_user_transaction () ACE_THROW_SPEC ((CORBA::SystemException, Components::IllegalState)); virtual CORBA::Boolean - is_caller_in_role (const char * role - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + is_caller_in_role (const char * role) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void - set_rollback_only (void) + set_rollback_only () ACE_THROW_SPEC ((CORBA::SystemException, Components::IllegalState)); // Operations for ::Components::SessionContext interface virtual CORBA::Object_ptr - get_CCM_object (void) + get_CCM_object () ACE_THROW_SPEC ((CORBA::SystemException, Components::IllegalState)); protected: @@ -167,14 +165,13 @@ namespace CIAO_GLUE ## if [receptacle name] is a simplex receptacle ('uses') // Simplex [receptacle name] connection management operations void - connect_[receptacle name] ([uses type]_ptr c - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + connect_[receptacle name] ([uses type]_ptr c) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::AlreadyConnected, ::Components::InvalidConnection)); [uses type]_ptr - disconnect_[receptacle name] (void) + disconnect_[receptacle name] () ACE_THROW_SPEC ((CORBA::SystemException, ::Components::NoConnection)); @@ -184,15 +181,13 @@ namespace CIAO_GLUE ## else ([receptacle name] is a multiplex ('uses multiple') receptacle) // Multiplex [receptacle name] connection management operations ::Components::Cookie * - connect_[receptacle name] ([uses type]_ptr c - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + connect_[receptacle name] ([uses type]_ptr c) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::ExceedConnectionLimit, ::Components::InvalidConnection)); [uses type]_ptr - disconnect_[receptacle name] (::Components::Cookie *ck - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + disconnect_[receptacle name] (::Components::Cookie *ck) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::InvalidConnection)); @@ -205,13 +200,12 @@ namespace CIAO_GLUE // Operations for emits interfaces. ##foreach [emit name] with [eventtype] in (list of all emitters) generate: void - connect_[emit name] ([eventtype]Consumer_ptr c - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + connect_[emit name] ([eventtype]Consumer_ptr c) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::AlreadyConnected)); [eventtype]Consumer_ptr - disconnect_[emit name] (void) + disconnect_[emit name] () ACE_THROW_SPEC ((CORBA::SystemException, ::Components::NoConnection)); @@ -221,14 +215,12 @@ namespace CIAO_GLUE // Operations for publishes interfaces. ##foreach [publish name] with [eventtype] in (list of all publishers) generate: ::Components::Cookie * - subscribe_[publish name] ([eventtype]Consumer_ptr c - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + subscribe_[publish name] ([eventtype]Consumer_ptr c) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::ExceededConnectionLimit)); [eventtype]Consumer_ptr - unsubscribe_[publish name] (::Components::Cookie *ck - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + unsubscribe_[publish name] (::Components::Cookie *ck) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::InvalidConnection)); @@ -273,7 +265,7 @@ namespace CIAO_GLUE // Operations for provides interfaces. ##foreach [facet name] with [facet type] in (list of all provided interfaces) generate: virtual [facet type]_ptr - provide_[facet name] (void) + provide_[facet name] () ACE_THROW_SPEC ((CORBA::SystemException)); ##end foreach [facet name] with [facet type] @@ -283,37 +275,34 @@ namespace CIAO_GLUE ## if [receptacle name] is a simplex receptacle ('uses') // Simplex [receptacle name] connection management operations virtual void - connect_[receptacle name] ([uses type]_ptr c - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + connect_[receptacle name] ([uses type]_ptr c) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::AlreadyConnected, ::Components::InvalidConnection)); virtual [uses type]_ptr - disconnect_[receptacle name] (void) + disconnect_[receptacle name] () ACE_THROW_SPEC ((CORBA::SystemException, ::Components::NoConnection)); virtual [uses type]_ptr - get_connection_[receptacle name] (void) + get_connection_[receptacle name] () ACE_THROW_SPEC ((CORBA::SystemException)); ## else ([receptacle name] is a multiplex ('uses multiple') receptacle) // Multiplex [receptacle name] connection management operations virtual ::Components::Cookie * - connect_[receptacle name] ([uses type]_ptr c - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + connect_[receptacle name] ([uses type]_ptr c) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::ExceedConnectionLimit, ::Components::InvalidConnection)); virtual [uses type]_ptr - disconnect_[receptacle name] (::Components::Cookie *ck - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + disconnect_[receptacle name] (::Components::Cookie *ck) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::InvalidConnection)); virtual [receptacle name]Connections * - get_connections_[receptacle name] (void) + get_connections_[receptacle name] () ACE_THROW_SPEC ((CORBA::SystemException)); ## endif [receptacle name] ##end foreach [receptacle name] with [uses type] @@ -333,20 +322,18 @@ namespace CIAO_GLUE ~[event type]Consumer_[consumer name]_Servant (); ## foreach [type] in ([eventtype] and all its parent eventtype, if any) - virtual void push_[type] ([type] *evt - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void push_[type] ([type] *evt) ACE_THROW_SPEC ((CORBA::SystemException)); ## end [type] // Inherit from ::Compopnents::EventConsumerBase - virtual void push_event (::Components::EventBase *ev - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void push_event (::Components::EventBase *ev) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::BadEventType)); // get_component implementation. virtual CORBA::Object_ptr - _get_component (void) + _get_component () ACE_THROW_SPEC ((CORBA::SystemException)); protected: @@ -358,20 +345,19 @@ namespace CIAO_GLUE }; virtual [eventtype]Consumer_ptr - get_consumer_[consumer name] (void) + get_consumer_[consumer name] () ACE_THROW_SPEC ((CORBA::SystemException)); ##end foreach [consumer name] with [eventtype] // Operations for emits interfaces. ##foreach [emit name] with [eventtype] in (list of all emitters) generate: virtual void - connect_[emit name] ([eventtype]Consumer_ptr c - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + connect_[emit name] ([eventtype]Consumer_ptr c) ACE_THROW_SPEC ((CORBA::SystemException ::Components::AlreadyConnected)); virtual [eventtype]Consumer_ptr - disconnect_[emit name] (void) + disconnect_[emit name] () ACE_THROW_SPEC ((CORBA::SystemException, ::Components::NoConnection)); ##end foreach [emit name] with [eventtype] @@ -379,45 +365,39 @@ namespace CIAO_GLUE // Operations for publishes interfaces. ##foreach [publish name] with [eventtype] in (list of all publishers) generate: virtual ::Components::Cookie * - subscribe_[publish name] ([eventtype]Consumer_ptr c - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + subscribe_[publish name] ([eventtype]Consumer_ptr c) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::ExceededConnectionLimit)); virtual [eventtype]Consumer_ptr - unsubscribe_[publish name] (::Components::Cookie *ck - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + unsubscribe_[publish name] (::Components::Cookie *ck) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::InvalidConnection)); ##end foreach [publish name] with [eventtype] // Operations for Navigation interface virtual CORBA::Object_ptr - provide_facet (const char * name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + provide_facet (const char * name) ACE_THROW_SPEC ((CORBA::SystemException , Components::InvalidName)) ; virtual ::Components::FacetDescriptions * - get_all_facets (void) + get_all_facets () ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::Components::FacetDescriptions * - get_named_facets (const Components::NameList & names - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + get_named_facets (const Components::NameList & names) ACE_THROW_SPEC ((CORBA::SystemException , Components::InvalidName)); virtual CORBA::Boolean - same_component (CORBA::Object_ptr object_ref - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + same_component (CORBA::Object_ptr object_ref) ACE_THROW_SPEC ((CORBA::SystemException)); // Operations for Receptacles interface virtual ::Components::Cookie * connect (const char * name, - CORBA::Object_ptr connection - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + CORBA::Object_ptr connection) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName, Components::InvalidConnection, @@ -426,8 +406,7 @@ namespace CIAO_GLUE virtual CORBA::Object_ptr disconnect (const char * name, - Components::Cookie *ck - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + Components::Cookie *ck) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName, Components::InvalidConnection, @@ -435,32 +414,28 @@ namespace CIAO_GLUE Components::NoConnection)); virtual ::Components::ConnectionDescriptions * - get_connections (const char * name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + get_connections (const char * name) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)); virtual ::Components::ReceptacleDescriptions * - get_all_receptacles (void) + get_all_receptacles () ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::Components::ReceptacleDescriptions * - get_named_receptacles (const Components::NameList & names - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + get_named_receptacles (const Components::NameList & names) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)); // Operations for Events interface virtual ::Components::EventConsumerBase_ptr - get_consumer (const char * sink_name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + get_consumer (const char * sink_name) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)); virtual ::Components::Cookie * subscribe (const char * publisher_name, - Components::EventConsumerBase_ptr subscriber - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + Components::EventConsumerBase_ptr subscriber) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName, Components::InvalidConnection, @@ -468,100 +443,94 @@ namespace CIAO_GLUE virtual ::Components::EventConsumerBase_ptr unsubscribe (const char * publisher_name, - Components::Cookie *ck - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + Components::Cookie *ck) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName, Components::InvalidConnection)); virtual void connect_consumer (const char * emitter_name, - Components::EventConsumerBase_ptr consumer - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + Components::EventConsumerBase_ptr consumer) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName, Components::AlreadyConnected, Components::InvalidConnection)); virtual ::Components::EventConsumerBase_ptr - disconnect_consumer (const char * source_name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + disconnect_consumer (const char * source_name) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName, Components::NoConnection)); virtual ::Components::ConsumerDescriptions * - get_all_consumers (void) + get_all_consumers () ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::Components::ConsumerDescriptions * - get_named_consumers (const Components::NameList & names - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + get_named_consumers (const Components::NameList & names) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)); virtual ::Components::EmitterDescriptions * - get_all_emitters (void) + get_all_emitters () ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::Components::EmitterDescriptions * - get_named_emitters (const Components::NameList & names - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + get_named_emitters (const Components::NameList & names) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)); virtual ::Components::PublisherDescriptions * - get_all_publishers (void) + get_all_publishers () ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::Components::PublisherDescriptions * - get_named_publishers (const Components::NameList & names - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + get_named_publishers (const Components::NameList & names) ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidName)); // Operations for CCMObject interface virtual ::CORBA::IRObject_ptr - get_component_def (void) + get_component_def () ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::Components::CCMHome_ptr - get_ccm_home (void) + get_ccm_home () ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::Components::PrimaryKeyBase * - get_primary_key (void) + get_primary_key () ACE_THROW_SPEC ((CORBA::SystemException, Components::NoKeyAvailable)); virtual void - configuration_complete (void) + configuration_complete () ACE_THROW_SPEC ((CORBA::SystemException, Components::InvalidConfiguration)); virtual void - remove (void) + remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::RemoveFailure)); virtual ::Components::ComponentPortDescription * - get_all_ports (void) + get_all_ports () ACE_THROW_SPEC ((CORBA::SystemException)); // get_component implementation. virtual CORBA::Object_ptr - _get_component (void) + _get_component () ACE_THROW_SPEC ((CORBA::SystemException)); // CIAO specific operations. // Activate the object in the container_ void - _ciao_activate (void) + _ciao_activate () ACE_THROW_SPEC ((CORBA::SystemException)); void - _ciao_passivate (void) + _ciao_passivate () ACE_THROW_SPEC ((CORBA::SystemException)); protected: @@ -613,7 +582,7 @@ namespace CIAO_GLUE // for factory operations inherit from parent home(s), they should return // the corresponding component types their homes manage virtual [component name]_ptr - [factory name] (.... ACE_ENV_ARG_DECL_WITH_DEFAULTS) + [factory name] (....) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::CreateFailure, ....)); @@ -624,7 +593,7 @@ namespace CIAO_GLUE // for finder operations inherit from parent home(s), they should return // the corresponding component types their homes manage virtual [component name]_ptr - [finder name] (.... ACE_ENV_ARG_DECL_WITH_DEFAULTS) + [finder name] (....) ACE_THROW_SPEC ((CORBA::SystemException, Components::FinderFailure, ....)); @@ -634,7 +603,7 @@ namespace CIAO_GLUE // Operations for KeylessHome interface virtual ::Components::CCMObject_ptr - create_component (void) + create_component () ACE_THROW_SPEC ((CORBA::SystemException, Components::CreateFailure)); @@ -642,65 +611,58 @@ namespace CIAO_GLUE // We do not support key'ed home at the moment but we might // as well generate the mapping. - virtual [component name]_ptr create ([key type] *key - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual [component name]_ptr create ([key type] *key) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::CreationFailure, ::Components::DuplicateKeyValue, ::Components::InvalidKey)); virtual [component name]_ptr - find_by_primary_key ([key type] *key - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + find_by_primary_key ([key type] *key) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::FinderFailure, ::Components::UnknownKeyValue, ::Components::InvalidKey)); - virtual void remove ([key type] *key - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void remove ([key type] *key) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::RemoveFailure, ::Components::UnknownKeyValue, ::Components::InvalidKey)); virtual [key type] * - get_primary_key ([component name]_ptr comp - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + get_primary_key ([component name]_ptr comp) ACE_THROW_SPEC ((CORBA::SystemException)); ## endif (keyed or keyless home) // Operations for Implicit Home interface virtual [component name]_ptr - create (void) + create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CreateFailure)); // Operations for CCMHome interface virtual ::CORBA::IRObject_ptr - get_component_def (void) + get_component_def () ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::CORBA::IRObject_ptr - get_home_def (void) + get_home_def () ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void remove_component (Components::CCMObject_ptr comp - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void remove_component (Components::CCMObject_ptr comp) ACE_THROW_SPEC ((CORBA::SystemException, Components::RemoveFailure)); protected: // Helper method for factory operations. [component name]_ptr - _ciao_activate_component (CCM_[component name]_ptr exe - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + _ciao_activate_component (CCM_[component name]_ptr exe) ACE_THROW_SPEC ((CORBA::SystemException)); void - _ciao_passivate_component ([component name]_ptr comp - ACE_ENV_SINGLE_ARG_DECL) + _ciao_passivate_component ([component name]_ptr comp) ACE_THROW_SPEC ((CORBA::SystemException)); // My Executor. @@ -721,8 +683,7 @@ namespace CIAO_GLUE extern "C" [SERVANT]_Export ::PortableServer::Servant create[home name]_Servant (::Components::HomeExecutorBase_ptr p, - CIAO::Session_Container *c - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + CIAO::Session_Container *c); #if defined (__ACE_INLINE__) # include "[idl-name]_svnt.inl" diff --git a/CIAO/docs/templates/CIAO_Glue_Session_Template.inl b/CIAO/docs/templates/CIAO_Glue_Session_Template.inl index 0e246492428..1cb07a064ae 100644 --- a/CIAO/docs/templates/CIAO_Glue_Session_Template.inl +++ b/CIAO/docs/templates/CIAO_Glue_Session_Template.inl @@ -78,27 +78,26 @@ ACE_INLINE ##foreach [emit name] with [eventtype] in (list of all emitters) generate: ACE_INLINE void -[ciao module name]::[component name]_Context::connect_[emit name] ([eventtype]Consumer_ptr c - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Context::connect_[emit name] ([eventtype]Consumer_ptr c) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::AlreadyConnected)) { if (CORBA::is_nil (c)) - ACE_THROW (CORBA::BAD_PARAM ()); + throw CORBA::BAD_PARAM (); if (! CORBA::is_nil (this->ciao_emits_[emit name]_consumer_.in ())) - ACE_THROW (::Components::AlreadyConnected ()); + throw ::Components::AlreadyConnected (); this->ciao_emits_[emit name]_consumer_ = c; } ACE_INLINE [eventtype]Consumer_ptr -[ciao module name]::[component name]_Context::disconnect_[emit name] (void) +[ciao module name]::[component name]_Context::disconnect_[emit name] () ACE_THROW_SPEC ((CORBA::SystemException, ::Components::NoConnection)) { if (CORBA::is_nil (this->ciao_emits_[emit name]_consumer_.in ())) - ACE_THROW (::Components::NoConnection ()); + throw ::Components::NoConnection (); return this->ciao_emits_[emit name]_consumer_._retn (); } @@ -107,7 +106,7 @@ ACE_INLINE [eventtype]Consumer_ptr // Operations for ::Components::CCMContext ACE_INLINE ::Components::Principal_ptr -[ciao module name]::[component name]_Context::get_caller_principal (void) +[ciao module name]::[component name]_Context::get_caller_principal () ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ We don't support Security in CIAO yet. @@ -115,14 +114,14 @@ ACE_INLINE ::Components::Principal_ptr } ACE_INLINE ::Components::CCMHome_ptr -[ciao module name]::[component name]_Context::get_CCM_home (void) +[ciao module name]::[component name]_Context::get_CCM_home () ACE_THROW_SPEC ((CORBA::SystemException)) { return ::Components::CCMHome::_duplicate (this->home_.in ()); } ACE_INLINE CORBA::Boolean -[ciao module name]::[component name]_Context::get_rollback_only (void) +[ciao module name]::[component name]_Context::get_rollback_only () ACE_THROW_SPEC ((CORBA::SystemException, Components::IllegalState)) { @@ -131,7 +130,7 @@ ACE_INLINE CORBA::Boolean } ACE_INLINE ::Components::Transaction::UserTransaction_ptr -[ciao module name]::[component name]_Context::get_user_transaction (void) +[ciao module name]::[component name]_Context::get_user_transaction () ACE_THROW_SPEC ((CORBA::SystemException, Components::IllegalState)) { @@ -140,8 +139,7 @@ ACE_INLINE ::Components::Transaction::UserTransaction_ptr } ACE_INLINE CORBA::Boolean -[ciao module name]::[component name]_Context::is_caller_in_role (const char * role - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Context::is_caller_in_role (const char * role) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG (role); @@ -151,12 +149,12 @@ ACE_INLINE CORBA::Boolean } ACE_INLINE void -[ciao module name]::[component name]_Context::set_rollback_only (void) +[ciao module name]::[component name]_Context::set_rollback_only () ACE_THROW_SPEC ((CORBA::SystemException, Components::IllegalState)) { // @@ We don't support Transaction in CIAO yet. - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw CORBA::NO_IMPLEMENT (); } ////////////////////////////////////////////////////////////////// @@ -181,18 +179,16 @@ ACE_INLINE [operation return_type] ## if [receptacle name] is a simplex receptacle ('uses') // Simplex [receptacle name] connection management operations ACE_INLINE void -[ciao module name]::[component name]_Servant::connect_[receptacle name] ([uses type]_ptr c - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Servant::connect_[receptacle name] ([uses type]_ptr c) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::AlreadyConnected, ::Components::InvalidConnection)) { - this->context_->connect_[receptacle name] (c - ACE_ENV_ARG_PARAMETER); + this->context_->connect_[receptacle name] (c); } ACE_INLINE [uses type]_ptr -[ciao module name]::[component name]_Servant::disconnect_[receptacle name] (void) +[ciao module name]::[component name]_Servant::disconnect_[receptacle name] () ACE_THROW_SPEC ((CORBA::SystemException, ::Components::NoConnection)) { @@ -200,7 +196,7 @@ ACE_INLINE [uses type]_ptr } ACE_INLINE [uses type]_ptr -[ciao module name]::[component name]_Servant::get_connection_[receptacle name] (void) +[ciao module name]::[component name]_Servant::get_connection_[receptacle name] () ACE_THROW_SPEC ((CORBA::SystemException)) { return this->context_->get_connection_[receptacle name] (); @@ -209,28 +205,24 @@ ACE_INLINE [uses type]_ptr // Multiplex [receptacle name] connection management operations ACE_INLINE ::Components::Cookie * -[ciao module name]::[component name]_Servant::connect_[receptacle name] ([uses type]_ptr c - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Servant::connect_[receptacle name] ([uses type]_ptr c) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::ExceedConnectionLimit, ::Components::InvalidConnection)) { - return this->context_->connect_[receptacle name] (c - ACE_ENV_ARG_PARAMETER); + return this->context_->connect_[receptacle name] (c); } ACE_INLINE [uses type]_ptr -[ciao module name]::[component name]_Servant::disconnect_[receptacle name] (::Components::Cookie *ck - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Servant::disconnect_[receptacle name] (::Components::Cookie *ck) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::InvalidConnection)) { - return this->context_->disconnect_[receptacle name] (ck - ACE_ENV_ARG_PARAMETER); + return this->context_->disconnect_[receptacle name] (ck); } ACE_INLINE [receptacle name]Connections * -[ciao module name]::[component name]_Servant::get_connections_[receptacle name] (void) +[ciao module name]::[component name]_Servant::get_connections_[receptacle name] () ACE_THROW_SPEC ((CORBA::SystemException)) { return this->context_->get_connections_[receptacle name] (); @@ -267,7 +259,7 @@ ACE_INLINE } ACE_INLINE CORBA::Object_ptr -[ciao module name]::[component name]_Servant::[eventtype]Consumer_[consumer name]_Servant::_get_component (void) +[ciao module name]::[component name]_Servant::[eventtype]Consumer_[consumer name]_Servant::_get_component () ACE_THROW_SPEC ((CORBA::SystemException)) { return this->ctx_->get_CCM_object (); @@ -275,25 +267,22 @@ ACE_INLINE CORBA::Object_ptr ACE_INLINE void [ciao module name]::[component name]_Servant::[eventtype]Consumer_[consumer name]_Servant::push_[eventtype] - ([eventtype] *evt - ACE_ENV_ARG_DECL) + ([eventtype] *evt) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->executor_->push_[consumer name] (evt - ACE_ENV_ARG_PARAMETER); + this->executor_->push_[consumer name] (evt); } ## foreach [type] in (all parents of eventtype, if any, not including EventConsumerBase) ACE_INLINE void [ciao module name]::[component name]_Servant::[eventtype]Consumer_[consumer name]_Servant::push_[type] - ([type] *evt - ACE_ENV_ARG_DECL) + ([type] *evt) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Problem, there's no way to handle this case. // this->executor_->push_[consumer name] (evt ACE_ENV_ARG); - ACE_THROW (::CORBA::BAD_PARAM ()); + throw ::CORBA::BAD_PARAM (); } ## end [type] @@ -302,17 +291,15 @@ ACE_INLINE void // Operations for emits interfaces. ##foreach [emit name] with [eventtype] in (list of all emitters) generate: ACE_INLINE void -[ciao module name]::[component name]_Servant::connect_[emit name] ([eventtype]Consumer_ptr c - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Servant::connect_[emit name] ([eventtype]Consumer_ptr c) ACE_THROW_SPEC ((CORBA::SystemException ::Components::AlreadyConnected)) { - this->context_->connect_[emit name] (c - ACE_ENV_ARG_PARAMETER); + this->context_->connect_[emit name] (c); } ACE_INLINE [eventtype]Consumer_ptr -[ciao module name]::[component name]_Servant::disconnect_[emit name] (void) +[ciao module name]::[component name]_Servant::disconnect_[emit name] () ACE_THROW_SPEC ((CORBA::SystemException, ::Components::NoConnection)) { @@ -323,23 +310,19 @@ ACE_INLINE [eventtype]Consumer_ptr // Operations for publishes interfaces. ##foreach [publish name] with [eventtype] in (list of all publishers) generate: ACE_INLINE ::Components::Cookie * -[ciao module name]::[component name]_Servant::subscribe_[publish name] ([eventtype]Consumer_ptr c - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Servant::subscribe_[publish name] ([eventtype]Consumer_ptr c) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::ExceededConnectionLimit)) { - return this->context_->subscribe_[publish name] (c - ACE_ENV_ARG_PARAMETER); + return this->context_->subscribe_[publish name] (c); } ACE_INLINE [eventtype]Consumer_ptr -[ciao module name]::[component name]_Servant::unsubscribe_[publish name] (::Components::Cookie *ck - ACE_ENV_ARG_DECL) +[ciao module name]::[component name]_Servant::unsubscribe_[publish name] (::Components::Cookie *ck) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::InvalidConnection)) { - return this->context_->unsubscribe_[publish name] (ck - ACE_ENV_ARG_PARAMETER); + return this->context_->unsubscribe_[publish name] (ck); } ##end foreach [publish name] with [eventtype] @@ -370,20 +353,18 @@ ACE_INLINE // for factory operations inherit from parent home(s), they should return // the corresponding component types their homes manage ACE_INLINE [component name]_ptr -[ciao module name]::[home name]_Servant::[factory name] (.... ACE_ENV_ARG_DECL_WITH_DEFAULTS) +[ciao module name]::[home name]_Servant::[factory name] (....) ACE_THROW_SPEC ((CORBA::SystemException, ::Components::CreateFailure, ....)) { Components::EnterpriseComponent_var _ciao_ec = - this->executor_->[factory name] (.... ACE_ENV_ARG_PARAMETER); + this->executor_->[factory name] (....); CCM_[component name]_var _ciao_comp - = CCM_[component name]::_narrow (_ciao_ec.in () - ACE_ENV_ARG_PARAMETER); + = CCM_[component name]::_narrow (_ciao_ec.in ()); - return this->_ciao_activate_component (_ciao_comp.in () - ACE_ENV_ARG_PARAMETER); + return this->_ciao_activate_component (_ciao_comp.in ()); } ##end foreach [factory name] @@ -391,18 +372,17 @@ ACE_INLINE [component name]_ptr // for finder operations inherit from parent home(s), they should return // the corresponding component types their homes manage ACE_INLINE [component name]_ptr -[ciao module name]::[home name]_Servant::[finder name] (.... ACE_ENV_ARG_DECL) +[ciao module name]::[home name]_Servant::[finder name] (....) ACE_THROW_SPEC ((CORBA::SystemException, Components::FinderFailure, ....)) { Components::EnterpriseComponent_var com = - this->executor_->[finder name] (.... ACE_ENV_ARG_PARAMETER); + this->executor_->[finder name] (....); // Do we create a new object reference referring to the same object, // or do we try to create a different objref referring to the same object? - return this->_ciao_create_helper (com - ACE_ENV_ARG_PARAMETER); + return this->_ciao_create_helper (com); } ##end foreach [finder name] @@ -410,7 +390,7 @@ ACE_INLINE [component name]_ptr // Operations for KeylessHome interface ACE_INLINE ::Components::CCMObject_ptr -[ciao module name]::[home name]_Servant::create_component (void) +[ciao module name]::[home name]_Servant::create_component () ACE_THROW_SPEC ((CORBA::SystemException, Components::CreateFailure)) { @@ -456,7 +436,7 @@ ACE_INLINE void { // @@ TO-DO when we suppor keyed home. - ACE_THROW (CORBA::NO_IMPLEMENT ()); + throw CORBA::NO_IMPLEMENT (); } ACE_INLINE [key type] * @@ -473,7 +453,7 @@ ACE_INLINE [key type] * // Operations for CCMHome interface ACE_INLINE ::CORBA::IRObject_ptr -[ciao module name]::[home name]_Servant::get_component_def (void) +[ciao module name]::[home name]_Servant::get_component_def () ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ TO-DO. Contact IfR? @@ -482,7 +462,7 @@ ACE_INLINE ::CORBA::IRObject_ptr } ACE_INLINE CORBA::IRObject_ptr -[ciao module name]::[home name]_Servant::get_home_def (void) +[ciao module name]::[home name]_Servant::get_home_def () ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ TO-DO. Contact IfR? diff --git a/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp b/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp index 119a1d34361..fc059cc0d74 100644 --- a/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp +++ b/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp @@ -54,12 +54,11 @@ parse_args (int argc, char *argv[]) int main (int argc, char* argv[]) { - ACE_TRY_NEW_ENV + try { // initialize the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv,"" - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv,""); if (parse_args (argc, argv) != 0) @@ -67,13 +66,11 @@ int main (int argc, char* argv[]) // create the factory object reference of StockBrokerHome CORBA::Object_var broker_obj = - orb->string_to_object (broker_ior - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (broker_ior); // downcast the object reference to the appropriate type Stock::StockBroker_var broker = - Stock::StockBroker::_narrow (broker_obj.in () - ACE_ENV_ARG_PARAMETER); + Stock::StockBroker::_narrow (broker_obj.in ()); if (CORBA::is_nil (broker.in ())) { @@ -85,16 +82,14 @@ int main (int argc, char* argv[]) if (subscribe_name != 0) { - broker->stock_subscribe (subscribe_name - ACE_ENV_ARG_PARAMETER); + broker->stock_subscribe (subscribe_name); ACE_DEBUG ((LM_DEBUG, "Subscribe successful!\n")); } if (unsubscribe_name != 0) { - broker->stock_unsubscribe (unsubscribe_name - ACE_ENV_ARG_PARAMETER); + broker->stock_unsubscribe (unsubscribe_name); ACE_DEBUG ((LM_DEBUG, "Unsubscribe successful!\n")); } @@ -103,15 +98,13 @@ int main (int argc, char* argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Who is the culprit \n"); + ex._tao_print_exception ("Who is the culprit \n"); ACE_ERROR_RETURN ((LM_ERROR, "Uncaught CORBA exception\n"), 1); } - ACE_ENDTRY; return 0; } diff --git a/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.cpp b/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.cpp index 052c3d9df52..4e85274ce8c 100644 --- a/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.cpp +++ b/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.cpp @@ -28,8 +28,7 @@ namespace CIDL_StockBroker_Impl void StockBroker_exec_i::stock_subscribe ( - const char * stock_name - ACE_ENV_ARG_DECL) + const char * stock_name) ACE_THROW_SPEC ((CORBA::SystemException, Stock::Invalid_Stock)) { @@ -43,14 +42,13 @@ namespace CIDL_StockBroker_Impl } else { - ACE_THROW (Stock::Invalid_Stock ()); + throw Stock::Invalid_Stock (); } } void StockBroker_exec_i::stock_unsubscribe ( - const char * stock_name - ACE_ENV_ARG_DECL) + const char * stock_name) ACE_THROW_SPEC ((CORBA::SystemException, Stock::Invalid_Stock)) { @@ -64,7 +62,7 @@ namespace CIDL_StockBroker_Impl } else { - ACE_THROW (Stock::Invalid_Stock ()); + throw Stock::Invalid_Stock (); } } @@ -72,8 +70,7 @@ namespace CIDL_StockBroker_Impl void StockBroker_exec_i::push_notify_in ( - Stock::StockName *ev - ACE_ENV_ARG_DECL) + Stock::StockName *ev) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -89,10 +86,10 @@ namespace CIDL_StockBroker_Impl if (CORBA::is_nil (quoter_obj.in ())) { - ACE_THROW (CORBA::BAD_PARAM ()); + throw CORBA::BAD_PARAM (); } - Stock::StockInfo_var info = quoter_obj->get_stock_info (stock_name.in () ACE_ENV_ARG_PARAMETER); + Stock::StockInfo_var info = quoter_obj->get_stock_info (stock_name.in ()); ACE_DEBUG ((LM_DEBUG, "Quoter - Current value of %s is %d\n", stock_name.in (), @@ -104,24 +101,21 @@ namespace CIDL_StockBroker_Impl void StockBroker_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) { - this->context_ = StockBroker_Context::_narrow (ctx - ACE_ENV_ARG_PARAMETER); + this->context_ = StockBroker_Context::_narrow (ctx); if (0 == this->context_) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } void - StockBroker_exec_i::ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + StockBroker_exec_i::ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -129,8 +123,7 @@ namespace CIDL_StockBroker_Impl } void - StockBroker_exec_i::ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + StockBroker_exec_i::ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -138,8 +131,7 @@ namespace CIDL_StockBroker_Impl } void - StockBroker_exec_i::ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + StockBroker_exec_i::ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -147,8 +139,7 @@ namespace CIDL_StockBroker_Impl } void - StockBroker_exec_i::ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + StockBroker_exec_i::ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -156,8 +147,7 @@ namespace CIDL_StockBroker_Impl } void - StockBroker_exec_i::ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + StockBroker_exec_i::ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -177,8 +167,7 @@ namespace CIDL_StockBroker_Impl } ::Components::EnterpriseComponent_ptr - StockBrokerHome_exec_i::create ( - ACE_ENV_SINGLE_ARG_DECL) + StockBrokerHome_exec_i::create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.h b/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.h index 7cbea3e82cc..020acf28a12 100644 --- a/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.h +++ b/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.h @@ -47,65 +47,56 @@ namespace CIDL_StockBroker_Impl virtual void stock_subscribe ( - const char * stock_name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const char * stock_name) ACE_THROW_SPEC ((CORBA::SystemException, Stock::Invalid_Stock)); virtual void stock_unsubscribe ( - const char * stock_name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const char * stock_name) ACE_THROW_SPEC ((CORBA::SystemException, Stock::Invalid_Stock)); virtual void push_notify_in ( - ::Stock::StockName *ev - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::Stock::StockName *ev) ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent virtual void set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); @@ -134,8 +125,7 @@ namespace CIDL_StockBroker_Impl virtual ~StockBrokerHome_exec_i (void); virtual ::Components::EnterpriseComponent_ptr - create ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); diff --git a/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp b/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp index 30213282d50..d99fde85c7c 100644 --- a/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp +++ b/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp @@ -60,12 +60,11 @@ parse_args (int argc, char *argv[]) int main (int argc, char* argv[]) { - ACE_TRY_NEW_ENV + try { // initialize the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv,"" - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv,""); if (parse_args (argc, argv) != 0) { @@ -74,13 +73,11 @@ int main (int argc, char* argv[]) // create the factory object reference, CORBA::Object_var distributor_obj = - orb->string_to_object (distributor_ior - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (distributor_ior); // downcast the object reference to the appropriate type Stock::StockDistributor_var distributor = - Stock::StockDistributor::_narrow (distributor_obj.in () - ACE_ENV_ARG_PARAMETER); + Stock::StockDistributor::_narrow (distributor_obj.in ()); if (CORBA::is_nil (distributor.in ())) { @@ -91,8 +88,7 @@ int main (int argc, char* argv[]) if (turn_on) { - distributor->rate (rate - ACE_ENV_ARG_PARAMETER); + distributor->rate (rate); ACE_DEBUG ((LM_DEBUG, "Start up the Distribution service\n")); @@ -107,15 +103,13 @@ int main (int argc, char* argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Who is the culprit \n"); + ex._tao_print_exception ("Who is the culprit \n"); ACE_ERROR_RETURN ((LM_ERROR, "Uncaught CORBA exception\n"), 1); } - ACE_ENDTRY; return 0; } diff --git a/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp b/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp index 7202d029a73..1eaafa0027d 100644 --- a/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp +++ b/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp @@ -142,8 +142,7 @@ namespace CIDL_StockDistributor_Impl //================================================================== ::Stock::StockInfo * - StockQuoter_exec_i::get_stock_info (const char *stock_name - ACE_ENV_ARG_DECL) + StockQuoter_exec_i::get_stock_info (const char *stock_name) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Stock::Invalid_Stock)) @@ -188,26 +187,24 @@ namespace CIDL_StockDistributor_Impl // Supported or inherited operations. void - StockDistributor_exec_i::start ( - ACE_ENV_SINGLE_ARG_DECL) + StockDistributor_exec_i::start () ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->rate_ == 0 || this->pulser_.active()) { - ACE_THROW (CORBA::BAD_PARAM ()); + throw CORBA::BAD_PARAM (); } this->pulser_.start (this->rate_); } void - StockDistributor_exec_i::stop ( - ACE_ENV_SINGLE_ARG_DECL) + StockDistributor_exec_i::stop () ACE_THROW_SPEC ((CORBA::SystemException)) { if (! this->pulser_.active ()) { - ACE_THROW (CORBA::BAD_INV_ORDER ()); + throw CORBA::BAD_INV_ORDER (); } this->pulser_.stop (); @@ -216,8 +213,7 @@ namespace CIDL_StockDistributor_Impl // Attribute operations. ::CORBA::Long - StockDistributor_exec_i::rate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + StockDistributor_exec_i::rate () ACE_THROW_SPEC ((CORBA::SystemException)) { return this->rate_; @@ -225,8 +221,7 @@ namespace CIDL_StockDistributor_Impl void StockDistributor_exec_i::rate ( - ::CORBA::Long rate - ACE_ENV_ARG_DECL_NOT_USED) + ::CORBA::Long rate) ACE_THROW_SPEC ((CORBA::SystemException)) { this->rate_ = rate; @@ -235,7 +230,7 @@ namespace CIDL_StockDistributor_Impl // Port operations. ::Stock::CCM_StockQuoter_ptr - StockDistributor_exec_i::get_push_quoter (void) + StockDistributor_exec_i::get_push_quoter () ACE_THROW_SPEC ((CORBA::SystemException)) { return new StockQuoter_exec_i (*this); @@ -261,24 +256,21 @@ namespace CIDL_StockDistributor_Impl void StockDistributor_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) { - this->context_ = StockDistributor_Context::_narrow (ctx - ACE_ENV_ARG_PARAMETER); + this->context_ = StockDistributor_Context::_narrow (ctx); if (this->context_ == 0) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } void - StockDistributor_exec_i::ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + StockDistributor_exec_i::ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -286,8 +278,7 @@ namespace CIDL_StockDistributor_Impl } void - StockDistributor_exec_i::ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + StockDistributor_exec_i::ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -295,8 +286,7 @@ namespace CIDL_StockDistributor_Impl } void - StockDistributor_exec_i::ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + StockDistributor_exec_i::ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -306,8 +296,7 @@ namespace CIDL_StockDistributor_Impl } void - StockDistributor_exec_i::ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + StockDistributor_exec_i::ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -317,8 +306,7 @@ namespace CIDL_StockDistributor_Impl } void - StockDistributor_exec_i::ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + StockDistributor_exec_i::ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -338,8 +326,7 @@ namespace CIDL_StockDistributor_Impl } ::Components::EnterpriseComponent_ptr - StockDistributorHome_exec_i::create ( - ACE_ENV_SINGLE_ARG_DECL) + StockDistributorHome_exec_i::create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.h b/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.h index 605179ab613..b890eb0365f 100644 --- a/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.h +++ b/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.h @@ -52,8 +52,7 @@ namespace CIDL_StockDistributor_Impl virtual ::Stock::StockInfo * get_stock_info ( - const char * stock_name - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const char * stock_name) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Stock::Invalid_Stock)); @@ -135,76 +134,65 @@ namespace CIDL_StockDistributor_Impl // Supported or inherited operations. virtual void - start ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + start () ACE_THROW_SPEC ((CORBA::SystemException)); virtual void - stop ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + stop () ACE_THROW_SPEC ((CORBA::SystemException)); // Attribute operations. virtual ::CORBA::Long - rate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + rate () ACE_THROW_SPEC ((CORBA::SystemException)); virtual void rate ( - ::CORBA::Long - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::CORBA::Long) ACE_THROW_SPEC ((CORBA::SystemException)); // Port operations. virtual ::Stock::CCM_StockQuoter_ptr - get_push_quoter ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + get_push_quoter () ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent virtual void set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); @@ -254,8 +242,7 @@ namespace CIDL_StockDistributor_Impl virtual ~StockDistributorHome_exec_i (void); virtual ::Components::EnterpriseComponent_ptr - create ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); diff --git a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp index 586ad6bddfc..fb92bb2ea66 100644 --- a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp +++ b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp @@ -22,15 +22,14 @@ MyImpl::BMClosedED_exec_i::~BMClosedED_exec_i () // Operations from HUDisplay::BMClosedED BasicSP::CCM_ReadData_ptr -MyImpl::BMClosedED_exec_i::get_dataout (void) +MyImpl::BMClosedED_exec_i::get_dataout () ACE_THROW_SPEC ((CORBA::SystemException)) { return BasicSP::CCM_ReadData::_duplicate (this); } void -MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable * - ACE_ENV_ARG_DECL) +MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable *) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -52,7 +51,7 @@ MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable * ACE_DEBUG ((LM_DEBUG, "BMClosedED - got nil from get_connection \n")); - ACE_THROW (CORBA::BAD_INV_ORDER ()); + throw CORBA::BAD_INV_ORDER (); } CORBA::String_var str = @@ -74,14 +73,13 @@ MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable * BasicSP::DataAvailable_var event = new OBV_BasicSP::DataAvailable; - this->context_->push_out_avail (event - ACE_ENV_ARG_PARAMETER); + this->context_->push_out_avail (event); } // Operations from HUDisplay::position char * -MyImpl::BMClosedED_exec_i::get_data (void) +MyImpl::BMClosedED_exec_i::get_data () ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->str_.inout ()); @@ -91,7 +89,6 @@ MyImpl::BMClosedED_exec_i::get_data (void) void MyImpl::BMClosedED_exec_i::set_session_context ( Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) @@ -103,26 +100,24 @@ MyImpl::BMClosedED_exec_i::set_session_context ( } this->context_ = - BasicSP::CCM_BMClosedED_Context::_narrow (ctx - ACE_ENV_ARG_PARAMETER); + BasicSP::CCM_BMClosedED_Context::_narrow (ctx); if (CORBA::is_nil (this->context_.in ())) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } // Urm, we actually discard exceptions thown from this operation. } void -MyImpl::BMClosedED_exec_i::ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +MyImpl::BMClosedED_exec_i::ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { } void -MyImpl::BMClosedED_exec_i::ccm_activate (void) +MyImpl::BMClosedED_exec_i::ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -135,15 +130,14 @@ MyImpl::BMClosedED_exec_i::ccm_activate (void) } void -MyImpl::BMClosedED_exec_i::ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +MyImpl::BMClosedED_exec_i::ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { } void -MyImpl::BMClosedED_exec_i::ccm_passivate (void) +MyImpl::BMClosedED_exec_i::ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -153,7 +147,7 @@ MyImpl::BMClosedED_exec_i::ccm_passivate (void) } void -MyImpl::BMClosedED_exec_i::ccm_remove (void) +MyImpl::BMClosedED_exec_i::ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -177,7 +171,7 @@ MyImpl::BMClosedEDHome_exec_i::~BMClosedEDHome_exec_i () // Implicit home operations. ::Components::EnterpriseComponent_ptr -MyImpl::BMClosedEDHome_exec_i::create (void) +MyImpl::BMClosedEDHome_exec_i::create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { diff --git a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h index bbd53b4965a..c6f9c0ff1fe 100644 --- a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h +++ b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h @@ -41,50 +41,48 @@ namespace MyImpl // Operations from HUDisplay::BMClosedED virtual BasicSP::CCM_ReadData_ptr - get_dataout (void) + get_dataout () ACE_THROW_SPEC ((CORBA::SystemException)); virtual void - push_in_avail (BasicSP::DataAvailable *ev - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + push_in_avail (BasicSP::DataAvailable *ev) ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from HUDisplay::position virtual char * - get_data (void) + get_data () ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent virtual void - set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ciao_preactivate (void) + ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ccm_activate (void) + ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ciao_postactivate (void) + ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ccm_passivate (void) + ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ccm_remove (void) + ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); protected: @@ -115,7 +113,7 @@ namespace MyImpl // Implicit home operations. virtual ::Components::EnterpriseComponent_ptr - create (void) + create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); }; diff --git a/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp b/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp index de094123e2e..5f401e2de5d 100644 --- a/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp +++ b/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp @@ -18,15 +18,14 @@ MyImpl::BMDevice_exec_i::~BMDevice_exec_i () } BasicSP::CCM_ReadData_ptr -MyImpl::BMDevice_exec_i::get_data_read (void) +MyImpl::BMDevice_exec_i::get_data_read () ACE_THROW_SPEC ((CORBA::SystemException)) { return BasicSP::CCM_ReadData::_duplicate (this); } void -MyImpl::BMDevice_exec_i::push_timeout (BasicSP::TimeOut * - ACE_ENV_ARG_DECL) +MyImpl::BMDevice_exec_i::push_timeout (BasicSP::TimeOut *) ACE_THROW_SPEC ((CORBA::SystemException)) { // Nitify others @@ -38,19 +37,18 @@ MyImpl::BMDevice_exec_i::push_timeout (BasicSP::TimeOut * "BMDevice, received a timeout from EC \n")); } - this->context_->push_data_available (event - ACE_ENV_ARG_PARAMETER); + this->context_->push_data_available (event); } char * -MyImpl::BMDevice_exec_i::data_read (void) +MyImpl::BMDevice_exec_i::data_read () ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->str_); } char * -MyImpl::BMDevice_exec_i::get_data (void) +MyImpl::BMDevice_exec_i::get_data () ACE_THROW_SPEC ((CORBA::SystemException)) { return this->data_read (); @@ -60,7 +58,6 @@ MyImpl::BMDevice_exec_i::get_data (void) void MyImpl::BMDevice_exec_i::set_session_context ( Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) @@ -72,25 +69,24 @@ MyImpl::BMDevice_exec_i::set_session_context ( } this->context_ = - BasicSP::CCM_BMDevice_Context::_narrow (ctx - ACE_ENV_ARG_PARAMETER); + BasicSP::CCM_BMDevice_Context::_narrow (ctx); if (CORBA::is_nil (this->context_.in ())) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } // Urm, we actually discard exceptions thown from this operation. } void -MyImpl::BMDevice_exec_i::ciao_preactivate (void) +MyImpl::BMDevice_exec_i::ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { } void -MyImpl::BMDevice_exec_i::ccm_activate (void) +MyImpl::BMDevice_exec_i::ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -103,14 +99,14 @@ MyImpl::BMDevice_exec_i::ccm_activate (void) } void -MyImpl::BMDevice_exec_i::ciao_postactivate (void) +MyImpl::BMDevice_exec_i::ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { } void -MyImpl::BMDevice_exec_i::ccm_passivate (void) +MyImpl::BMDevice_exec_i::ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -122,7 +118,7 @@ MyImpl::BMDevice_exec_i::ccm_passivate (void) } void -MyImpl::BMDevice_exec_i::ccm_remove (void) +MyImpl::BMDevice_exec_i::ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -148,7 +144,7 @@ MyImpl::BMDeviceHome_exec_i::~BMDeviceHome_exec_i () // Implicit home operations. ::Components::EnterpriseComponent_ptr -MyImpl::BMDeviceHome_exec_i::create (void) +MyImpl::BMDeviceHome_exec_i::create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { diff --git a/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h b/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h index 68d98d01773..6ad460faee4 100644 --- a/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h +++ b/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h @@ -39,54 +39,52 @@ namespace MyImpl // Operations from BasicSP::BMDevice virtual BasicSP::CCM_ReadData_ptr - get_data_read (void) + get_data_read () ACE_THROW_SPEC ((CORBA::SystemException)); virtual void - push_timeout (BasicSP::TimeOut *ev - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + push_timeout (BasicSP::TimeOut *ev) ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from BasicSP::position virtual char * - data_read (void) + data_read () ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * - get_data (void) + get_data () ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent virtual void - set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ciao_preactivate (void) + ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ccm_activate (void) + ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ciao_postactivate (void) + ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ccm_passivate (void) + ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ccm_remove (void) + ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); protected: @@ -117,7 +115,7 @@ namespace MyImpl // Implicit home operations. virtual ::Components::EnterpriseComponent_ptr - create (void) + create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); }; diff --git a/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp b/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp index 002845c3840..227c26b41a4 100644 --- a/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp +++ b/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp @@ -18,7 +18,6 @@ MyImpl::BMDisplay_exec_impl::~BMDisplay_exec_impl () void MyImpl::BMDisplay_exec_impl::push_data_ready ( BasicSP::DataAvailable *ev - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -38,7 +37,7 @@ MyImpl::BMDisplay_exec_impl::push_data_ready ( = this->context_->get_connection_comp_data (); if (CORBA::is_nil (dat.in ())) - ACE_THROW (CORBA::BAD_INV_ORDER ()); + throw CORBA::BAD_INV_ORDER (); CORBA::String_var str = dat->get_data (); @@ -53,7 +52,6 @@ MyImpl::BMDisplay_exec_impl::push_data_ready ( void MyImpl::BMDisplay_exec_impl::set_session_context ( Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) @@ -65,17 +63,15 @@ MyImpl::BMDisplay_exec_impl::set_session_context ( } this->context_ = - BasicSP::CCM_BMDisplay_Context::_narrow (ctx - ACE_ENV_ARG_PARAMETER); + BasicSP::CCM_BMDisplay_Context::_narrow (ctx); if (CORBA::is_nil (this->context_.in ())) - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); // Urm, we actually discard exceptions thown from this operation. } void MyImpl::BMDisplay_exec_impl::ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) @@ -83,7 +79,7 @@ MyImpl::BMDisplay_exec_impl::ciao_preactivate ( } void -MyImpl::BMDisplay_exec_impl::ccm_activate (void) +MyImpl::BMDisplay_exec_impl::ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -97,7 +93,6 @@ MyImpl::BMDisplay_exec_impl::ccm_activate (void) void MyImpl::BMDisplay_exec_impl::ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) @@ -106,7 +101,6 @@ MyImpl::BMDisplay_exec_impl::ciao_postactivate ( void MyImpl::BMDisplay_exec_impl::ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) @@ -119,7 +113,7 @@ MyImpl::BMDisplay_exec_impl::ccm_passivate ( } void -MyImpl::BMDisplay_exec_impl::ccm_remove (void) +MyImpl::BMDisplay_exec_impl::ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -145,7 +139,7 @@ MyImpl::BMDisplayHome_exec_impl::~BMDisplayHome_exec_impl () // Implicit home operations. ::Components::EnterpriseComponent_ptr -MyImpl::BMDisplayHome_exec_impl::create (void) +MyImpl::BMDisplayHome_exec_impl::create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { diff --git a/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.h b/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.h index 156d1aeea33..4d1f1e9e1a0 100644 --- a/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.h +++ b/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.h @@ -38,40 +38,38 @@ namespace MyImpl // Operations from BasicSP::BMDisplay virtual void - push_data_ready (BasicSP::DataAvailable *ev - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + push_data_ready (BasicSP::DataAvailable *ev) ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent virtual void - set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ciao_preactivate (void) + ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ccm_activate (void) + ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ciao_postactivate (void) + ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ccm_passivate (void) + ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ccm_remove (void) + ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); protected: @@ -100,7 +98,7 @@ namespace MyImpl // Implicit home operations. virtual ::Components::EnterpriseComponent_ptr - create (void) + create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); }; diff --git a/CIAO/examples/BasicSP/EC/EC_exec.cpp b/CIAO/examples/BasicSP/EC/EC_exec.cpp index 674a5e75804..7c1a9058abf 100644 --- a/CIAO/examples/BasicSP/EC/EC_exec.cpp +++ b/CIAO/examples/BasicSP/EC/EC_exec.cpp @@ -135,15 +135,14 @@ MyImpl::EC_exec_i::~EC_exec_i () } CORBA::Long -MyImpl::EC_exec_i::hertz (void) +MyImpl::EC_exec_i::hertz () ACE_THROW_SPEC ((CORBA::SystemException)) { return this->hertz_; } void -MyImpl::EC_exec_i::hertz (CORBA::Long hertz - ACE_ENV_ARG_DECL_NOT_USED) +MyImpl::EC_exec_i::hertz (CORBA::Long hertz) ACE_THROW_SPEC ((CORBA::SystemException)) { this->hertz_ = hertz; @@ -152,29 +151,29 @@ MyImpl::EC_exec_i::hertz (CORBA::Long hertz // Operations from supported interface(s) void -MyImpl::EC_exec_i::start (void) +MyImpl::EC_exec_i::start () ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->hertz_ == 0 || this->pulser_.active()) - ACE_THROW (CORBA::BAD_INV_ORDER ()); + throw CORBA::BAD_INV_ORDER (); // @@ Start the rate generator this->pulser_.start (this->hertz_); } void -MyImpl::EC_exec_i::stop (void) +MyImpl::EC_exec_i::stop () ACE_THROW_SPEC ((CORBA::SystemException)) { if (! this->pulser_.active ()) - ACE_THROW (CORBA::BAD_INV_ORDER ()); + throw CORBA::BAD_INV_ORDER (); // @@ stop the rate generator this->pulser_.stop (); } CORBA::Boolean -MyImpl::EC_exec_i::active (void) +MyImpl::EC_exec_i::active () ACE_THROW_SPEC ((CORBA::SystemException)) { return this->pulser_.active (); @@ -183,8 +182,7 @@ MyImpl::EC_exec_i::active (void) // Operations from Components::SessionComponent void -MyImpl::EC_exec_i::set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) +MyImpl::EC_exec_i::set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -192,24 +190,23 @@ MyImpl::EC_exec_i::set_session_context (Components::SessionContext_ptr ctx ACE_DEBUG ((LM_DEBUG, "MyImpl::EC_exec_i::set_session_context\n")); this->context_ = - BasicSP::CCM_EC_Context::_narrow (ctx - ACE_ENV_ARG_PARAMETER); + BasicSP::CCM_EC_Context::_narrow (ctx); if (CORBA::is_nil (this->context_.in ())) - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); // Urm, we actually discard exceptions thown from this operation. } void -MyImpl::EC_exec_i::ciao_preactivate (void) +MyImpl::EC_exec_i::ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { } void -MyImpl::EC_exec_i::ccm_activate (void) +MyImpl::EC_exec_i::ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -220,14 +217,14 @@ MyImpl::EC_exec_i::ccm_activate (void) } void -MyImpl::EC_exec_i::ciao_postactivate (void) +MyImpl::EC_exec_i::ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { } void -MyImpl::EC_exec_i::ccm_passivate (void) +MyImpl::EC_exec_i::ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -237,7 +234,7 @@ MyImpl::EC_exec_i::ccm_passivate (void) } void -MyImpl::EC_exec_i::ccm_remove (void) +MyImpl::EC_exec_i::ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -248,7 +245,7 @@ MyImpl::EC_exec_i::ccm_remove (void) void MyImpl::EC_exec_i::pulse (void) { - ACE_TRY_NEW_ENV + try { if (CIAO::debug_level () > 0) ACE_DEBUG ((LM_DEBUG, @@ -256,14 +253,12 @@ MyImpl::EC_exec_i::pulse (void) BasicSP::TimeOut_var ev = new OBV_BasicSP::TimeOut (); - this->context_->push_timeout (ev.in () - ACE_ENV_ARG_PARAMETER); + this->context_->push_timeout (ev.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // @@ do nothing? } - ACE_ENDTRY; } @@ -276,15 +271,14 @@ MyImpl::ECHome_exec_i::~ECHome_exec_i () } ::Components::EnterpriseComponent_ptr -MyImpl::ECHome_exec_i::new_EC (CORBA::Long hertz - ACE_ENV_ARG_DECL_NOT_USED) +MyImpl::ECHome_exec_i::new_EC (CORBA::Long hertz) ACE_THROW_SPEC ((CORBA::SystemException)) { return new MyImpl::EC_exec_i (hertz); } ::Components::EnterpriseComponent_ptr -MyImpl::ECHome_exec_i::create (void) +MyImpl::ECHome_exec_i::create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { diff --git a/CIAO/examples/BasicSP/EC/EC_exec.h b/CIAO/examples/BasicSP/EC/EC_exec.h index 8f4b8853e5b..dfc68f19dce 100644 --- a/CIAO/examples/BasicSP/EC/EC_exec.h +++ b/CIAO/examples/BasicSP/EC/EC_exec.h @@ -90,49 +90,47 @@ namespace MyImpl // Attribute operations. - virtual CORBA::Long hertz (void) + virtual CORBA::Long hertz () ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void hertz (CORBA::Long hertz - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void hertz (CORBA::Long hertz) ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from supported interface(s) - virtual void start (void) + virtual void start () ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void stop (void) + virtual void stop () ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Boolean active (void) + virtual CORBA::Boolean active () ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent - virtual void set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ciao_preactivate (void) + virtual void ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_activate (void) + virtual void ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ciao_postactivate (void) + virtual void ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_passivate (void) + virtual void ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_remove (void) + virtual void ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); @@ -170,14 +168,13 @@ namespace MyImpl // Explicit home operations. virtual ::Components::EnterpriseComponent_ptr - new_EC (CORBA::Long hertz - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + new_EC (CORBA::Long hertz) ACE_THROW_SPEC ((CORBA::SystemException)); // Implicit home operations. virtual ::Components::EnterpriseComponent_ptr - create (void) + create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); }; diff --git a/CIAO/examples/BasicSP/EC/client.cpp b/CIAO/examples/BasicSP/EC/client.cpp index bbe5c7e6ecd..62354cbe814 100644 --- a/CIAO/examples/BasicSP/EC/client.cpp +++ b/CIAO/examples/BasicSP/EC/client.cpp @@ -18,20 +18,18 @@ int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // Initialize orb - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ""); // Resolve HomeFinder interface CORBA::Object_var obj - = orb->string_to_object ("file://ec.ior" ACE_ENV_ARG_PARAMETER); + = orb->string_to_object ("file://ec.ior"); BasicSP::ECHome_var home - = BasicSP::ECHome::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + = BasicSP::ECHome::_narrow (obj.in ()); if (CORBA::is_nil (home.in ())) ACE_ERROR_RETURN ((LM_ERROR, "Unable to acquire ECHome objref\n"), -1); @@ -40,8 +38,7 @@ main (int argc, char *argv[]) = home->create (); // Place to plug in the rate - pulser->hertz (5 - ACE_ENV_ARG_PARAMETER); + pulser->hertz (5); pulser->start (); @@ -49,20 +46,17 @@ main (int argc, char *argv[]) pulser->stop (); - home->remove_component (pulser.in () - ACE_ENV_ARG_PARAMETER); + home->remove_component (pulser.in ()); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Who is the culprit \n"); + ex._tao_print_exception ("Who is the culprit \n"); ACE_ERROR_RETURN ((LM_ERROR, "Uncaught CORBA exception\n"), 1); } - ACE_ENDTRY; return 0; } diff --git a/CIAO/examples/BasicSP/EC/controller.cpp b/CIAO/examples/BasicSP/EC/controller.cpp index 87e8c28ad77..13a5fd6d81e 100644 --- a/CIAO/examples/BasicSP/EC/controller.cpp +++ b/CIAO/examples/BasicSP/EC/controller.cpp @@ -72,13 +72,12 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); if (parse_args (argc, argv) != 0) { @@ -86,12 +85,10 @@ main (int argc, char *argv[]) } CORBA::Object_var obj = - orb->string_to_object (rategen_ior_ - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (rategen_ior_); BasicSP::EC_var pulser - = BasicSP::EC::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + = BasicSP::EC::_narrow (obj.in ()); if (CORBA::is_nil (pulser.in ())) { @@ -100,13 +97,11 @@ main (int argc, char *argv[]) -1); } - pulser->hertz (rate - ACE_ENV_ARG_PARAMETER); + pulser->hertz (rate); if (turn_on) { - pulser->hertz (rate - ACE_ENV_ARG_PARAMETER); + pulser->hertz (rate); ACE_DEBUG ((LM_DEBUG, "Start up the Event services\n")); @@ -121,15 +116,13 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Who is the culprit \n"); + ex._tao_print_exception ("Who is the culprit \n"); ACE_ERROR_RETURN ((LM_ERROR, "Uncaught CORBA exception\n"), 1); } - ACE_ENDTRY; return 0; } diff --git a/CIAO/examples/Display/GPS/GPS_exec.cpp b/CIAO/examples/Display/GPS/GPS_exec.cpp index 228ef1a77a2..f86e6226bad 100644 --- a/CIAO/examples/Display/GPS/GPS_exec.cpp +++ b/CIAO/examples/Display/GPS/GPS_exec.cpp @@ -9,14 +9,14 @@ // Operations from HUDisplay::position CORBA::Long -MyImpl::Position_Impl::posx (void) +MyImpl::Position_Impl::posx () ACE_THROW_SPEC ((CORBA::SystemException)) { return component_.posx(); } CORBA::Long -MyImpl::Position_Impl::posy (void) +MyImpl::Position_Impl::posy () ACE_THROW_SPEC ((CORBA::SystemException)) { return component_.posy(); @@ -38,7 +38,7 @@ MyImpl::GPS_exec_i::~GPS_exec_i () // Operations from HUDisplay::GPS HUDisplay::CCM_position_ptr - MyImpl::GPS_exec_i::get_MyLocation (void) + MyImpl::GPS_exec_i::get_MyLocation () ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, @@ -47,8 +47,7 @@ MyImpl::GPS_exec_i::~GPS_exec_i () } void -MyImpl::GPS_exec_i::push_Refresh (HUDisplay::tick * - ACE_ENV_ARG_DECL) +MyImpl::GPS_exec_i::push_Refresh (HUDisplay::tick *) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, @@ -61,19 +60,18 @@ MyImpl::GPS_exec_i::push_Refresh (HUDisplay::tick * // Nitify others HUDisplay::tick_var event = new OBV_HUDisplay::tick; - this->context_->push_Ready (event - ACE_ENV_ARG_PARAMETER); + this->context_->push_Ready (event); } CORBA::Long -MyImpl::GPS_exec_i::posx (void) +MyImpl::GPS_exec_i::posx () ACE_THROW_SPEC ((CORBA::SystemException)) { return this->positionx_; } CORBA::Long -MyImpl::GPS_exec_i::posy (void) +MyImpl::GPS_exec_i::posy () ACE_THROW_SPEC ((CORBA::SystemException)) { return this->positiony_; @@ -82,8 +80,7 @@ MyImpl::GPS_exec_i::posy (void) // Operations from Components::SessionComponent void -MyImpl::GPS_exec_i::set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) +MyImpl::GPS_exec_i::set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -91,23 +88,22 @@ MyImpl::GPS_exec_i::set_session_context (Components::SessionContext_ptr ctx ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_exec_i::set_session_context\n")); this->context_ = - HUDisplay::CCM_GPS_Context::_narrow (ctx - ACE_ENV_ARG_PARAMETER); + HUDisplay::CCM_GPS_Context::_narrow (ctx); if (CORBA::is_nil (this->context_.in ())) - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); // Urm, we actually discard exceptions thown from this operation. } void -MyImpl::GPS_exec_i::ciao_preactivate (void) +MyImpl::GPS_exec_i::ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { } void -MyImpl::GPS_exec_i::ccm_activate (void) +MyImpl::GPS_exec_i::ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -116,14 +112,14 @@ MyImpl::GPS_exec_i::ccm_activate (void) } void -MyImpl::GPS_exec_i::ciao_postactivate (void) +MyImpl::GPS_exec_i::ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { } void -MyImpl::GPS_exec_i::ccm_passivate (void) +MyImpl::GPS_exec_i::ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -132,7 +128,7 @@ MyImpl::GPS_exec_i::ccm_passivate (void) } void -MyImpl::GPS_exec_i::ccm_remove (void) +MyImpl::GPS_exec_i::ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -155,7 +151,7 @@ MyImpl::GPSHome_exec_i::~GPSHome_exec_i () // Implicit home operations. ::Components::EnterpriseComponent_ptr -MyImpl::GPSHome_exec_i::create (void) +MyImpl::GPSHome_exec_i::create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { diff --git a/CIAO/examples/Display/GPS/GPS_exec.h b/CIAO/examples/Display/GPS/GPS_exec.h index a6f4bac13e6..d4b8a0b777e 100644 --- a/CIAO/examples/Display/GPS/GPS_exec.h +++ b/CIAO/examples/Display/GPS/GPS_exec.h @@ -36,42 +36,41 @@ namespace MyImpl ~GPS_exec_i (); // Operations from HUDisplay::GPS - HUDisplay::CCM_position_ptr get_MyLocation (void) + HUDisplay::CCM_position_ptr get_MyLocation () ACE_THROW_SPEC ((CORBA::SystemException)); - void push_Refresh (HUDisplay::tick * ACE_ENV_ARG_DECL) + void push_Refresh (HUDisplay::tick *) ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from HUDisplay::position - CORBA::Long posx (void) + CORBA::Long posx () ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Long posy (void) + CORBA::Long posy () ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent - void set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) + void set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - void ciao_preactivate (void) + void ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - void ccm_activate (void) + void ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - void ciao_postactivate (void) + void ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - void ccm_passivate (void) + void ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - void ccm_remove (void) + void ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); @@ -102,12 +101,12 @@ namespace MyImpl // Explicit home operations /* virtual ::Components::EnterpriseComponent_ptr */ -/* new_GPS (void) */ +/* new_GPS () */ /* ACE_THROW_SPEC ((CORBA::SystemException)); */ // Implicit home operations virtual ::Components::EnterpriseComponent_ptr - create (void) + create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); }; @@ -123,10 +122,10 @@ namespace MyImpl } // Operations from HUDisplay::position - CORBA::Long posx (void) + CORBA::Long posx () ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Long posy (void) + CORBA::Long posy () ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/CIAO/examples/Display/GPS/GPS_tracing_exec.cpp b/CIAO/examples/Display/GPS/GPS_tracing_exec.cpp index faa5a3665d9..98b52c9ac74 100644 --- a/CIAO/examples/Display/GPS/GPS_tracing_exec.cpp +++ b/CIAO/examples/Display/GPS/GPS_tracing_exec.cpp @@ -24,15 +24,14 @@ MyImpl::GPS_tracing_exec_i::~GPS_tracing_exec_i () // Operations from HUDisplay::GPS HUDisplay::CCM_position_ptr -MyImpl::GPS_tracing_exec_i::get_MyLocation (void) +MyImpl::GPS_tracing_exec_i::get_MyLocation () ACE_THROW_SPEC ((CORBA::SystemException)) { return HUDisplay::CCM_position::_duplicate (this); } void -MyImpl::GPS_tracing_exec_i::push_Refresh (HUDisplay::tick * - ACE_ENV_ARG_DECL) +MyImpl::GPS_tracing_exec_i::push_Refresh (HUDisplay::tick *) ACE_THROW_SPEC ((CORBA::SystemException)) { // Refresh position @@ -47,21 +46,20 @@ MyImpl::GPS_tracing_exec_i::push_Refresh (HUDisplay::tick * // Nitify others HUDisplay::tick_var event = new OBV_HUDisplay::tick; - this->context_->push_Ready (event - ACE_ENV_ARG_PARAMETER); + this->context_->push_Ready (event); } // Operations from HUDisplay::position CORBA::Long -MyImpl::GPS_tracing_exec_i::posx (void) +MyImpl::GPS_tracing_exec_i::posx () ACE_THROW_SPEC ((CORBA::SystemException)) { return this->positionx_; } CORBA::Long -MyImpl::GPS_tracing_exec_i::posy (void) +MyImpl::GPS_tracing_exec_i::posy () ACE_THROW_SPEC ((CORBA::SystemException)) { return this->positiony_; @@ -70,8 +68,7 @@ MyImpl::GPS_tracing_exec_i::posy (void) // Operations from Components::SessionComponent void MyImpl::GPS_tracing_exec_i::set_session_context ( - Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) + Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -80,23 +77,22 @@ MyImpl::GPS_tracing_exec_i::set_session_context ( "MyImpl::GPS_tracing_exec_i::set_session_context\n")); this->context_ = - HUDisplay::CCM_GPS_Context::_narrow (ctx - ACE_ENV_ARG_PARAMETER); + HUDisplay::CCM_GPS_Context::_narrow (ctx); if (CORBA::is_nil (this->context_.in ())) - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); // Urm, we actually discard exceptions thown from this operation. } void -MyImpl::GPS_tracing_exec_i::ciao_preactivate (void) +MyImpl::GPS_tracing_exec_i::ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { } void -MyImpl::GPS_tracing_exec_i::ccm_activate (void) +MyImpl::GPS_tracing_exec_i::ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -105,14 +101,14 @@ MyImpl::GPS_tracing_exec_i::ccm_activate (void) } void -MyImpl::GPS_tracing_exec_i::ciao_postactivate (void) +MyImpl::GPS_tracing_exec_i::ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { } void -MyImpl::GPS_tracing_exec_i::ccm_passivate (void) +MyImpl::GPS_tracing_exec_i::ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -121,7 +117,7 @@ MyImpl::GPS_tracing_exec_i::ccm_passivate (void) } void -MyImpl::GPS_tracing_exec_i::ccm_remove (void) +MyImpl::GPS_tracing_exec_i::ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -144,7 +140,7 @@ MyImpl::GPSHome_tracing_exec_i::~GPSHome_tracing_exec_i () // Implicit home operations. ::Components::EnterpriseComponent_ptr -MyImpl::GPSHome_tracing_exec_i::create (void) +MyImpl::GPSHome_tracing_exec_i::create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { diff --git a/CIAO/examples/Display/GPS/GPS_tracing_exec.h b/CIAO/examples/Display/GPS/GPS_tracing_exec.h index eba841f735f..c6b67a34767 100644 --- a/CIAO/examples/Display/GPS/GPS_tracing_exec.h +++ b/CIAO/examples/Display/GPS/GPS_tracing_exec.h @@ -36,54 +36,52 @@ namespace MyImpl // Operations from HUDisplay::GPS virtual HUDisplay::CCM_position_ptr - get_MyLocation (void) + get_MyLocation () ACE_THROW_SPEC ((CORBA::SystemException)); virtual void - push_Refresh (HUDisplay::tick *ev - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + push_Refresh (HUDisplay::tick *ev) ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from HUDisplay::position virtual CORBA::Long - posx (void) + posx () ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Long - posy (void) + posy () ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent virtual void - set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ciao_preactivate (void) + ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ccm_activate (void) + ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ciao_postactivate (void) + ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ccm_passivate (void) + ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ccm_remove (void) + ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); protected: @@ -120,7 +118,7 @@ namespace MyImpl // Implicit home operations. virtual ::Components::EnterpriseComponent_ptr - create (void) + create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); }; diff --git a/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp b/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp index dba1056e52c..06d1d8c213b 100644 --- a/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp +++ b/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp @@ -16,8 +16,7 @@ MyImpl::NavDisplay_exec_impl::~NavDisplay_exec_impl () // Operations from HUDisplay::NavDisplay void -MyImpl::NavDisplay_exec_impl::push_Refresh (HUDisplay::tick *ev - ACE_ENV_ARG_DECL) +MyImpl::NavDisplay_exec_impl::push_Refresh (HUDisplay::tick *ev) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG (ev); @@ -31,7 +30,7 @@ MyImpl::NavDisplay_exec_impl::push_Refresh (HUDisplay::tick *ev if (CORBA::is_nil (loc.in ())) { - ACE_THROW (CORBA::BAD_INV_ORDER ()); + throw CORBA::BAD_INV_ORDER (); } CORBA::Long x = loc->posx () % 500; @@ -47,7 +46,6 @@ MyImpl::NavDisplay_exec_impl::push_Refresh (HUDisplay::tick *ev void MyImpl::NavDisplay_exec_impl::set_session_context ( Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) @@ -59,19 +57,17 @@ MyImpl::NavDisplay_exec_impl::set_session_context ( } this->context_ = - HUDisplay::CCM_NavDisplay_Context::_narrow (ctx - ACE_ENV_ARG_PARAMETER); + HUDisplay::CCM_NavDisplay_Context::_narrow (ctx); if (CORBA::is_nil (this->context_.in ())) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } // Urm, we actually discard exceptions thown from this operation. } void MyImpl::NavDisplay_exec_impl::ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) @@ -79,7 +75,7 @@ MyImpl::NavDisplay_exec_impl::ciao_preactivate ( } void -MyImpl::NavDisplay_exec_impl::ccm_activate (void) +MyImpl::NavDisplay_exec_impl::ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -92,7 +88,6 @@ MyImpl::NavDisplay_exec_impl::ccm_activate (void) void MyImpl::NavDisplay_exec_impl::ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) @@ -100,7 +95,7 @@ MyImpl::NavDisplay_exec_impl::ciao_postactivate ( } void -MyImpl::NavDisplay_exec_impl::ccm_passivate (void) +MyImpl::NavDisplay_exec_impl::ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -112,7 +107,7 @@ MyImpl::NavDisplay_exec_impl::ccm_passivate (void) } void -MyImpl::NavDisplay_exec_impl::ccm_remove (void) +MyImpl::NavDisplay_exec_impl::ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -138,7 +133,7 @@ MyImpl::NavDisplayHome_exec_impl::~NavDisplayHome_exec_impl () // Implicit home operations. ::Components::EnterpriseComponent_ptr -MyImpl::NavDisplayHome_exec_impl::create (void) +MyImpl::NavDisplayHome_exec_impl::create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { diff --git a/CIAO/examples/Display/NavDisplay/NavDisplay_exec.h b/CIAO/examples/Display/NavDisplay/NavDisplay_exec.h index b71ddd7437f..3c5ca68d40d 100644 --- a/CIAO/examples/Display/NavDisplay/NavDisplay_exec.h +++ b/CIAO/examples/Display/NavDisplay/NavDisplay_exec.h @@ -37,39 +37,37 @@ namespace MyImpl // Operations from HUDisplay::NavDisplay virtual void - push_Refresh (HUDisplay::tick *ev - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + push_Refresh (HUDisplay::tick *ev) ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent virtual void - set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ciao_preactivate (void) + ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ccm_activate (void) + ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ciao_postactivate (void) + ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ccm_passivate (void) + ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ccm_remove (void) + ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); protected: @@ -98,7 +96,7 @@ namespace MyImpl // Implicit home operations. virtual ::Components::EnterpriseComponent_ptr - create (void) + create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); }; diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp index 6e2d7b2b5fc..32a4ebea140 100644 --- a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp +++ b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp @@ -34,8 +34,7 @@ MyImpl::NavDisplayGUI_exec_impl::~NavDisplayGUI_exec_impl () void MyImpl::NavDisplayGUI_exec_impl::push_Refresh ( - HUDisplay::tick * /* ev */ - ACE_ENV_ARG_DECL) + HUDisplay::tick * /* ev */) ACE_THROW_SPEC ((CORBA::SystemException)) { //ACE_DEBUG ((LM_DEBUG, "ENTER: MyImpl::NavDisplayGUI_exec_impl::push_Refresh()\n")); @@ -73,8 +72,7 @@ MyImpl::NavDisplayGUI_exec_impl::push_Refresh ( // Operations from Components::SessionComponent void -MyImpl::NavDisplayGUI_exec_impl::set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) +MyImpl::NavDisplayGUI_exec_impl::set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -82,23 +80,22 @@ MyImpl::NavDisplayGUI_exec_impl::set_session_context (Components::SessionContext ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplayGUI_exec_impl::set_session_context\n")); this->context_ = - HUDisplay::CCM_NavDisplay_Context::_narrow (ctx - ACE_ENV_ARG_PARAMETER); + HUDisplay::CCM_NavDisplay_Context::_narrow (ctx); if (CORBA::is_nil (this->context_.in ())) - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); // Urm, we actually discard exceptions thown from this operation. } void -MyImpl::NavDisplayGUI_exec_impl::ciao_preactivate (void) +MyImpl::NavDisplayGUI_exec_impl::ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { } void -MyImpl::NavDisplayGUI_exec_impl::ccm_activate (void) +MyImpl::NavDisplayGUI_exec_impl::ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -111,7 +108,7 @@ MyImpl::NavDisplayGUI_exec_impl::ccm_activate (void) { ACE_DEBUG((LM_ERROR, "Cannot activate client threads\n")); - ACE_THROW(Components::CCMException()); + throw Components::CCMException(); } worker_->waitUntillInitialized(); @@ -127,14 +124,14 @@ MyImpl::NavDisplayGUI_exec_impl::ccm_activate (void) } void -MyImpl::NavDisplayGUI_exec_impl::ciao_postactivate (void) +MyImpl::NavDisplayGUI_exec_impl::ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { } void -MyImpl::NavDisplayGUI_exec_impl::ccm_passivate (void) +MyImpl::NavDisplayGUI_exec_impl::ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -154,7 +151,7 @@ MyImpl::NavDisplayGUI_exec_impl::ccm_passivate (void) } void -MyImpl::NavDisplayGUI_exec_impl::ccm_remove (void) +MyImpl::NavDisplayGUI_exec_impl::ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -183,7 +180,7 @@ MyImpl::NavDisplayGUIHome_exec_impl::~NavDisplayGUIHome_exec_impl () // Implicit home operations. ::Components::EnterpriseComponent_ptr -MyImpl::NavDisplayGUIHome_exec_impl::create (void) +MyImpl::NavDisplayGUIHome_exec_impl::create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h index 3d212211191..e41de4c68d9 100644 --- a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h +++ b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h @@ -42,40 +42,38 @@ namespace MyImpl // Operations from HUDisplay::NavDisplay virtual void - push_Refresh (HUDisplay::tick *ev - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + push_Refresh (HUDisplay::tick *ev) ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent virtual void - set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ciao_preactivate (void) + ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ccm_activate (void) + ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ciao_postactivate (void) + ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ccm_passivate (void) + ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual void - ccm_remove (void) + ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); protected: @@ -108,7 +106,7 @@ namespace MyImpl // Implicit home operations. virtual ::Components::EnterpriseComponent_ptr - create (void) + create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); }; diff --git a/CIAO/examples/Display/RateGen/RateGen_exec.cpp b/CIAO/examples/Display/RateGen/RateGen_exec.cpp index 114aefc6aad..7ff04b21dae 100644 --- a/CIAO/examples/Display/RateGen/RateGen_exec.cpp +++ b/CIAO/examples/Display/RateGen/RateGen_exec.cpp @@ -146,15 +146,14 @@ MyImpl::RateGen_exec_i::~RateGen_exec_i () } CORBA::Long -MyImpl::RateGen_exec_i::hertz (void) +MyImpl::RateGen_exec_i::hertz () ACE_THROW_SPEC ((CORBA::SystemException)) { return this->hertz_; } void -MyImpl::RateGen_exec_i::hertz (CORBA::Long hertz - ACE_ENV_ARG_DECL_NOT_USED) +MyImpl::RateGen_exec_i::hertz (CORBA::Long hertz) ACE_THROW_SPEC ((CORBA::SystemException)) { this->hertz_ = hertz; @@ -163,12 +162,12 @@ MyImpl::RateGen_exec_i::hertz (CORBA::Long hertz // Operations from supported interface(s) void -MyImpl::RateGen_exec_i::start (void) +MyImpl::RateGen_exec_i::start () ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->hertz_ == 0 || this->pulser_.active()) { - ACE_THROW (CORBA::BAD_INV_ORDER ()); + throw CORBA::BAD_INV_ORDER (); } // @@ Start the rate generator @@ -176,12 +175,12 @@ MyImpl::RateGen_exec_i::start (void) } void -MyImpl::RateGen_exec_i::stop (void) +MyImpl::RateGen_exec_i::stop () ACE_THROW_SPEC ((CORBA::SystemException)) { if (! this->pulser_.active ()) { - ACE_THROW (CORBA::BAD_INV_ORDER ()); + throw CORBA::BAD_INV_ORDER (); } // @@ stop the rate generator @@ -189,7 +188,7 @@ MyImpl::RateGen_exec_i::stop (void) } CORBA::Boolean -MyImpl::RateGen_exec_i::active (void) +MyImpl::RateGen_exec_i::active () ACE_THROW_SPEC ((CORBA::SystemException)) { return this->pulser_.active (); @@ -200,7 +199,6 @@ MyImpl::RateGen_exec_i::active (void) void MyImpl::RateGen_exec_i::set_session_context ( Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) @@ -212,26 +210,25 @@ MyImpl::RateGen_exec_i::set_session_context ( } this->context_ = - HUDisplay::CCM_RateGen_Context::_narrow (ctx - ACE_ENV_ARG_PARAMETER); + HUDisplay::CCM_RateGen_Context::_narrow (ctx); if (CORBA::is_nil (this->context_.in ())) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } // Urm, we actually discard exceptions thown from this operation. } void -MyImpl::RateGen_exec_i::ciao_preactivate (void) +MyImpl::RateGen_exec_i::ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { } void -MyImpl::RateGen_exec_i::ccm_activate (void) +MyImpl::RateGen_exec_i::ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -245,14 +242,14 @@ MyImpl::RateGen_exec_i::ccm_activate (void) } void -MyImpl::RateGen_exec_i::ciao_postactivate (void) +MyImpl::RateGen_exec_i::ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { } void -MyImpl::RateGen_exec_i::ccm_passivate (void) +MyImpl::RateGen_exec_i::ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -266,7 +263,7 @@ MyImpl::RateGen_exec_i::ccm_passivate (void) } void -MyImpl::RateGen_exec_i::ccm_remove (void) +MyImpl::RateGen_exec_i::ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -280,7 +277,7 @@ MyImpl::RateGen_exec_i::ccm_remove (void) void MyImpl::RateGen_exec_i::pulse (void) { - ACE_TRY_NEW_ENV + try { // if (CIAO::debug_level () > 0) // { @@ -290,14 +287,12 @@ MyImpl::RateGen_exec_i::pulse (void) HUDisplay::tick_var ev = new OBV_HUDisplay::tick (); - this->context_->push_Pulse (ev.in () - ACE_ENV_ARG_PARAMETER); + this->context_->push_Pulse (ev.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // @@ do nothing? } - ACE_ENDTRY; } @@ -310,8 +305,7 @@ MyImpl::RateGenHome_exec_i::~RateGenHome_exec_i () } ::Components::EnterpriseComponent_ptr -MyImpl::RateGenHome_exec_i::new_RateGen (CORBA::Long /* hertz */ - ACE_ENV_ARG_DECL) +MyImpl::RateGenHome_exec_i::new_RateGen (CORBA::Long /* hertz */) ACE_THROW_SPEC ((CORBA::SystemException)) { Components::EnterpriseComponent_ptr tmp = 0; @@ -323,7 +317,7 @@ MyImpl::RateGenHome_exec_i::new_RateGen (CORBA::Long /* hertz */ } ::Components::EnterpriseComponent_ptr -MyImpl::RateGenHome_exec_i::create (void) +MyImpl::RateGenHome_exec_i::create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { diff --git a/CIAO/examples/Display/RateGen/RateGen_exec.h b/CIAO/examples/Display/RateGen/RateGen_exec.h index f0fe3a430ee..68c54c180c0 100644 --- a/CIAO/examples/Display/RateGen/RateGen_exec.h +++ b/CIAO/examples/Display/RateGen/RateGen_exec.h @@ -89,48 +89,46 @@ namespace MyImpl // Attribute operations. - virtual CORBA::Long hertz (void) + virtual CORBA::Long hertz () ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void hertz (CORBA::Long hertz - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void hertz (CORBA::Long hertz) ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from supported interface(s) - virtual void start (void) + virtual void start () ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void stop (void) + virtual void stop () ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Boolean active (void) + virtual CORBA::Boolean active () ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent - virtual void set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ciao_preactivate (void) + virtual void ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_activate (void) + virtual void ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ciao_postactivate (void) + virtual void ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_passivate (void) + virtual void ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_remove (void) + virtual void ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); @@ -168,14 +166,13 @@ namespace MyImpl // Explicit home operations. virtual ::Components::EnterpriseComponent_ptr - new_RateGen (CORBA::Long hertz - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + new_RateGen (CORBA::Long hertz) ACE_THROW_SPEC ((CORBA::SystemException)); // Implicit home operations. virtual ::Components::EnterpriseComponent_ptr - create (void) + create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); }; diff --git a/CIAO/examples/Display/RateGen/controller.cpp b/CIAO/examples/Display/RateGen/controller.cpp index ea745dcdd69..fdb5838382d 100644 --- a/CIAO/examples/Display/RateGen/controller.cpp +++ b/CIAO/examples/Display/RateGen/controller.cpp @@ -69,14 +69,13 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); if (parse_args (argc, argv) != 0) { @@ -84,12 +83,10 @@ main (int argc, char *argv[]) } CORBA::Object_var obj = - orb->string_to_object (rategen_ior_ - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (rategen_ior_); HUDisplay::RateGen_var pulser = - HUDisplay::RateGen::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + HUDisplay::RateGen::_narrow (obj.in ()); if (CORBA::is_nil (pulser.in ())) { @@ -100,8 +97,7 @@ main (int argc, char *argv[]) if (turn_on) { - pulser->hertz (rate - ACE_ENV_ARG_PARAMETER); + pulser->hertz (rate); ACE_DEBUG ((LM_DEBUG, "Start up the Rate Generator\n")); @@ -116,14 +112,12 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Who is the culprit \n"); + ex._tao_print_exception ("Who is the culprit \n"); cerr << "Uncaught CORBA exception" << endl; return 1; } - ACE_ENDTRY; return 0; } diff --git a/CIAO/examples/Hello/Receiver/Receiver_exec.cpp b/CIAO/examples/Hello/Receiver/Receiver_exec.cpp index 22f5920495f..f8e55decc14 100644 --- a/CIAO/examples/Hello/Receiver/Receiver_exec.cpp +++ b/CIAO/examples/Hello/Receiver/Receiver_exec.cpp @@ -19,8 +19,7 @@ namespace CIDL_Receiver_Impl } void - Receiver_exec_i::push_click_in (Hello::TimeOut * ev - ACE_ENV_ARG_DECL) + Receiver_exec_i::push_click_in (Hello::TimeOut * ev) ACE_THROW_SPEC ((CORBA::SystemException)) { //Get the message from the Sender first. @@ -33,7 +32,7 @@ namespace CIDL_Receiver_Impl (); if (CORBA::is_nil (rev.in ())) - ACE_THROW (CORBA::BAD_INV_ORDER ()); + throw CORBA::BAD_INV_ORDER (); CORBA::String_var str = rev->get_message (); @@ -45,23 +44,21 @@ namespace CIDL_Receiver_Impl // Operations from Components::SessionComponen void - Receiver_exec_i::set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) + Receiver_exec_i::set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_session_context\n")); this->context_ = - Receiver_Exec_Context::_narrow (ctx - ACE_ENV_ARG_PARAMETER); + Receiver_Exec_Context::_narrow (ctx); if (CORBA::is_nil (this->context_.in ())) - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } void - Receiver_exec_i::ciao_preactivate (void) + Receiver_exec_i::ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -70,7 +67,7 @@ namespace CIDL_Receiver_Impl } void - Receiver_exec_i::ccm_activate (void) + Receiver_exec_i::ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -78,7 +75,7 @@ namespace CIDL_Receiver_Impl } void - Receiver_exec_i::ciao_postactivate (void) + Receiver_exec_i::ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -87,7 +84,7 @@ namespace CIDL_Receiver_Impl } void - Receiver_exec_i::ccm_passivate (void) + Receiver_exec_i::ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -95,7 +92,7 @@ namespace CIDL_Receiver_Impl } void - Receiver_exec_i::ccm_remove (void) + Receiver_exec_i::ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -112,7 +109,7 @@ namespace CIDL_Receiver_Impl } ::Components::EnterpriseComponent_ptr - ReceiverHome_exec_i::create (void) + ReceiverHome_exec_i::create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { diff --git a/CIAO/examples/Hello/Receiver/Receiver_exec.h b/CIAO/examples/Hello/Receiver/Receiver_exec.h index 6b0a24a6c9c..1322eb8d1a2 100644 --- a/CIAO/examples/Hello/Receiver/Receiver_exec.h +++ b/CIAO/examples/Hello/Receiver/Receiver_exec.h @@ -37,34 +37,32 @@ namespace CIDL_Receiver_Impl // Operation which will be called upon receiving the timeout event. virtual void - push_click_in (Hello::TimeOut *ev - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + push_click_in (Hello::TimeOut *ev) ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent - virtual void set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ciao_preactivate (void) + virtual void ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_activate (void) + virtual void ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ciao_postactivate (void) + virtual void ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_passivate (void) + virtual void ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_remove (void) + virtual void ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); @@ -94,7 +92,7 @@ namespace CIDL_Receiver_Impl // Implicit home operations. virtual ::Components::EnterpriseComponent_ptr - create (void) + create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); }; diff --git a/CIAO/examples/Hello/Sender/Sender_exec.cpp b/CIAO/examples/Hello/Sender/Sender_exec.cpp index 0d3a719a12a..ad4a4143b8d 100644 --- a/CIAO/examples/Hello/Sender/Sender_exec.cpp +++ b/CIAO/examples/Hello/Sender/Sender_exec.cpp @@ -5,7 +5,7 @@ namespace CIDL_Sender_Impl { char* - Message_Impl::get_message (void) + Message_Impl::get_message () ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Sender sending out message: [%s]\n", component_.message_.in ())); @@ -17,23 +17,21 @@ namespace CIDL_Sender_Impl } void - Sender_exec_i::local_message (const char * local_message - ACE_ENV_ARG_DECL_NOT_USED) + Sender_exec_i::local_message (const char * local_message) ACE_THROW_SPEC ((CORBA::SystemException)) { message_ = CORBA::string_dup (local_message); } char * - Sender_exec_i::local_message (void) + Sender_exec_i::local_message () ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (message_.in ()); } void - Sender_exec_i::hertz (CORBA::Long hertz - ACE_ENV_ARG_DECL_NOT_USED) + Sender_exec_i::hertz (CORBA::Long hertz) ACE_THROW_SPEC ((CORBA::SystemException)) { this->hertz_ = hertz; @@ -41,15 +39,14 @@ namespace CIDL_Sender_Impl } CORBA::Long - Sender_exec_i::hertz (void) + Sender_exec_i::hertz () ACE_THROW_SPEC ((CORBA::SystemException)) { return this->hertz_; } ::Hello::COLOR_SELECTION - Sender_exec_i::color ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Sender_exec_i::color () ACE_THROW_SPEC ((CORBA::SystemException)) { // Your code here. @@ -58,15 +55,14 @@ namespace CIDL_Sender_Impl void Sender_exec_i::color ( - ::Hello::COLOR_SELECTION color - ACE_ENV_ARG_DECL_NOT_USED) + ::Hello::COLOR_SELECTION color) ACE_THROW_SPEC ((CORBA::SystemException)) { this->color_ = color; } Hello::CCM_ReadMessage_ptr - Sender_exec_i::get_push_message (void) + Sender_exec_i::get_push_message () ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -75,13 +71,13 @@ namespace CIDL_Sender_Impl } void - Sender_exec_i::start (void) + Sender_exec_i::start () ACE_THROW_SPEC ((CORBA::SystemException)) { Hello::TimeOut_var event = new OBV_Hello::TimeOut; event->data ("ACE/TAO/CIAO"); ACE_DEBUG ((LM_DEBUG, "Sender initiates the process.\n")); - this->context_->push_click_out (event.in () ACE_ENV_ARG_PARAMETER); + this->context_->push_click_out (event.in ()); ACE_DEBUG ((LM_DEBUG, "My current color is:")); @@ -110,25 +106,23 @@ namespace CIDL_Sender_Impl } void - Sender_exec_i::set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) + Sender_exec_i::set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_session_context\n")); this->context_ = - Sender_Exec_Context::_narrow (ctx - ACE_ENV_ARG_PARAMETER); + Sender_Exec_Context::_narrow (ctx); if (CORBA::is_nil (this->context_.in ())) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } void - Sender_exec_i::ciao_preactivate (void) + Sender_exec_i::ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -137,7 +131,7 @@ namespace CIDL_Sender_Impl } void - Sender_exec_i::ccm_activate (void) + Sender_exec_i::ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -146,7 +140,7 @@ namespace CIDL_Sender_Impl } void - Sender_exec_i::ciao_postactivate (void) + Sender_exec_i::ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -155,7 +149,7 @@ namespace CIDL_Sender_Impl } void - Sender_exec_i::ccm_passivate (void) + Sender_exec_i::ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -163,7 +157,7 @@ namespace CIDL_Sender_Impl } void - Sender_exec_i::ccm_remove (void) + Sender_exec_i::ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -179,7 +173,7 @@ namespace CIDL_Sender_Impl } ::Components::EnterpriseComponent_ptr - SenderHome_exec_i::create (void) + SenderHome_exec_i::create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { diff --git a/CIAO/examples/Hello/Sender/Sender_exec.h b/CIAO/examples/Hello/Sender/Sender_exec.h index 2be3e033634..23949e7c80d 100644 --- a/CIAO/examples/Hello/Sender/Sender_exec.h +++ b/CIAO/examples/Hello/Sender/Sender_exec.h @@ -46,21 +46,19 @@ namespace CIDL_Sender_Impl virtual ~Sender_exec_i (); /// Operation to set the value of the attribute "local_message" - virtual void local_message (const char * local_message - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void local_message (const char * local_message) ACE_THROW_SPEC ((CORBA::SystemException)); /// Operation to get the value of the attribute "local_message" - virtual char * local_message (void) + virtual char * local_message () ACE_THROW_SPEC ((CORBA::SystemException)); /// Operation to set the value of the attribute "hertz" - virtual void hertz (CORBA::Long hertz - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void hertz (CORBA::Long hertz) ACE_THROW_SPEC ((CORBA::SystemException)); /// Operation to get the value of the attribute "hertz" - virtual CORBA::Long hertz (void) + virtual CORBA::Long hertz () ACE_THROW_SPEC ((CORBA::SystemException)); /* Operations for obtaining the interface reference. */ @@ -70,45 +68,43 @@ namespace CIDL_Sender_Impl */ // Note: You can specify the return type as ::Hello::CCM_message * virtual Hello::CCM_ReadMessage_ptr - get_push_message (void) + get_push_message () ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::Hello::COLOR_SELECTION - color (void) + color () ACE_THROW_SPEC ((CORBA::SystemException)); virtual void - color (::Hello::COLOR_SELECTION - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + color (::Hello::COLOR_SELECTION) ACE_THROW_SPEC ((CORBA::SystemException)); // Operation inside of the trigger interface. - virtual void start (void) + virtual void start () ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent - virtual void set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ciao_preactivate (void) + virtual void ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_activate (void) + virtual void ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ciao_postactivate (void) + virtual void ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_passivate (void) + virtual void ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_remove (void) + virtual void ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); @@ -140,7 +136,7 @@ namespace CIDL_Sender_Impl } virtual char * - get_message (void) + get_message () ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -166,7 +162,7 @@ namespace CIDL_Sender_Impl // Implicit home operations. virtual ::Components::EnterpriseComponent_ptr - create (void) + create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); }; diff --git a/CIAO/examples/Hello/Sender/starter.cpp b/CIAO/examples/Hello/Sender/starter.cpp index a5d01b6ea5d..6fa219abfba 100644 --- a/CIAO/examples/Hello/Sender/starter.cpp +++ b/CIAO/examples/Hello/Sender/starter.cpp @@ -48,12 +48,11 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); if (parse_args (argc, argv) != 0) { @@ -61,11 +60,9 @@ main (int argc, char *argv[]) } CORBA::Object_var obj = - orb->string_to_object (ior - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); - Hello::Sender_var sender = Hello::Sender::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + Hello::Sender_var sender = Hello::Sender::_narrow (obj.in ()); if (CORBA::is_nil (sender.in ())) { @@ -83,13 +80,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unknown exception \n"); + ex._tao_print_exception ("Unknown exception \n"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/CIAO/examples/Null_Component/Null_Component_exec.cpp b/CIAO/examples/Null_Component/Null_Component_exec.cpp index 81b24d7030a..c48ebb2ea0b 100644 --- a/CIAO/examples/Null_Component/Null_Component_exec.cpp +++ b/CIAO/examples/Null_Component/Null_Component_exec.cpp @@ -38,8 +38,7 @@ namespace CIDL_Null_Component_Impl // Operations from ::Null_Interface void - Null_Interface_exec_i::null_operation ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Null_Interface_exec_i::null_operation () ACE_THROW_SPEC (( ::CORBA::SystemException)) { // Your code here. @@ -64,8 +63,7 @@ namespace CIDL_Null_Component_Impl // Port operations. ::CCM_Null_Interface_ptr - Null_Component_exec_i::get_null_facet ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Null_Component_exec_i::get_null_facet () ACE_THROW_SPEC (( ::CORBA::SystemException)) { // Your code here. @@ -76,25 +74,22 @@ namespace CIDL_Null_Component_Impl void Null_Component_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) { this->context_ = Null_Component_Context::_narrow ( - ctx - ACE_ENV_ARG_PARAMETER); + ctx); if (this->context_ == 0) { - ACE_THROW ( ::CORBA::INTERNAL ()); + throw ::CORBA::INTERNAL (); } } void - Null_Component_exec_i::ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Null_Component_exec_i::ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) { @@ -102,8 +97,7 @@ namespace CIDL_Null_Component_Impl } void - Null_Component_exec_i::ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Null_Component_exec_i::ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) { @@ -111,8 +105,7 @@ namespace CIDL_Null_Component_Impl } void - Null_Component_exec_i::ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Null_Component_exec_i::ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) { @@ -120,8 +113,7 @@ namespace CIDL_Null_Component_Impl } void - Null_Component_exec_i::ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Null_Component_exec_i::ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) { @@ -129,8 +121,7 @@ namespace CIDL_Null_Component_Impl } void - Null_Component_exec_i::ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Null_Component_exec_i::ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) { @@ -160,8 +151,7 @@ namespace CIDL_Null_Component_Impl // Implicit operations. ::Components::EnterpriseComponent_ptr - Null_Component_Home_exec_i::create ( - ACE_ENV_SINGLE_ARG_DECL) + Null_Component_Home_exec_i::create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) { diff --git a/CIAO/examples/Null_Component/Null_Component_exec.h b/CIAO/examples/Null_Component/Null_Component_exec.h index 4bfa913e20d..22026431a93 100644 --- a/CIAO/examples/Null_Component/Null_Component_exec.h +++ b/CIAO/examples/Null_Component/Null_Component_exec.h @@ -45,8 +45,7 @@ namespace CIDL_Null_Component_Impl // Operations from ::Null_Interface virtual void - null_operation ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + null_operation () ACE_THROW_SPEC (( ::CORBA::SystemException)); }; @@ -65,51 +64,44 @@ namespace CIDL_Null_Component_Impl // Port operations. virtual ::CCM_Null_Interface_ptr - get_null_facet ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + get_null_facet () ACE_THROW_SPEC (( ::CORBA::SystemException)); // Operations from Components::SessionComponent virtual void set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); @@ -137,8 +129,7 @@ namespace CIDL_Null_Component_Impl // Implicit operations. virtual ::Components::EnterpriseComponent_ptr - create ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); diff --git a/CIAO/examples/Null_Component/StaticDAnCEApp.cpp b/CIAO/examples/Null_Component/StaticDAnCEApp.cpp index ee9a0351c7e..4f50720ec1e 100644 --- a/CIAO/examples/Null_Component/StaticDAnCEApp.cpp +++ b/CIAO/examples/Null_Component/StaticDAnCEApp.cpp @@ -22,12 +22,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { // Get reference to Root POA. CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + = orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa - = PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + = PortableServer::POA::_narrow (obj.in ()); // Activate POA manager PortableServer::POAManager_var mgr @@ -71,11 +69,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) static_node_manager_impl->init (); CORBA::Object_var table_object = - orb->resolve_initial_references ("IORTable" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("IORTable"); IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); + IORTable::Table::_narrow (table_object.in ()); if (CORBA::is_nil (adapter.in ())) ACE_ERROR_RETURN ((LM_ERROR, "Nil IORTable\n"), -1); @@ -84,23 +81,21 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) static_node_manager_impl->_this (); CORBA::String_var str = - orb->object_to_string (manager.in () - ACE_ENV_ARG_PARAMETER); + orb->object_to_string (manager.in ()); adapter->bind ("NodeManager", - str.in () - ACE_ENV_ARG_PARAMETER); + str.in ()); // Run the main event loop for the ORB. orb->run (); - poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + poa->destroy (1, 1); orb->destroy (); } catch (CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: "); + ex._tao_print_exception ("Caught CORBA Exception: "); return -1; } diff --git a/CIAO/examples/Null_Component/plan.h b/CIAO/examples/Null_Component/plan.h index 300e43b9f80..fce247dc321 100644 --- a/CIAO/examples/Null_Component/plan.h +++ b/CIAO/examples/Null_Component/plan.h @@ -4,8 +4,7 @@ extern "C" ::Components::HomeExecutorBase_ptr create_Null_Component_Home_Impl (v extern "C" ::PortableServer::Servant create_Null_Component_Home_Servant (::Components::HomeExecutorBase_ptr p, ::CIAO::Session_Container *c, - const char* - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + const char*); struct HomeAttributes { diff --git a/CIAO/examples/Swapping/Receiver/Receiver_exec.cpp b/CIAO/examples/Swapping/Receiver/Receiver_exec.cpp index 13fb9f19d33..cf63cc2140c 100644 --- a/CIAO/examples/Swapping/Receiver/Receiver_exec.cpp +++ b/CIAO/examples/Swapping/Receiver/Receiver_exec.cpp @@ -19,14 +19,14 @@ namespace CIDL_Receiver_Impl } ::Components::EnterpriseComponent_ptr - ReceiverSwap_exec_i::incarnate (void) + ReceiverSwap_exec_i::incarnate () ACE_THROW_SPEC ((CORBA::SystemException)) { return new Receiver_exec_i; } ::Components::EnterpriseComponent_ptr - ReceiverSwap_exec_i::etherealize (void) + ReceiverSwap_exec_i::etherealize () ACE_THROW_SPEC ((CORBA::SystemException)) { return new Receiver_exec_i; @@ -41,8 +41,7 @@ namespace CIDL_Receiver_Impl } void - Receiver_exec_i::push_click_in (Hello::TimeOut * - ACE_ENV_ARG_DECL) + Receiver_exec_i::push_click_in (Hello::TimeOut *) ACE_THROW_SPEC ((CORBA::SystemException)) { //Get the message from the Sender first. @@ -55,7 +54,7 @@ namespace CIDL_Receiver_Impl if (CORBA::is_nil (rev.in ())) { - ACE_THROW (CORBA::BAD_INV_ORDER ()); + throw CORBA::BAD_INV_ORDER (); } CORBA::String_var str = @@ -68,25 +67,23 @@ namespace CIDL_Receiver_Impl // Operations from Components::SessionComponen void - Receiver_exec_i::set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) + Receiver_exec_i::set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_session_context\n")); this->context_ = - Receiver_Exec_Context::_narrow (ctx - ACE_ENV_ARG_PARAMETER); + Receiver_Exec_Context::_narrow (ctx); if (CORBA::is_nil (this->context_.in ())) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } void - Receiver_exec_i::ciao_preactivate (void) + Receiver_exec_i::ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -95,7 +92,7 @@ namespace CIDL_Receiver_Impl } void - Receiver_exec_i::ccm_activate (void) + Receiver_exec_i::ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -103,7 +100,7 @@ namespace CIDL_Receiver_Impl } void - Receiver_exec_i::ciao_postactivate (void) + Receiver_exec_i::ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -112,7 +109,7 @@ namespace CIDL_Receiver_Impl } void - Receiver_exec_i::ccm_passivate (void) + Receiver_exec_i::ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -121,8 +118,7 @@ namespace CIDL_Receiver_Impl CORBA::Object_var comp_object = this->context_->get_CCM_object (); - Hello::Receiver_var receiver = Hello::Receiver::_narrow (comp_object.in () - ACE_ENV_ARG_PARAMETER); + Hello::Receiver_var receiver = Hello::Receiver::_narrow (comp_object.in ()); ::Components::ConsumerDescriptions_var cons_desc = receiver->get_all_consumers (); @@ -144,7 +140,7 @@ namespace CIDL_Receiver_Impl } void - Receiver_exec_i::ccm_remove (void) + Receiver_exec_i::ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -161,7 +157,7 @@ namespace CIDL_Receiver_Impl } ::Components::EnterpriseComponent_ptr - ReceiverHome_exec_i::create (void) + ReceiverHome_exec_i::create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { diff --git a/CIAO/examples/Swapping/Receiver/Receiver_exec.h b/CIAO/examples/Swapping/Receiver/Receiver_exec.h index 0a837d8debc..d04a4092d0a 100644 --- a/CIAO/examples/Swapping/Receiver/Receiver_exec.h +++ b/CIAO/examples/Swapping/Receiver/Receiver_exec.h @@ -34,11 +34,11 @@ namespace CIDL_Receiver_Impl ~ReceiverSwap_exec_i (); virtual ::Components::EnterpriseComponent_ptr - incarnate (void) + incarnate () ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::Components::EnterpriseComponent_ptr - etherealize (void) + etherealize () ACE_THROW_SPEC ((CORBA::SystemException)); }; @@ -56,34 +56,32 @@ namespace CIDL_Receiver_Impl // Operation which will be called upon receiving the timeout event. virtual void - push_click_in (Hello::TimeOut *ev - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + push_click_in (Hello::TimeOut *ev) ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent - virtual void set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ciao_preactivate (void) + virtual void ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_activate (void) + virtual void ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ciao_postactivate (void) + virtual void ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_passivate (void) + virtual void ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_remove (void) + virtual void ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); @@ -113,7 +111,7 @@ namespace CIDL_Receiver_Impl // Implicit home operations. virtual ::Components::EnterpriseComponent_ptr - create (void) + create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); }; diff --git a/CIAO/examples/Swapping/Sender/Sender_exec.cpp b/CIAO/examples/Swapping/Sender/Sender_exec.cpp index aa9f2b06858..1f0cba9a91d 100644 --- a/CIAO/examples/Swapping/Sender/Sender_exec.cpp +++ b/CIAO/examples/Swapping/Sender/Sender_exec.cpp @@ -10,7 +10,7 @@ const char* second_exe_entrypt = "createSenderExec_Impl"; namespace CIDL_Sender_Impl { char* - Message_Impl::get_message (void) + Message_Impl::get_message () ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Sender sending out message. \n")); @@ -22,22 +22,21 @@ namespace CIDL_Sender_Impl } void - Sender_exec_i::local_message (const char * local_message - ACE_ENV_ARG_DECL_NOT_USED) + Sender_exec_i::local_message (const char * local_message) ACE_THROW_SPEC ((CORBA::SystemException)) { message_ = CORBA::string_dup (local_message); } char * - Sender_exec_i::local_message (void) + Sender_exec_i::local_message () ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup(message_. in()); } Hello::CCM_ReadMessage_ptr - Sender_exec_i::get_push_message (void) + Sender_exec_i::get_push_message () ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -46,34 +45,32 @@ namespace CIDL_Sender_Impl } void - Sender_exec_i::start (void) + Sender_exec_i::start () ACE_THROW_SPEC ((CORBA::SystemException)) { Hello::TimeOut_var event = new OBV_Hello::TimeOut; ACE_DEBUG ((LM_DEBUG, "Sender initiates the process.\n")); - this->context_->push_click_out (event ACE_ENV_ARG_PARAMETER); + this->context_->push_click_out (event); } void - Sender_exec_i::set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) + Sender_exec_i::set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_session_context\n")); this->context_ = - Sender_Exec_Context::_narrow (ctx - ACE_ENV_ARG_PARAMETER); + Sender_Exec_Context::_narrow (ctx); if (CORBA::is_nil (this->context_.in ())) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } void - Sender_exec_i::ciao_preactivate (void) + Sender_exec_i::ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -82,7 +79,7 @@ namespace CIDL_Sender_Impl } void - Sender_exec_i::ccm_activate (void) + Sender_exec_i::ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -91,7 +88,7 @@ namespace CIDL_Sender_Impl } void - Sender_exec_i::ciao_postactivate (void) + Sender_exec_i::ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -100,7 +97,7 @@ namespace CIDL_Sender_Impl } void - Sender_exec_i::ccm_passivate (void) + Sender_exec_i::ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -108,7 +105,7 @@ namespace CIDL_Sender_Impl } void - Sender_exec_i::ccm_remove (void) + Sender_exec_i::ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -134,7 +131,7 @@ namespace CIDL_Sender_Impl } ::Components::EnterpriseComponent_ptr - SenderSwap_exec_i::incarnate (void) + SenderSwap_exec_i::incarnate () ACE_THROW_SPEC ((CORBA::SystemException)) { ExecFactory first_exec_creator = 0; @@ -196,14 +193,14 @@ namespace CIDL_Sender_Impl } ::Components::EnterpriseComponent_ptr - SenderSwap_exec_i::etherealize (void) + SenderSwap_exec_i::etherealize () ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } ::Components::EnterpriseComponent_ptr - SenderHome_exec_i::create (void) + SenderHome_exec_i::create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { diff --git a/CIAO/examples/Swapping/Sender/Sender_exec.h b/CIAO/examples/Swapping/Sender/Sender_exec.h index da2ee11de45..add761ed988 100644 --- a/CIAO/examples/Swapping/Sender/Sender_exec.h +++ b/CIAO/examples/Swapping/Sender/Sender_exec.h @@ -41,12 +41,11 @@ namespace CIDL_Sender_Impl virtual ~Sender_exec_i (); /// Operation to set the value of the attribute - virtual void local_message (const char * local_message - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void local_message (const char * local_message) ACE_THROW_SPEC ((CORBA::SystemException)); /// Operation to get the value of the attribute - virtual char * local_message (void) + virtual char * local_message () ACE_THROW_SPEC ((CORBA::SystemException)); /* Operations for obtaining the interface reference. */ @@ -56,37 +55,36 @@ namespace CIDL_Sender_Impl */ // Note: You can specify the return type as ::Hello::CCM_message * virtual Hello::CCM_ReadMessage_ptr - get_push_message (void) + get_push_message () ACE_THROW_SPEC ((CORBA::SystemException)); // Operation inside of the trigger interface. - virtual void start (void) + virtual void start () ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent - virtual void set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ciao_preactivate (void) + virtual void ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_activate (void) + virtual void ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ciao_postactivate (void) + virtual void ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_passivate (void) + virtual void ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_remove (void) + virtual void ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); @@ -114,7 +112,7 @@ namespace CIDL_Sender_Impl } virtual char * - get_message (void) + get_message () ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -142,11 +140,11 @@ namespace CIDL_Sender_Impl ~SenderSwap_exec_i (); virtual ::Components::EnterpriseComponent_ptr - incarnate (void) + incarnate () ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::Components::EnterpriseComponent_ptr - etherealize (void) + etherealize () ACE_THROW_SPEC ((CORBA::SystemException)); void consumers (::Components::ConsumerDescriptions *p) @@ -179,7 +177,7 @@ namespace CIDL_Sender_Impl // Implicit home operations. virtual ::Components::EnterpriseComponent_ptr - create (void) + create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); diff --git a/CIAO/examples/Swapping/Sender/Sender_exec_1.cpp b/CIAO/examples/Swapping/Sender/Sender_exec_1.cpp index 795a74f3c59..f98e5390df3 100644 --- a/CIAO/examples/Swapping/Sender/Sender_exec_1.cpp +++ b/CIAO/examples/Swapping/Sender/Sender_exec_1.cpp @@ -7,7 +7,7 @@ namespace CIDL_Sender_Impl { char* - Message_Impl_1::get_message (void) + Message_Impl_1::get_message () ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Sender 1 sending out message. \n")); @@ -19,22 +19,21 @@ namespace CIDL_Sender_Impl } void - Sender_exec_1_i::local_message (const char * local_message - ACE_ENV_ARG_DECL_NOT_USED) + Sender_exec_1_i::local_message (const char * local_message) ACE_THROW_SPEC ((CORBA::SystemException)) { message_ = CORBA::string_dup (local_message); } char * - Sender_exec_1_i::local_message (void) + Sender_exec_1_i::local_message () ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup(message_.in ()); } Hello::CCM_ReadMessage_ptr - Sender_exec_1_i::get_push_message (void) + Sender_exec_1_i::get_push_message () ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -43,34 +42,32 @@ namespace CIDL_Sender_Impl } void - Sender_exec_1_i::start (void) + Sender_exec_1_i::start () ACE_THROW_SPEC ((CORBA::SystemException)) { Hello::TimeOut_var event = new OBV_Hello::TimeOut; ACE_DEBUG ((LM_DEBUG, "Sender 1 initiates the process.\n")); - this->context_->push_click_out (event ACE_ENV_ARG_PARAMETER); + this->context_->push_click_out (event); } void - Sender_exec_1_i::set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) + Sender_exec_1_i::set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { ACE_DEBUG ((LM_DEBUG, "Sender_exec_1_i::set_session_context\n")); this->context_ = - Sender_Exec_Context::_narrow (ctx - ACE_ENV_ARG_PARAMETER); + Sender_Exec_Context::_narrow (ctx); if (CORBA::is_nil (this->context_.in ())) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } void - Sender_exec_1_i::ciao_preactivate (void) + Sender_exec_1_i::ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -79,7 +76,7 @@ namespace CIDL_Sender_Impl } void - Sender_exec_1_i::ccm_activate (void) + Sender_exec_1_i::ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -91,7 +88,7 @@ namespace CIDL_Sender_Impl } void - Sender_exec_1_i::ciao_postactivate (void) + Sender_exec_1_i::ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -100,15 +97,14 @@ namespace CIDL_Sender_Impl } void - Sender_exec_1_i::ccm_passivate (void) + Sender_exec_1_i::ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { ACE_DEBUG ((LM_DEBUG, "Sender_exec_1_i::ccm_passivate\n")); Components::ConsumerDescriptions_var retval = - this->context_->get_registered_consumers ("click_out" - ACE_ENV_ARG_PARAMETER); + this->context_->get_registered_consumers ("click_out"); this->base_exec_->consumers (retval._retn ()); @@ -116,8 +112,7 @@ namespace CIDL_Sender_Impl this->context_->get_CCM_object (); Hello::Sender_var sender = - Hello::Sender::_narrow (o.in () - ACE_ENV_ARG_PARAMETER); + Hello::Sender::_narrow (o.in ()); Components::FacetDescriptions_var facets = sender->get_all_facets (); @@ -127,12 +122,11 @@ namespace CIDL_Sender_Impl for (i = 0; i < facet_len; ++i) { - this->context_->remove_facet (facets[i]->facet_ref () - ACE_ENV_ARG_PARAMETER); + this->context_->remove_facet (facets[i]->facet_ref ()); /* - this->context_->update_port_activator (oid ACE_ENV_ARG_PARAMETER); + this->context_->update_port_activator (oid); - this->context_->deactivate_facet (oid ACE_ENV_ARG_PARAMETER); + this->context_->deactivate_facet (oid); */ } @@ -143,7 +137,7 @@ namespace CIDL_Sender_Impl } void - Sender_exec_1_i::ccm_remove (void) + Sender_exec_1_i::ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { diff --git a/CIAO/examples/Swapping/Sender/Sender_exec_1.h b/CIAO/examples/Swapping/Sender/Sender_exec_1.h index b536f506b6f..352ea6ec1b4 100644 --- a/CIAO/examples/Swapping/Sender/Sender_exec_1.h +++ b/CIAO/examples/Swapping/Sender/Sender_exec_1.h @@ -41,12 +41,11 @@ namespace CIDL_Sender_Impl virtual ~Sender_exec_1_i (); /// Operation to set the value of the attribute - virtual void local_message (const char * local_message - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void local_message (const char * local_message) ACE_THROW_SPEC ((CORBA::SystemException)); /// Operation to get the value of the attribute - virtual char * local_message (void) + virtual char * local_message () ACE_THROW_SPEC ((CORBA::SystemException)); /* Operations for obtaining the interface reference. */ @@ -56,37 +55,36 @@ namespace CIDL_Sender_Impl */ // Note: You can specify the return type as ::Hello::CCM_message * virtual Hello::CCM_ReadMessage_ptr - get_push_message (void) + get_push_message () ACE_THROW_SPEC ((CORBA::SystemException)); // Operation inside of the trigger interface. - virtual void start (void) + virtual void start () ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent - virtual void set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ciao_preactivate (void) + virtual void ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_activate (void) + virtual void ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ciao_postactivate (void) + virtual void ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_passivate (void) + virtual void ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_remove (void) + virtual void ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); @@ -118,7 +116,7 @@ namespace CIDL_Sender_Impl } virtual char * - get_message (void) + get_message () ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/CIAO/examples/Swapping/Sender/Sender_exec_2.cpp b/CIAO/examples/Swapping/Sender/Sender_exec_2.cpp index abda2d8a744..6b273012098 100644 --- a/CIAO/examples/Swapping/Sender/Sender_exec_2.cpp +++ b/CIAO/examples/Swapping/Sender/Sender_exec_2.cpp @@ -6,7 +6,7 @@ namespace CIDL_Sender_Impl { char* - Message_Impl_2::get_message (void) + Message_Impl_2::get_message () ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Sender 2 sending out message. \n")); @@ -18,22 +18,21 @@ namespace CIDL_Sender_Impl } void - Sender_exec_2_i::local_message (const char * local_message - ACE_ENV_ARG_DECL_NOT_USED) + Sender_exec_2_i::local_message (const char * local_message) ACE_THROW_SPEC ((CORBA::SystemException)) { message_ = CORBA::string_dup (local_message); } char * - Sender_exec_2_i::local_message (void) + Sender_exec_2_i::local_message () ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup(message_.in ()); } Hello::CCM_ReadMessage_ptr - Sender_exec_2_i::get_push_message (void) + Sender_exec_2_i::get_push_message () ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -42,34 +41,32 @@ namespace CIDL_Sender_Impl } void - Sender_exec_2_i::start (void) + Sender_exec_2_i::start () ACE_THROW_SPEC ((CORBA::SystemException)) { Hello::TimeOut_var event = new OBV_Hello::TimeOut; ACE_DEBUG ((LM_DEBUG, "Sender 2 initiates the process.\n")); - this->context_->push_click_out (event ACE_ENV_ARG_PARAMETER); + this->context_->push_click_out (event); } void - Sender_exec_2_i::set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) + Sender_exec_2_i::set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { ACE_DEBUG ((LM_DEBUG, "Sender_exec_2_i::set_session_context\n")); this->context_ = - Sender_Exec_Context::_narrow (ctx - ACE_ENV_ARG_PARAMETER); + Sender_Exec_Context::_narrow (ctx); if (CORBA::is_nil (this->context_.in ())) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } void - Sender_exec_2_i::ciao_preactivate (void) + Sender_exec_2_i::ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -78,7 +75,7 @@ namespace CIDL_Sender_Impl } void - Sender_exec_2_i::ccm_activate (void) + Sender_exec_2_i::ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -90,26 +87,24 @@ namespace CIDL_Sender_Impl if (CORBA::is_nil (this->context_.in ())) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } CORBA::Object_var o = this->context_->get_CCM_object (); Hello::Sender_var sender = - Hello::Sender::_narrow (o.in () - ACE_ENV_ARG_PARAMETER); + Hello::Sender::_narrow (o.in ()); for (CORBA::ULong cnt = 0; cnt != c->length (); ++cnt) { sender->subscribe ("click_out", - (*c)[cnt]->consumer () - ACE_ENV_ARG_PARAMETER); + (*c)[cnt]->consumer ()); } } void - Sender_exec_2_i::ciao_postactivate (void) + Sender_exec_2_i::ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -118,7 +113,7 @@ namespace CIDL_Sender_Impl } void - Sender_exec_2_i::ccm_passivate (void) + Sender_exec_2_i::ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -126,7 +121,7 @@ namespace CIDL_Sender_Impl } void - Sender_exec_2_i::ccm_remove (void) + Sender_exec_2_i::ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { diff --git a/CIAO/examples/Swapping/Sender/Sender_exec_2.h b/CIAO/examples/Swapping/Sender/Sender_exec_2.h index 16465723b2d..9b548cf6626 100644 --- a/CIAO/examples/Swapping/Sender/Sender_exec_2.h +++ b/CIAO/examples/Swapping/Sender/Sender_exec_2.h @@ -43,12 +43,11 @@ namespace CIDL_Sender_Impl virtual ~Sender_exec_2_i (); /// Operation to set the value of the attribute - virtual void local_message (const char * local_message - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void local_message (const char * local_message) ACE_THROW_SPEC ((CORBA::SystemException)); /// Operation to get the value of the attribute - virtual char * local_message (void) + virtual char * local_message () ACE_THROW_SPEC ((CORBA::SystemException)); /* Operations for obtaining the interface reference. */ @@ -58,37 +57,36 @@ namespace CIDL_Sender_Impl */ // Note: You can specify the return type as ::Hello::CCM_message * virtual Hello::CCM_ReadMessage_ptr - get_push_message (void) + get_push_message () ACE_THROW_SPEC ((CORBA::SystemException)); // Operation inside of the trigger interface. - virtual void start (void) + virtual void start () ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent - virtual void set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ciao_preactivate (void) + virtual void ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_activate (void) + virtual void ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ciao_postactivate (void) + virtual void ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_passivate (void) + virtual void ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_remove (void) + virtual void ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); @@ -119,7 +117,7 @@ namespace CIDL_Sender_Impl } virtual char * - get_message (void) + get_message () ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/CIAO/examples/Swapping/Sender/starter.cpp b/CIAO/examples/Swapping/Sender/starter.cpp index cd656253f57..92718744cd5 100644 --- a/CIAO/examples/Swapping/Sender/starter.cpp +++ b/CIAO/examples/Swapping/Sender/starter.cpp @@ -50,12 +50,11 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); if (parse_args (argc, argv) != 0) { @@ -63,11 +62,9 @@ main (int argc, char *argv[]) } CORBA::Object_var obj = - orb->string_to_object (ior - ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); - Hello::Sender_var sender = Hello::Sender::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + Hello::Sender_var sender = Hello::Sender::_narrow (obj.in ()); if (CORBA::is_nil (sender.in ())) { @@ -90,13 +87,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unknown exception \n"); + ex._tao_print_exception ("Unknown exception \n"); return -1; } - ACE_ENDTRY; return 0; } diff --git a/CIAO/performance-tests/Benchmark/LatencyTest.cpp b/CIAO/performance-tests/Benchmark/LatencyTest.cpp index 372b7cd001c..443506298bb 100644 --- a/CIAO/performance-tests/Benchmark/LatencyTest.cpp +++ b/CIAO/performance-tests/Benchmark/LatencyTest.cpp @@ -10,16 +10,15 @@ LatencyTest::LatencyTest (CORBA::ORB_ptr orb) CORBA::Long -LatencyTest::makeCall (CORBA::Long send_time - ACE_ENV_ARG_DECL_NOT_USED) +LatencyTest::makeCall (CORBA::Long send_time) ACE_THROW_SPEC ((CORBA::SystemException)) { return send_time; } void -LatencyTest::shutdown (void) +LatencyTest::shutdown () ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/CIAO/performance-tests/Benchmark/LatencyTest.h b/CIAO/performance-tests/Benchmark/LatencyTest.h index ca6f532c4ce..7bd3de194bf 100644 --- a/CIAO/performance-tests/Benchmark/LatencyTest.h +++ b/CIAO/performance-tests/Benchmark/LatencyTest.h @@ -17,11 +17,10 @@ class LatencyTest LatencyTest (CORBA::ORB_ptr orb); // = The skeleton methods - virtual CORBA::Long makeCall (CORBA::Long send_time - ACE_ENV_ARG_DECL) + virtual CORBA::Long makeCall (CORBA::Long send_time) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (void) + virtual void shutdown () ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp b/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp index 38e8805e154..92bf6aecd2d 100644 --- a/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp +++ b/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp @@ -27,27 +27,26 @@ const char *ior4 = "file://comp4.ior"; int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); // Resolve HomeFinder interface CORBA::Object_var obj1 - = orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER); + = orb->string_to_object (ior1); CORBA::Object_var obj2 - = orb->string_to_object (ior2 ACE_ENV_ARG_PARAMETER); + = orb->string_to_object (ior2); CORBA::Object_var obj3 - = orb->string_to_object (ior3 ACE_ENV_ARG_PARAMETER); + = orb->string_to_object (ior3); CORBA::Object_var obj4 - = orb->string_to_object (ior4 ACE_ENV_ARG_PARAMETER); + = orb->string_to_object (ior4); if (CORBA::is_nil (obj1.in ()) || CORBA::is_nil (obj2.in ()) || @@ -85,11 +84,10 @@ main (int argc, char *argv[]) task1.thr_mgr()->wait(); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception Caught:"); + ex._tao_print_exception ("Exception Caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp index b608f6162ef..07dd8d48095 100644 --- a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp +++ b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp @@ -46,7 +46,7 @@ MyImpl::RoundTrip_exec_i::~RoundTrip_exec_i () } ::Benchmark::CCM_LatencyTest * -MyImpl::RoundTrip_exec_i::get_latency (void) +MyImpl::RoundTrip_exec_i::get_latency () ACE_THROW_SPEC ((CORBA::SystemException)) { return ::Benchmark::CCM_LatencyTest::_duplicate (this); @@ -54,8 +54,7 @@ MyImpl::RoundTrip_exec_i::get_latency (void) /* Main method that invokes the octet_sequence */ CORBA::Long -MyImpl::RoundTrip_exec_i::makeCall (CORBA::Long data - ACE_ENV_ARG_DECL_NOT_USED) +MyImpl::RoundTrip_exec_i::makeCall (CORBA::Long data) ACE_THROW_SPEC ((CORBA::SystemException)) { return data * data * data; @@ -64,8 +63,7 @@ MyImpl::RoundTrip_exec_i::makeCall (CORBA::Long data // Operations from Components::SessionComponent void MyImpl::RoundTrip_exec_i::set_session_context ( - Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) + Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -74,23 +72,22 @@ MyImpl::RoundTrip_exec_i::set_session_context ( //cout << "MyImpl::RoundTrip_exec_i::set_session_context\n" << endl; this->context_ = - Benchmark::CCM_RoundTrip_Context::_narrow (ctx - ACE_ENV_ARG_PARAMETER); + Benchmark::CCM_RoundTrip_Context::_narrow (ctx); if (CORBA::is_nil (this->context_.in ())) - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); // Urm, we actually discard exceptions thown from this operation. } void -MyImpl::RoundTrip_exec_i::ciao_preactivate (void) +MyImpl::RoundTrip_exec_i::ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { } void -MyImpl::RoundTrip_exec_i::ccm_activate (void) +MyImpl::RoundTrip_exec_i::ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -103,7 +100,7 @@ MyImpl::RoundTrip_exec_i::ccm_activate (void) } void -MyImpl::RoundTrip_exec_i::ciao_postactivate (void) +MyImpl::RoundTrip_exec_i::ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -111,7 +108,7 @@ MyImpl::RoundTrip_exec_i::ciao_postactivate (void) } void -MyImpl::RoundTrip_exec_i::ccm_passivate (void) +MyImpl::RoundTrip_exec_i::ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -120,7 +117,7 @@ MyImpl::RoundTrip_exec_i::ccm_passivate (void) } void -MyImpl::RoundTrip_exec_i::ccm_remove (void) +MyImpl::RoundTrip_exec_i::ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -138,7 +135,7 @@ MyImpl::RoundTripHome_exec_i::~RoundTripHome_exec_i () } ::Components::EnterpriseComponent_ptr -MyImpl::RoundTripHome_exec_i::create (void) +MyImpl::RoundTripHome_exec_i::create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h index bdb3456de7a..e2262581bd7 100644 --- a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h +++ b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h @@ -40,37 +40,35 @@ namespace MyImpl RoundTrip_exec_i (); /// Operation to test the data - virtual CORBA::Long makeCall (CORBA::Long data - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Long makeCall (CORBA::Long data) ACE_THROW_SPEC ((CORBA::SystemException)); virtual ::Benchmark::CCM_LatencyTest* - get_latency (void) + get_latency () ACE_THROW_SPEC ((CORBA::SystemException)); // Operations from Components::SessionComponent - virtual void set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ciao_preactivate (void) + virtual void ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_activate (void) + virtual void ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ciao_postactivate (void) + virtual void ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_passivate (void) + virtual void ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_remove (void) + virtual void ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); @@ -104,7 +102,7 @@ namespace MyImpl // Implicit home operations. virtual ::Components::EnterpriseComponent_ptr - create (void) + create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp b/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp index 1f521200e1d..9de1cb46a2d 100644 --- a/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp +++ b/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp @@ -85,7 +85,7 @@ set_priority () int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { //set priority on the platform set_priority(); @@ -93,8 +93,7 @@ main (int argc, char *argv[]) // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); if (parse_args(argc, argv) == -1) { @@ -104,11 +103,10 @@ main (int argc, char *argv[]) // Resolve HomeFinder interface CORBA::Object_var obj - = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + = orb->string_to_object (ior); Benchmark::RoundTripHome_var home - = Benchmark::RoundTripHome::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + = Benchmark::RoundTripHome::_narrow (obj.in ()); if (CORBA::is_nil (home.in ())) ACE_ERROR_RETURN ((LM_ERROR, "Unable to acquire TestHome objref\n"), -1); @@ -123,7 +121,7 @@ main (int argc, char *argv[]) long start = 0L; for (int j = 0; j < 100; ++j) { - round_trip->makeCall (start ACE_ENV_ARG_PARAMETER); + round_trip->makeCall (start); } ///// Start Test //////////////////////////////////////////// @@ -137,7 +135,7 @@ main (int argc, char *argv[]) //Test value to be sent to the server long test = 0; - (void) round_trip->makeCall (test ACE_ENV_ARG_PARAMETER); + (void) round_trip->makeCall (test); ACE_hrtime_t now = ACE_OS::gethrtime (); history.sample (now - start); @@ -165,13 +163,12 @@ main (int argc, char *argv[]) stats.samples_count ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception Handled:"); + ex._tao_print_exception ("Exception Handled:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp index 4de5f59cc67..ab8ede89b50 100644 --- a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp +++ b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp @@ -23,8 +23,7 @@ MyImpl::RoundTripClient_exec_i::~RoundTripClient_exec_i () // Operations from Components::SessionComponent void MyImpl::RoundTripClient_exec_i::set_session_context ( - Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) + Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -36,25 +35,24 @@ MyImpl::RoundTripClient_exec_i::set_session_context ( //scheduling strategy to real-time scheduling this->context_ = - Benchmark::CCM_RoundTripClient_Context::_narrow (ctx - ACE_ENV_ARG_PARAMETER); + Benchmark::CCM_RoundTripClient_Context::_narrow (ctx); if (CORBA::is_nil (this->context_.in ())) - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); // Urm, we actually discard exceptions thrown from this operation. } //Start the collocated test here void -MyImpl::RoundTripClient_exec_i::ciao_preactivate (void) +MyImpl::RoundTripClient_exec_i::ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { } void -MyImpl::RoundTripClient_exec_i::ccm_activate (void) +MyImpl::RoundTripClient_exec_i::ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -63,14 +61,14 @@ MyImpl::RoundTripClient_exec_i::ccm_activate (void) } void -MyImpl::RoundTripClient_exec_i::ciao_postactivate (void) +MyImpl::RoundTripClient_exec_i::ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { } void -MyImpl::RoundTripClient_exec_i::start (void) +MyImpl::RoundTripClient_exec_i::start () ACE_THROW_SPEC ((CORBA::SystemException)) { ///////////// Start test ///////////////////////////////////////// @@ -102,7 +100,7 @@ MyImpl::RoundTripClient_exec_i::start (void) //Test value to be sent to the server long test = 0; - (void) lt->makeCall (test ACE_ENV_ARG_PARAMETER); + (void) lt->makeCall (test); ACE_hrtime_t now = ACE_OS::gethrtime (); history.sample (now - start); @@ -133,8 +131,7 @@ MyImpl::RoundTripClient_exec_i::start (void) } ::Benchmark::CCM_Controller_ptr -MyImpl::RoundTripClient_exec_i::get_controller ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +MyImpl::RoundTripClient_exec_i::get_controller () ACE_THROW_SPEC ((CORBA::SystemException)) { return ::Benchmark::CCM_Controller::_duplicate (this); @@ -142,8 +139,7 @@ MyImpl::RoundTripClient_exec_i::get_controller ( void -MyImpl::RoundTripClient_exec_i::ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +MyImpl::RoundTripClient_exec_i::ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -152,7 +148,7 @@ MyImpl::RoundTripClient_exec_i::ccm_passivate ( } void -MyImpl::RoundTripClient_exec_i::ccm_remove (void) +MyImpl::RoundTripClient_exec_i::ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { @@ -170,7 +166,7 @@ MyImpl::RoundTripClientHome_exec_i::~RoundTripClientHome_exec_i () } ::Components::EnterpriseComponent_ptr -MyImpl::RoundTripClientHome_exec_i::create (void) +MyImpl::RoundTripClientHome_exec_i::create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h index 7b1973119ea..127684294f4 100644 --- a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h +++ b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h @@ -40,36 +40,35 @@ namespace MyImpl ~RoundTripClient_exec_i (); // Operations from Components::SessionComponent - virtual void set_session_context (Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void set_session_context (Components::SessionContext_ptr ctx) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ciao_preactivate (void) + virtual void ciao_preactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_activate (void) + virtual void ccm_activate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ciao_postactivate (void) + virtual void ciao_postactivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_passivate (void) + virtual void ccm_passivate () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); - virtual void ccm_remove (void) + virtual void ccm_remove () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); virtual ::Benchmark::CCM_Controller_ptr - get_controller (void) + get_controller () ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void start (void) + virtual void start () ACE_THROW_SPEC ((CORBA::SystemException)); @@ -98,7 +97,7 @@ namespace MyImpl // Implicit home operations. virtual ::Components::EnterpriseComponent_ptr - create (void) + create () ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); }; diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp b/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp index 45467483b22..23b58d9cece 100644 --- a/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp +++ b/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp @@ -20,18 +20,17 @@ const char *ior = "file://test.ior"; int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" - ACE_ENV_ARG_PARAMETER); + ""); // Resolve HomeFinder interface CORBA::Object_var obj - = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + = orb->string_to_object (ior); Benchmark::RoundTripClient_var test = Benchmark::RoundTripClient::_narrow(obj.in()); //Get the RoundTrip reference @@ -41,13 +40,12 @@ main (int argc, char *argv[]) trigger->start(); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception Handled:"); + ex._tao_print_exception ("Exception Handled:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp b/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp index 7d6970661a9..a1e3ed4f588 100644 --- a/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp +++ b/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp @@ -11,8 +11,7 @@ LatencyTest_Impl::LatencyTest_Impl (CORBA::ORB_ptr orb) CORBA::Long -LatencyTest_Impl::makeCall (CORBA::Long send_time - ACE_ENV_ARG_DECL_NOT_USED) +LatencyTest_Impl::makeCall (CORBA::Long send_time) ACE_THROW_SPEC ((CORBA::SystemException)) { if (CIAO::debug_level () > 0) @@ -22,8 +21,8 @@ LatencyTest_Impl::makeCall (CORBA::Long send_time } void -LatencyTest_Impl::shutdown (void) +LatencyTest_Impl::shutdown () ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.h b/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.h index ae934da8559..9a13823eefe 100644 --- a/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.h +++ b/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.h @@ -22,11 +22,10 @@ public: LatencyTest_Impl (CORBA::ORB_ptr orb); // = The skeleton methods - virtual CORBA::Long makeCall (CORBA::Long send_time - ACE_ENV_ARG_DECL) + virtual CORBA::Long makeCall (CORBA::Long send_time) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (void) + virtual void shutdown () ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp b/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp index 5f860da9a61..7259a966207 100644 --- a/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp +++ b/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp @@ -33,13 +33,13 @@ main (int argc, char *argv[]) "server (%P|%t): sched_params failed\n")); } - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -47,7 +47,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -62,7 +62,7 @@ main (int argc, char *argv[]) roundtrip_impl->_this (); CORBA::String_var ior = - orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (roundtrip.in ()); // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -82,16 +82,15 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/CIAO/performance-tests/Benchmark/server.cpp b/CIAO/performance-tests/Benchmark/server.cpp index a2d8e7ac5f1..c7f39d42809 100644 --- a/CIAO/performance-tests/Benchmark/server.cpp +++ b/CIAO/performance-tests/Benchmark/server.cpp @@ -34,13 +34,13 @@ main (int argc, char *argv[]) "server (%P|%t): sched_params failed\n")); } - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -48,7 +48,7 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -64,7 +64,7 @@ main (int argc, char *argv[]) roundtrip_impl->_this (); CORBA::String_var ior = - orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (roundtrip.in ()); // If the ior_output_file exists, output the ior to it ACE_DEBUG ((LM_DEBUG, "%s", ior.in ())); @@ -75,16 +75,15 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp index c8a71ec66cd..005b183df40 100644 --- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp +++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp @@ -94,7 +94,6 @@ CORBA::ULong Impl::TSEC_Session_impl::hash ( CORBA::ULong Maximum - ACE_ENV_ARG_DECL_NOT_USED ) { CORBA::ULong hash = @@ -111,7 +110,6 @@ Impl::TSEC_Session_impl::hash CORBA::Long Impl::TSEC_Session_impl::getIdent ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException ) ) { //ACE_GUARD_RETURN( TMutex, guard, _parent.getMutex(), -1 ); @@ -127,7 +125,6 @@ Impl::TSEC_Session_impl::getIdent CORBA::Boolean Impl::TSEC_Session_impl::isInUse ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException ) ) { //ACE_GUARD_RETURN( TMutex, guard, _parent.getMutex(), FALSE ); @@ -186,10 +183,9 @@ CORBA::Object_ptr Impl::TSEC_CheckPoint_exec_i::getObjRef ( PortableServer::Servant Servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( (CORBA::SystemException ) ) { - return this->_p_sessionContainer->get_objref( Servant ACE_ENV_ARG_PARAMETER ); + return this->_p_sessionContainer->get_objref( Servant ); } @@ -208,7 +204,7 @@ Impl::TSEC_CheckPoint_exec_i::init CORBA::ORB_var orb = CORBA::ORB_init( argc, const_cast<char **> (argv) - ACE_ENV_ARG_PARAMETER ); + ); _orb = CORBA::ORB::_duplicate( orb.in () ); return 0; @@ -223,13 +219,12 @@ CORBA::Object_ptr Impl::TSEC_CheckPoint_exec_i::installServant ( PortableServer::Servant Servant - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC( ( CORBA::SystemException ) ) { assert( this->_p_sessionContainer ); return this->_p_sessionContainer->install_servant( Servant, - CIAO::Container::Component ACE_ENV_ARG_PARAMETER ); + CIAO::Container::Component ); } @@ -241,7 +236,6 @@ void Impl::TSEC_CheckPoint_exec_i::uninstallServant ( CORBA::Object_ptr ObjRef - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC( ( CORBA::SystemException ) ) { assert( this->_p_sessionContainer ); @@ -257,7 +251,6 @@ Impl::TSEC_CheckPoint_exec_i::uninstallServant ENW::TSession_ptr Impl::TSEC_CheckPoint_exec_i::createSession ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException ) ) { static long cnt = 0L; @@ -269,8 +262,8 @@ Impl::TSEC_CheckPoint_exec_i::createSession TSEC_Session_impl* p_sessionImpl = new TSEC_Session_impl( *this, ++cnt ); PortableServer::ServantBase_var safe_servant( p_sessionImpl ); CORBA::Object_var obj = this->installServant( p_sessionImpl - ACE_ENV_ARG_PARAMETER ); - session = ENW::TSession::_narrow ( obj.in () ACE_ENV_ARG_PARAMETER ); + ); + session = ENW::TSession::_narrow ( obj.in () ); ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::createSession...[DONE]\n" ) ); @@ -286,7 +279,6 @@ Impl::TSEC_CheckPoint_exec_i::createSession Impl::TSEC_CheckPoint_exec_i::destroySession ( ENW::TSession_ptr Session - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException ) ) { ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::destroySession...\n" ) ); @@ -311,7 +303,6 @@ ENW::TSession_ptr Impl::TSEC_CheckPoint_exec_i::acquireSession ( CORBA::Long Ident - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException, ENW::EUnknownIdent ) ) { @@ -329,7 +320,7 @@ Impl::TSEC_CheckPoint_exec_i::acquireSession ENW::TSession_var session = ENW::TSession::_nil(); TSEC_Session_impl* p_sessionImpl = 0; - ACE_TRY_NEW_ENV + try { { //ACE_GUARD_RETURN( TMutex, guard, _mutex, ENW::TSession::_nil() ); @@ -338,17 +329,16 @@ Impl::TSEC_CheckPoint_exec_i::acquireSession p_sessionImpl->isInUse( 1 ); CORBA::Object_var obj = this->getObjRef( p_sessionImpl) ; - session = ENW::TSession::_narrow ( obj.in () ACE_ENV_ARG_PARAMETER ); + session = ENW::TSession::_narrow ( obj.in () ); //session = sessionVector[Ident-1]._session; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION( ACE_ANY_EXCEPTION, "Reason\n" ); + ex._tao_print_exception ("Reason\n"); ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::releaseSession...[ERROR]\n" ) ); return session._retn(); } - ACE_ENDTRY; ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::releaseSession...[DONE]\n" ) ); @@ -365,7 +355,6 @@ Impl::TSEC_CheckPoint_exec_i::releaseSession ( CORBA::Long Ident, ENW::TSession_ptr Session - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException, ENW::EUnknownSession ) ) { @@ -418,7 +407,6 @@ Impl::TSEC_CheckPoint_exec_i::releaseSession ENW::CCM_ISessionService_ptr Impl::TSEC_CheckPoint_exec_i::get_sessionService ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException ) ) { return ENW::CCM_ISessionService::_duplicate( this ); @@ -433,7 +421,6 @@ void Impl::TSEC_CheckPoint_exec_i::set_session_context ( Components::SessionContext_ptr Ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException, Components::CCMException ) ) { @@ -442,11 +429,11 @@ Impl::TSEC_CheckPoint_exec_i::set_session_context this->_context = ENW::CCM_TSEC_CheckPoint_Context::_narrow( Ctx - ACE_ENV_ARG_PARAMETER ); + ); if( CORBA::is_nil( this->_context.in() ) ) { - ACE_THROW( CORBA::INTERNAL() ); + throw CORBA::INTERNAL(); } CIDL_TSEC_CheckPoint_Impl::TSEC_CheckPoint_Context* p_checkPoint_Context = @@ -454,14 +441,14 @@ Impl::TSEC_CheckPoint_exec_i::set_session_context if( !p_checkPoint_Context ) { - ACE_THROW( CORBA::INTERNAL() ); + throw CORBA::INTERNAL(); } this->_p_sessionContainer = p_checkPoint_Context->_ciao_the_Container(); if( !_p_sessionContainer ) { - ACE_THROW( CORBA::INTERNAL() ); + throw CORBA::INTERNAL(); } } @@ -474,7 +461,6 @@ void Impl::TSEC_CheckPoint_exec_i::push_lifeTokenIn ( ENW::ET_LifeToken* /* Event */ - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException ) ) { _awaitingLifeToken = false; @@ -488,7 +474,6 @@ Impl::TSEC_CheckPoint_exec_i::push_lifeTokenIn void Impl::TSEC_CheckPoint_exec_i::ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC( ( CORBA::SystemException, Components::CCMException ) ) { @@ -503,7 +488,6 @@ Impl::TSEC_CheckPoint_exec_i::ciao_preactivate void Impl::TSEC_CheckPoint_exec_i::ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC( ( CORBA::SystemException, Components::CCMException ) ) { @@ -516,9 +500,9 @@ Impl::TSEC_CheckPoint_exec_i::ccm_activate p_sessionImpl = new TSEC_Session_impl( *this, i + 1 ); PortableServer::ServantBase_var safe_servant( p_sessionImpl ); CORBA::Object_var obj = this->installServant( p_sessionImpl - ACE_ENV_ARG_PARAMETER ); + ); ENW::TSession_var session = - ENW::TSession::_narrow ( obj.in () ACE_ENV_ARG_PARAMETER ); + ENW::TSession::_narrow ( obj.in () ); sessionVector[i] = TSEC_SessionEntry( p_sessionImpl, session.in () ); } @@ -533,7 +517,6 @@ Impl::TSEC_CheckPoint_exec_i::ccm_activate void Impl::TSEC_CheckPoint_exec_i::ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC( ( CORBA::SystemException, Components::CCMException ) ) { @@ -548,7 +531,6 @@ Impl::TSEC_CheckPoint_exec_i::ciao_postactivate void Impl::TSEC_CheckPoint_exec_i::ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC( ( CORBA::SystemException, Components::CCMException ) ) { @@ -564,7 +546,6 @@ Impl::TSEC_CheckPoint_exec_i::ccm_passivate void Impl::TSEC_CheckPoint_exec_i::ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC( ( CORBA::SystemException, Components::CCMException ) ) { @@ -599,7 +580,6 @@ Impl::TSEC_CheckPointHome_exec_i::~TSEC_CheckPointHome_exec_i() Impl::TSEC_CheckPointHome_exec_i::new_TSEC_CheckPoint ( const char* Version - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException )) { return new Impl::TSEC_CheckPoint_exec_i( Version ); @@ -613,7 +593,6 @@ Impl::TSEC_CheckPointHome_exec_i::new_TSEC_CheckPoint ::Components::EnterpriseComponent_ptr Impl::TSEC_CheckPointHome_exec_i::create ( - ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC( ( CORBA::SystemException, Components::CCMException ) ) { diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h index 8aab825250b..5e5c3809813 100644 --- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h +++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h @@ -82,7 +82,6 @@ namespace Impl CORBA::ULong hash ( CORBA::ULong Maximum - ACE_ENV_ARG_DECL_NOT_USED ); TSEC_CheckPoint_exec_i& getParent() { return _parent; } @@ -122,25 +121,21 @@ namespace Impl virtual ENW::CCM_ISessionService_ptr get_sessionService ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException ) ); virtual ENW::TSession_ptr createSession ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException ) ); virtual CORBA::Boolean destroySession ( ENW::TSession_ptr Session - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException ) ); virtual ENW::TSession_ptr acquireSession ( CORBA::Long Ident - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException, ENW::EUnknownIdent ) ); @@ -148,7 +143,6 @@ namespace Impl ( CORBA::Long Ident, ENW::TSession_ptr Session - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException, ENW::EUnknownSession ) ); @@ -159,7 +153,6 @@ namespace Impl virtual void push_lifeTokenIn ( ENW::ET_LifeToken* Event - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException ) ); @@ -169,60 +162,51 @@ namespace Impl virtual void set_session_context ( Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException, Components::CCMException ) ); virtual void ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException, Components::CCMException ) ); virtual void ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException, Components::CCMException ) ); virtual void ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException, Components::CCMException ) ); virtual void ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException, Components::CCMException ) ); virtual void ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException, Components::CCMException ) ); CORBA::Object_ptr getObjRef ( PortableServer::Servant Servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException ) ); - int init( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + int init( )ACE_THROW_SPEC( ( CORBA::SystemException ) ); CORBA::Object_ptr installServant ( PortableServer::Servant Servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException ) ); void uninstallServant ( CORBA::Object_ptr ObjRef - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException ) ); TMutex& getMutex() { return _mutex; } @@ -260,13 +244,11 @@ namespace Impl virtual ::Components::EnterpriseComponent_ptr new_TSEC_CheckPoint ( const char* Version - ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC(( CORBA::SystemException)); // Implicit home operations. virtual ::Components::EnterpriseComponent_ptr create ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC( ( CORBA::SystemException, Components::CCMException ) ); }; diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp index 5fa62ad6f4b..6e7d40bcea5 100644 --- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp +++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp @@ -114,11 +114,11 @@ main char* argv[] ) { - ACE_TRY_NEW_ENV + try { // Initialize orb CORBA::ORB_var orb = - CORBA::ORB_init( argc, argv, "" ACE_ENV_ARG_PARAMETER ); + CORBA::ORB_init( argc, argv, "" ); if( parse_args( argc, argv ) != 0 ) { @@ -126,10 +126,10 @@ main } CORBA::Object_var obj = orb->string_to_object( _sessionService_ior - ACE_ENV_ARG_PARAMETER ); + ); ENW::ISessionService_var sessionService = - ENW::ISessionService::_narrow (obj.in () ACE_ENV_ARG_PARAMETER ); + ENW::ISessionService::_narrow (obj.in () ); if( CORBA::is_nil( sessionService.in() ) ) { @@ -182,17 +182,15 @@ main } } - orb->destroy( ACE_ENV_SINGLE_ARG_PARAMETER ); + orb->destroy( ); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION( ACE_ANY_EXCEPTION, - "Who is the culprit \n" ); + ex._tao_print_exception ("Who is the culprit \n"); cerr << "Uncaught CORBA exception" << endl; return 1; } - ACE_ENDTRY; return 0; } diff --git a/CIAO/tests/IDL3/Events/Any/main.cpp b/CIAO/tests/IDL3/Events/Any/main.cpp index d59f9fec0d4..77551725735 100644 --- a/CIAO/tests/IDL3/Events/Any/main.cpp +++ b/CIAO/tests/IDL3/Events/Any/main.cpp @@ -18,7 +18,7 @@ debug_msg (const char *msg) int main (int argc, char *argv[]) { - ACE_TRY + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ""); StringMsg_init *StringMsg_factory = new StringMsg_init; @@ -73,13 +73,11 @@ main (int argc, char *argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "caught exception:"); + ex._tao_print_exception ("caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp b/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp index a50fee30538..3aca5735ae0 100644 --- a/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp +++ b/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp @@ -45,26 +45,23 @@ namespace CIDL_Receiver_Impl void Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) { this->context_ = Receiver_Context::_narrow ( - ctx - ACE_ENV_ARG_PARAMETER); + ctx); if (this->context_ == 0) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } void - Receiver_exec_i::ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Receiver_exec_i::ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -73,8 +70,7 @@ namespace CIDL_Receiver_Impl } void - Receiver_exec_i::ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Receiver_exec_i::ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -83,8 +79,7 @@ namespace CIDL_Receiver_Impl } void - Receiver_exec_i::ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Receiver_exec_i::ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -93,8 +88,7 @@ namespace CIDL_Receiver_Impl } void - Receiver_exec_i::ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Receiver_exec_i::ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -103,8 +97,7 @@ namespace CIDL_Receiver_Impl } void - Receiver_exec_i::ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Receiver_exec_i::ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -135,8 +128,7 @@ namespace CIDL_Receiver_Impl // Implicit operations. ::Components::EnterpriseComponent_ptr - ReceiverHome_exec_i::create ( - ACE_ENV_SINGLE_ARG_DECL) + ReceiverHome_exec_i::create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/CIAO/tests/Minimum/Receiver/Receiver_exec.h b/CIAO/tests/Minimum/Receiver/Receiver_exec.h index fa366a6c10d..a90c6941de7 100644 --- a/CIAO/tests/Minimum/Receiver/Receiver_exec.h +++ b/CIAO/tests/Minimum/Receiver/Receiver_exec.h @@ -52,43 +52,37 @@ namespace CIDL_Receiver_Impl virtual void set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); @@ -116,8 +110,7 @@ namespace CIDL_Receiver_Impl // Implicit operations. virtual ::Components::EnterpriseComponent_ptr - create ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); diff --git a/CIAO/tests/Minimum/Sender/Sender_exec.cpp b/CIAO/tests/Minimum/Sender/Sender_exec.cpp index c877f3a9729..b8b1a1c516e 100644 --- a/CIAO/tests/Minimum/Sender/Sender_exec.cpp +++ b/CIAO/tests/Minimum/Sender/Sender_exec.cpp @@ -38,8 +38,7 @@ namespace CIDL_Sender_Impl // Supported or inherited operations. void - Sender_exec_i::bar ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Sender_exec_i::bar () ACE_THROW_SPEC ((CORBA::SystemException)) { // Your code here. @@ -53,26 +52,23 @@ namespace CIDL_Sender_Impl void Sender_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) { this->context_ = Sender_Context::_narrow ( - ctx - ACE_ENV_ARG_PARAMETER); + ctx); if (this->context_ == 0) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } void - Sender_exec_i::ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Sender_exec_i::ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -81,8 +77,7 @@ namespace CIDL_Sender_Impl } void - Sender_exec_i::ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Sender_exec_i::ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -91,8 +86,7 @@ namespace CIDL_Sender_Impl } void - Sender_exec_i::ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Sender_exec_i::ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -101,8 +95,7 @@ namespace CIDL_Sender_Impl } void - Sender_exec_i::ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Sender_exec_i::ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -111,8 +104,7 @@ namespace CIDL_Sender_Impl } void - Sender_exec_i::ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + Sender_exec_i::ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) @@ -143,8 +135,7 @@ namespace CIDL_Sender_Impl // Implicit operations. ::Components::EnterpriseComponent_ptr - SenderHome_exec_i::create ( - ACE_ENV_SINGLE_ARG_DECL) + SenderHome_exec_i::create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/CIAO/tests/Minimum/Sender/Sender_exec.h b/CIAO/tests/Minimum/Sender/Sender_exec.h index 984586924f6..179bb6453a8 100644 --- a/CIAO/tests/Minimum/Sender/Sender_exec.h +++ b/CIAO/tests/Minimum/Sender/Sender_exec.h @@ -45,8 +45,7 @@ namespace CIDL_Sender_Impl // Supported or inherited operations. virtual void - bar ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + bar () ACE_THROW_SPEC ((CORBA::SystemException)); // Attribute operations. @@ -57,43 +56,37 @@ namespace CIDL_Sender_Impl virtual void set_session_context ( - ::Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ::Components::SessionContext_ptr ctx) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_preactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_preactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ciao_postactivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ciao_postactivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_activate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_activate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_passivate ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_passivate () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); virtual void - ccm_remove ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ccm_remove () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); @@ -121,8 +114,7 @@ namespace CIDL_Sender_Impl // Implicit operations. virtual ::Components::EnterpriseComponent_ptr - create ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + create () ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)); diff --git a/CIAO/tools/Config_Handlers/DnC_Dump.cpp b/CIAO/tools/Config_Handlers/DnC_Dump.cpp index 4b3476e15f6..be434b370a6 100644 --- a/CIAO/tools/Config_Handlers/DnC_Dump.cpp +++ b/CIAO/tools/Config_Handlers/DnC_Dump.cpp @@ -759,7 +759,7 @@ namespace Deployment { ACE_DEBUG ((LM_DEBUG, "DnC_Dump::dump (CORBA::Any), expected short\ encoded different type")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (), temp)); @@ -781,7 +781,7 @@ encoded different type")); { ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected long\ encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (), temp)); @@ -795,7 +795,7 @@ encoded with different type")); { ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected u short\ encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } ACE_DEBUG ((LM_DEBUG, "%sAny value: %u \n", Dump_Obj::indent (), temp)); @@ -809,7 +809,7 @@ encoded with different type")); { ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected ulong\ encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } ACE_DEBUG ((LM_DEBUG, "%sAny value: %u \n", Dump_Obj::indent (), temp)); @@ -823,7 +823,7 @@ encoded with different type")); { ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected float\ encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } ACE_DEBUG ((LM_DEBUG, "%sAny value: %f \n", Dump_Obj::indent (), temp)); @@ -836,7 +836,7 @@ encoded with different type")); { ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected double\ encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } ACE_DEBUG ((LM_DEBUG, "%sAny value: %f \n", Dump_Obj::indent (), temp)); @@ -849,7 +849,7 @@ encoded with different type")); { ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected bool\ encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } if (temp) @@ -866,7 +866,7 @@ encoded with different type")); { ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected char\ encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } ACE_DEBUG ((LM_DEBUG, "%sAny value: %c \n", Dump_Obj::indent (), temp)); @@ -880,7 +880,7 @@ encoded with different type")); { ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected octet\ encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (), temp)); @@ -894,7 +894,7 @@ encoded with different type")); { ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected string\ encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } ACE_DEBUG ((LM_DEBUG, "%sAny value: %s \n", Dump_Obj::indent (), temp)); @@ -907,7 +907,7 @@ encoded with different type")); { ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected longlong\ encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } ACE_DEBUG ((LM_DEBUG, "%sAny value: %l \n", Dump_Obj::indent (), temp)); @@ -921,7 +921,7 @@ encoded with different type")); { ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected longdouble\ encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (), temp)); @@ -935,7 +935,7 @@ encoded with different type")); { ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected wchar\ encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } ACE_DEBUG ((LM_DEBUG, "%sAny value: %c \n", Dump_Obj::indent (), temp)); @@ -949,7 +949,7 @@ encoded with different type")); { ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected wstring\ encoded with different type")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } ACE_DEBUG ((LM_DEBUG, "%sAny value: %s \n", Dump_Obj::indent (), temp)); @@ -958,7 +958,7 @@ encoded with different type")); default: ACE_DEBUG ((LM_DEBUG, "Unknown type encoded in Any\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } } } |