diff options
| -rw-r--r-- | CIAO/ChangeLog | 7 | ||||
| -rw-r--r-- | CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp | 16 |
2 files changed, 13 insertions, 10 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index c9642aedc83..4a5c4c504a7 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,10 @@ +Tue Apr 20 18:57:26 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: + + Removed now-redundant check for non-local uses type in + generation of connect_* methods. + Tue Apr 20 17:49:15 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: diff --git a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp index cdc09212a0a..840dfb74b8f 100644 --- a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp +++ b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp @@ -293,16 +293,12 @@ idl3_to_idl2_visitor::visit_uses (AST_Uses *node) } else { - if (! ut->is_local ()) - { - *os << "void connect_" << ext_port_name << " (in " - << impl_name << " conxn)" << be_idt_nl - << "raises (Components::AlreadyConnected, " - << "Components::InvalidConnection);" - << be_uidt_nl << be_nl; - } - - *os << impl_name << " disconnect_" + *os << "void connect_" << ext_port_name << " (in " + << impl_name << " conxn)" << be_idt_nl + << "raises (Components::AlreadyConnected, " + << "Components::InvalidConnection);" + << be_uidt_nl << be_nl + << impl_name << " disconnect_" << ext_port_name << " ()" << be_idt_nl << "raises (Components::NoConnection);" << be_uidt_nl << be_nl |