diff options
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_valuetype')
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp | 6 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp index e4d67bf3c2a..495807a45f9 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp @@ -73,7 +73,7 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node) *os << be_global->stub_export_macro () << "void" << be_nl << "operator<<= (CORBA::Any &any, " << node->name () - << " **value) // non-copying" << be_nl + << " **value) // non-copying" << be_nl << "{" << be_idt_nl << "TAO_OutputCDR stream;" << be_nl << "if (stream << *value)" << be_nl @@ -84,7 +84,7 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node) << "stream.begin ()," << be_nl << "1," << be_nl << "*value," << be_nl - << node->name () << "::_tao_any_destructor);" + << node->name () << "::_tao_any_destructor);" << be_uidt << be_uidt << be_uidt_nl << "}" << be_uidt_nl << "}" << be_nl << be_nl; @@ -99,7 +99,7 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node) << "value = 0;" << be_nl << "CORBA::TypeCode_var type = any.type ();" << be_nl << be_nl << "CORBA::Boolean result = type->equivalent (" << node->tc_name () - << " TAO_ENV_ARG_PARAMETER);" << be_nl + << " ACE_ENV_ARG_PARAMETER);" << be_nl << "ACE_TRY_CHECK;" << be_nl << be_nl << "if (!result)" << be_nl << "{" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp index dd6db9e8716..b53c4daf8be 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp @@ -62,24 +62,24 @@ be_visitor_obv_operation_arglist::visit_operation (be_operation *node) -1); } - // Generate the TAO_ENV_ARG_DECL parameter for the alternative mapping. + // Generate the ACE_ENV_ARG_DECL parameter for the alternative mapping. if (!be_global->exception_support ()) { - // Use TAO_ENV_SINGLE_ARG_DECL or TAO_ENV_ARG_DECL depending on + // Use ACE_ENV_SINGLE_ARG_DECL or ACE_ENV_ARG_DECL depending on // whether the operation node has parameters. const char *env_decl = (node->argument_count () > 0 ? - " TAO_ENV_ARG_DECL" : "TAO_ENV_SINGLE_ARG_DECL"); + " ACE_ENV_ARG_DECL" : "ACE_ENV_SINGLE_ARG_DECL"); switch (this->ctx_->state ()) { case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_CH: case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_OBV_CH: case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IMPL_CH: - // Last argument - is always TAO_ENV_ARG_DECL. + // Last argument - is always ACE_ENV_ARG_DECL. *os << env_decl << "_WITH_DEFAULTS" << be_uidt_nl; break; case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IMPL_CS: - // Last argument - is always TAO_ENV_ARG_DECL. + // Last argument - is always ACE_ENV_ARG_DECL. *os << env_decl << be_uidt_nl; break; default: |