summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2005-03-29 07:30:54 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2005-03-29 07:30:54 +0000
commitd6979c1b0e950c2f03ac56c30b1417bee41a1a23 (patch)
tree6b4b04974151a5ad199fad47c0f4ca45a89d22ee
parent12c8a4fdd9e26a248094eab0efb9c2bd2b0aa7f9 (diff)
downloadATCD-d6979c1b0e950c2f03ac56c30b1417bee41a1a23.tar.gz
*** empty log message ***
-rw-r--r--TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
index 811610a8b82..53796a0a0b2 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
@@ -58,7 +58,7 @@ TAO::be_visitor_value_typecode::visit_valuetype (be_valuetype * node)
// Generate the TypeCode instantiation.
os
<< "static TAO::TypeCode::Value_Box<char const *," << be_nl
- << " TAO::Null_RefCount_Policy> const"
+ << " TAO::Null_RefCount_Policy>"
<< be_idt_nl
<< "_tao_tc_" << node->flat_name () << " (" << be_idt_nl
<< "\"" << node->repoID () << "\"," << be_nl
@@ -98,7 +98,7 @@ TAO::be_visitor_value_typecode::visit_valuetype (be_valuetype * node)
<< " TAO::TypeCode::Value_Field<char const *> const *," << be_nl
<< " CORBA::tk_"
<< (dynamic_cast<be_eventtype *> (node) ? "event" : "value") << "," << be_nl
- << " TAO::Null_RefCount_Policy> const"
+ << " TAO::Null_RefCount_Policy>"
<< be_idt_nl
<< "_tao_tc_" << node->flat_name () << " (" << be_idt_nl
<< "\"" << node->repoID () << "\"," << be_nl
@@ -127,7 +127,7 @@ TAO::be_visitor_value_typecode::visit_valuetype (be_valuetype * node)
else
{
// No concrete base.
- os << "&CORBA::tk_null," << be_nl;
+ os << "&CORBA::_tc_null," << be_nl;
}
// Fields
@@ -170,6 +170,11 @@ TAO::be_visitor_value_typecode::visit_members (be_valuetype * node)
continue;
}
+ AST_Field::Visibility const vis = field->visibility ();
+
+ if (vis == AST_Field::vis_NA)
+ continue;
+
be_decl * const member_decl =
be_decl::narrow_from_decl (field);
@@ -180,8 +185,6 @@ TAO::be_visitor_value_typecode::visit_members (be_valuetype * node)
<< "\"" << member_decl->original_local_name () << "\", "
<< "&" << member_type->tc_name () << ", ";
- AST_Field::Visibility const vis = field->visibility ();
-
switch (vis)
{
case AST_Field::vis_PUBLIC:
@@ -195,7 +198,8 @@ TAO::be_visitor_value_typecode::visit_members (be_valuetype * node)
default:
ACE_ERROR_RETURN ((LM_ERROR,
"(%N:%l) be_visitor_value_typecode::visit_members - "
- "Unknown valuetype member visibility.\n"),
+ "Unknown valuetype member visibility: %d.\n",
+ vis),
-1);
};