Skip to content

Commit

Permalink
Merge pull request #2088 from jwillemsen/jwi-nullptriftaoidl
Browse files Browse the repository at this point in the history
Use nullptr and no need to compare a pointer not equal to zero explic…
  • Loading branch information
jwillemsen authored Jul 7, 2023
2 parents 8dd26d9 + 745299b commit a71b63a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
}
else
{
*os << ", 0";
*os << ", nullptr";
}

*os << "\n#endif /* TAO_HAS_INTERCEPTORS */" << be_uidt_nl
Expand Down
2 changes: 1 addition & 1 deletion TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ be_visitor_operation_exceptlist_cs::visit_operation (be_operation *node)
}
else
{
*os << ", 0";
*os << ", nullptr";
}

*os << "\n#endif /* TAO_HAS_INTERCEPTORS */" << be_uidt_nl
Expand Down
6 changes: 3 additions & 3 deletions TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -352,10 +352,10 @@ be_visitor_operation_upcall_command_ss::gen_upcall (
}

os << be_nl
<< "TAO::ExceptionHolder *tao_excepholder = " << be_idt_nl
<< "TAO::ExceptionHolder *tao_excepholder = "
<< "dynamic_cast<TAO::ExceptionHolder *> (arg_" << index
<< ");" << be_uidt_nl
<< "if (tao_excepholder != 0)" << be_idt_nl
<< ");" << be_nl
<< "if (tao_excepholder)" << be_idt_nl
<< "{" << be_idt_nl
<< "tao_excepholder->set_exception_data "
"(_tao_" << op_name << "_exceptiondata, " << exceptions_count << ");" << be_uidt_nl
Expand Down

0 comments on commit a71b63a

Please sign in to comment.