comparison liboctave/array/Array-fC.cc @ 19861:19755f4fc851

maint: Cleanup C++ code to follow Octave coding conventions. Try to wrap long lines to < 80 characters. Use GNU style and don't indent first brace of function definition. "case" statement is aligned flush left with brace of switch stmt. Remove trailing '\' line continuation from the end of #define macros. Use 2 spaces for indent. * files-dock-widget.cc, history-dock-widget.cc, main-window.cc, octave-cmd.cc, octave-dock-widget.cc, octave-gui.cc, resource-manager.cc, settings-dialog.cc, shortcut-manager.cc, welcome-wizard.cc, workspace-view.cc, cellfun.cc, data.cc, debug.cc, debug.h, dirfns.cc, error.h, file-io.cc, gl-render.cc, gl-render.h, gl2ps-renderer.h, graphics.cc, graphics.in.h, help.cc, input.cc, load-path.cc, load-path.h, lookup.cc, lu.cc, oct-stream.cc, octave-default-image.h, ordschur.cc, pr-output.cc, qz.cc, strfns.cc, symtab.cc, symtab.h, sysdep.cc, variables.cc, zfstream.h, __fltk_uigetfile__.cc, __init_fltk__.cc, __magick_read__.cc, __osmesa_print__.cc, audiodevinfo.cc, ov-classdef.cc, ov-classdef.h, ov-fcn.h, ov-float.cc, ov-flt-complex.cc, ov-java.cc, ov-range.cc, ov-re-mat.cc, ov-usr-fcn.h, ov.cc, op-int.h, options-usage.h, pt-eval.cc, Array-C.cc, Array-fC.cc, Array.cc, Array.h, PermMatrix.cc, Sparse.cc, chMatrix.h, dSparse.cc, dim-vector.h, bsxfun-decl.h, bsxfun-defs.cc, oct-norm.cc, Sparse-op-defs.h, oct-inttypes.cc, oct-inttypes.h, main.in.cc, mkoctfile.in.cc: Cleanup C++ code to follow Octave coding conventions.
author Rik <rik@octave.org>
date Wed, 25 Feb 2015 11:55:49 -0800
parents 4197fc428c7d
children 31e3799b9e27
comparison
equal deleted inserted replaced
19860:e8ccfc5d892b 19861:19755f4fc851
56 return true; 56 return true;
57 else if (xabs == yabs) 57 else if (xabs == yabs)
58 { 58 {
59 float xarg = arg (x); 59 float xarg = arg (x);
60 float yarg = arg (y); 60 float yarg = arg (y);
61 xarg = (xarg == -M_PI) ? M_PI : xarg; 61 xarg = (xarg == -M_PI) ? M_PI : xarg;
62 yarg = (yarg == -M_PI) ? M_PI : yarg; 62 yarg = (yarg == -M_PI) ? M_PI : yarg;
63 63
64 return xarg < yarg; 64 return xarg < yarg;
65 } 65 }
66 else 66 else
67 return false; 67 return false;
80 return true; 80 return true;
81 else if (xabs == yabs) 81 else if (xabs == yabs)
82 { 82 {
83 float xarg = arg (x); 83 float xarg = arg (x);
84 float yarg = arg (y); 84 float yarg = arg (y);
85 xarg = (xarg == -M_PI) ? M_PI : xarg; 85 xarg = (xarg == -M_PI) ? M_PI : xarg;
86 yarg = (yarg == -M_PI) ? M_PI : yarg; 86 yarg = (yarg == -M_PI) ? M_PI : yarg;
87 87
88 return xarg > yarg; 88 return xarg > yarg;
89 } 89 }
90 else 90 else
91 return false; 91 return false;