diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-08-07 14:14:36 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-08-07 14:14:36 +0000 |
| commit | 03cc45f821499b8e503e91e4505c07eb9b5ecf8e (patch) | |
| tree | aa8cd995cbd37073f8c620fa62c3cc0a6ec18938 | |
| parent | ac9d67d4e5851019c5a4eb0663247ab26b73b273 (diff) | |
| download | ATCD-03cc45f821499b8e503e91e4505c07eb9b5ecf8e.tar.gz | |
Fri Aug 7 14:14:19 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* TAO_IDL/be/be_visitor_component/component_svs.cpp:
Generate a cleaner provide method
| -rw-r--r-- | modules/TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | modules/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/modules/TAO/ChangeLog b/modules/TAO/ChangeLog index 648a9c91b51..69cf168f512 100644 --- a/modules/TAO/ChangeLog +++ b/modules/TAO/ChangeLog @@ -1,3 +1,8 @@ +Fri Aug 7 14:14:19 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * TAO_IDL/be/be_visitor_component/component_svs.cpp: + Generate a cleaner provide method + Fri Aug 7 13:51:19 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * TAO_IDL/be/be_visitor_component/component_exs.cpp diff --git a/modules/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp b/modules/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp index c3979b23abb..b6cf562022d 100644 --- a/modules/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp +++ b/modules/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp @@ -562,20 +562,17 @@ be_visitor_component_svs::gen_provides (AST_Type *obj, os_ << "this->activate_component ();" << be_nl << be_nl; } - os_ << "if (! ::CORBA::is_nil (this->provide_" + os_ << "if ( ::CORBA::is_nil (this->provide_" << port_name << "_.in ()))" << be_idt_nl << "{" << be_idt_nl - << "return" << be_idt_nl - << "::" << obj_name << "::_duplicate (this->provide_" - << port_name << "_.in ());" << be_uidt << be_uidt_nl - << "}" << be_uidt_nl << be_nl << "::CORBA::Object_var obj =" << be_idt_nl << "this->provide_" << port_name << "_i ();" << be_uidt_nl << be_nl << "::" << obj_name << "_var fo =" << be_idt_nl << "::" << obj_name << "::_narrow (obj.in ());" << be_uidt_nl << be_nl - << "this->provide_" << port_name << "_ = fo;" << be_nl + << "this->provide_" << port_name << "_ = fo;" << be_uidt_nl + << "}" << be_uidt_nl << be_nl << "return" << be_idt_nl << "::" << obj_name << "::_duplicate (this->provide_" << port_name << "_.in ());" << be_uidt << be_uidt_nl |