summaryrefslogtreecommitdiff
path: root/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp')
-rw-r--r--TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp16
1 files changed, 6 insertions, 10 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
index 69014b8c6d5..376e6244a6a 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -114,7 +114,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
*os << node->name () << "::operator= (const ::"
<< node->name () << " &_tao_excp)" << be_nl
<< "{" << be_idt_nl
- << "this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= "
+ << "this->::CORBA::UserException::operator= "
<< "(_tao_excp);";
// Assign each individual member.
@@ -196,8 +196,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
if (!node->is_local ())
{
- *os << "TAO_OutputCDR &cdr" << be_nl
- << "ACE_ENV_ARG_DECL" << be_uidt_nl
+ *os << "TAO_OutputCDR &cdr" << env_decl << be_uidt_nl
<< ") const" << be_uidt_nl
<< "{" << be_idt_nl
<< "if (cdr << *this)" << be_idt_nl
@@ -218,8 +217,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
}
else
{
- *os << "TAO_OutputCDR &" << be_nl
- << "ACE_ENV_ARG_DECL" << be_uidt_nl
+ *os << "TAO_OutputCDR &" << env_decl << be_uidt_nl
<< ") const" << be_uidt_nl
<< "{" << be_idt_nl;
@@ -240,8 +238,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
if (!node->is_local ())
{
- *os << "TAO_InputCDR &cdr" << be_nl
- << "ACE_ENV_ARG_DECL" << be_uidt_nl
+ *os << "TAO_InputCDR &cdr" << env_decl << be_uidt_nl
<< ")" << be_uidt_nl
<< "{" << be_idt_nl
<< "if (cdr >> *this)" << be_idt_nl
@@ -262,8 +259,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
}
else
{
- *os << "TAO_InputCDR &" << be_nl
- << "ACE_ENV_ARG_DECL" << be_uidt_nl
+ *os << "TAO_InputCDR &" << env_decl << be_uidt_nl
<< ")" << be_uidt_nl
<< "{" << be_idt_nl;
@@ -360,6 +356,6 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
}
}
- node->cli_stub_gen (I_TRUE);
+ node->cli_stub_gen (true);
return 0;
}