summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2010-04-20 18:58:25 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2010-04-20 18:58:25 +0000
commit3152042057ff888b2fb712c6e3616d66082e16bf (patch)
tree22163134b88edcb89053c419fefa3f985b8af129
parent156a9f28310c1ada97aec3856a7e468542294c97 (diff)
downloadATCD-3152042057ff888b2fb712c6e3616d66082e16bf.tar.gz
ChangeLogTag: Tue Apr 20 18:57:26 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--CIAO/ChangeLog7
-rw-r--r--CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp16
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