boundary_standard.cxx

Use "if...else if...else..." rather than "if...return;if...return;..."