summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2003-09-01 15:45:16 +0000
committerbala <balanatarajan@users.noreply.github.com>2003-09-01 15:45:16 +0000
commitf9f606f766f9434161ec9e5415cf19bc16a31cb9 (patch)
treead927d2c475c8c341aaedff8c90172d9a301c8e5
parent47457d0a224f49847cb619740b5402540c2007ba (diff)
downloadATCD-f9f606f766f9434161ec9e5415cf19bc16a31cb9.tar.gz
ChangeLogTag:Mon Sep 1 10:43:00 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
-rw-r--r--TAO/ChangeLog_ref7
-rw-r--r--TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp12
2 files changed, 15 insertions, 4 deletions
diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index d1feb48b01f..f1174efd0cc 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,10 @@
+Mon Sep 1 10:43:00 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
+
+ * TAO_IDL/be/be_visitor_interface/interface_cs.cpp (visit_interface):
+
+ Use _NOT_USED in the argument list for _is_a () only if the
+ interface is local.
+
Mon Sep 1 10:19:16 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
* TAO_IDL/be/be_visitor_exception/exception_ci.cpp:
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index 41e91844a12..00e6edb5293 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -129,7 +129,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
// Generate the proxy broker factory function pointer definition.
*os << be_nl << be_nl
- << "// Function pointer for collocation factory initialization."
+ << "// Function pointer for collocation factory initialization."
<< be_nl
<< "TAO::Collocation_Proxy_Broker * " << be_nl
<< "(*" << node->flat_client_enclosing_scope ()
@@ -370,8 +370,12 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
*os << "CORBA::Boolean" << be_nl
<< node->full_name () << "::_is_a (" << be_idt << be_idt_nl
- << "const char *value" << be_nl
- << "ACE_ENV_ARG_DECL_NOT_USED";
+ << "const char *value" << be_nl;
+
+ if (node->is_local ())
+ *os << "ACE_ENV_ARG_DECL_NOT_USED";
+ else
+ *os << "ACE_ENV_ARG_DECL";
*os << be_uidt_nl << ")" << be_uidt_nl
<< "{" << be_idt_nl
@@ -686,7 +690,7 @@ be_visitor_interface_cs::gen_concrete_unchecked_narrow (be_interface *node,
*os << "{" << be_idt_nl
<< "::" << node->name () << "_ptr p =" << be_idt_nl
- << "dynamic_cast<::" << node->name () << "_ptr> (obj);"
+ << "dynamic_cast<::" << node->name () << "_ptr> (obj);"
<< be_uidt_nl << be_nl
<< "p->_add_ref ();" << be_nl << be_nl
<< "return p;" << be_uidt_nl