# HG changeset patch # User John W. Eaton # Date 1475770222 14400 # Node ID dd80fb1ef949cbd5c5846f0c51c4f12c03908971 # Parent 51b395d247820e6110f6d2216286ed6d68814d16 maint: minor style fixes for C++ code. diff -r 51b395d24782 -r dd80fb1ef949 libgui/src/m-editor/file-editor.h --- a/libgui/src/m-editor/file-editor.h Thu Oct 06 11:55:20 2016 -0400 +++ b/libgui/src/m-editor/file-editor.h Thu Oct 06 12:10:22 2016 -0400 @@ -71,7 +71,8 @@ QString index; QString file_name; QString encoding; - bool operator<(const session_data &other) const + + bool operator < (const session_data &other) const { return index < other.index; } diff -r 51b395d24782 -r dd80fb1ef949 libinterp/corefcn/call-stack.cc --- a/libinterp/corefcn/call-stack.cc Thu Oct 06 11:55:20 2016 -0400 +++ b/libinterp/corefcn/call-stack.cc Thu Oct 06 12:10:22 2016 -0400 @@ -65,7 +65,7 @@ } bool -octave_call_stack::stack_frame::operator== (const octave_call_stack::stack_frame &rhs) const +octave_call_stack::stack_frame::operator == (const octave_call_stack::stack_frame &rhs) const { if (this->line () != rhs.line ()) return false; diff -r 51b395d24782 -r dd80fb1ef949 libinterp/corefcn/call-stack.h --- a/libinterp/corefcn/call-stack.h Thu Oct 06 11:55:20 2016 -0400 +++ b/libinterp/corefcn/call-stack.h Thu Oct 06 12:10:22 2016 -0400 @@ -71,7 +71,7 @@ std::string fcn_name (bool print_subfn = true) const; - bool operator== (const stack_frame &rhs) const; + bool operator == (const stack_frame &rhs) const; private: diff -r 51b395d24782 -r dd80fb1ef949 libinterp/corefcn/jit-typeinfo.cc --- a/libinterp/corefcn/jit-typeinfo.cc Thu Oct 06 11:55:20 2016 -0400 +++ b/libinterp/corefcn/jit-typeinfo.cc Thu Oct 06 12:10:22 2016 -0400 @@ -885,8 +885,8 @@ } bool -jit_operation::signature_cmp -::operator() (const signature_vec *lhs, const signature_vec *rhs) const +jit_operation::signature_cmp::operator () (const signature_vec *lhs, + const signature_vec *rhs) const { const signature_vec& l = *lhs; const signature_vec& r = *rhs; diff -r 51b395d24782 -r dd80fb1ef949 libinterp/corefcn/jit-typeinfo.h --- a/libinterp/corefcn/jit-typeinfo.h Thu Oct 06 11:55:20 2016 -0400 +++ b/libinterp/corefcn/jit-typeinfo.h Thu Oct 06 12:10:22 2016 -0400 @@ -372,7 +372,7 @@ struct signature_cmp { - bool operator() (const signature_vec *lhs, const signature_vec *rhs) const; + bool operator () (const signature_vec *lhs, const signature_vec *rhs) const; }; typedef std::map diff -r 51b395d24782 -r dd80fb1ef949 libinterp/octave-value/ov-classdef.h --- a/libinterp/octave-value/ov-classdef.h Thu Oct 06 11:55:20 2016 -0400 +++ b/libinterp/octave-value/ov-classdef.h Thu Oct 06 12:10:22 2016 -0400 @@ -784,7 +784,7 @@ cdef_class& operator = (const cdef_class& cls) { - cdef_object::operator= (cls); + cdef_object::operator = (cls); return *this; } @@ -983,7 +983,7 @@ cdef_property& operator = (const cdef_property& prop) { - cdef_object::operator= (prop); + cdef_object::operator = (prop); return *this; } @@ -1116,7 +1116,7 @@ cdef_method& operator = (const cdef_method& meth) { - cdef_object::operator= (meth); + cdef_object::operator = (meth); return *this; } @@ -1351,7 +1351,7 @@ cdef_package& operator = (const cdef_package& pack) { - cdef_object::operator= (pack); + cdef_object::operator = (pack); return *this; } diff -r 51b395d24782 -r dd80fb1ef949 liboctave/array/CMatrix.cc --- a/liboctave/array/CMatrix.cc Thu Oct 06 11:55:20 2016 -0400 +++ b/liboctave/array/CMatrix.cc Thu Oct 06 12:10:22 2016 -0400 @@ -2364,7 +2364,7 @@ (*current_liboctave_error_handler) ("matrix dimension mismatch solution of linear equations"); - if (m== 0 || n == 0 || b.cols () == 0) + if (m == 0 || n == 0 || b.cols () == 0) retval = ComplexMatrix (n, b.cols (), Complex (0.0, 0.0)); else { diff -r 51b395d24782 -r dd80fb1ef949 liboctave/array/Sparse.cc --- a/liboctave/array/Sparse.cc Thu Oct 06 11:55:20 2016 -0400 +++ b/liboctave/array/Sparse.cc Thu Oct 06 12:10:22 2016 -0400 @@ -2201,7 +2201,8 @@ else assign (idx_i, idx_j, Sparse (n, m)); } - else if (idx_i.length (nr) == m && idx_j.length (nc) == n && (n==1 || m==1)) + else if (idx_i.length (nr) == m && idx_j.length (nc) == n + && (n == 1 || m == 1)) { assign (idx_i, idx_j, rhs.transpose ()); } diff -r 51b395d24782 -r dd80fb1ef949 liboctave/array/fCMatrix.cc --- a/liboctave/array/fCMatrix.cc Thu Oct 06 11:55:20 2016 -0400 +++ b/liboctave/array/fCMatrix.cc Thu Oct 06 12:10:22 2016 -0400 @@ -2381,7 +2381,7 @@ (*current_liboctave_error_handler) ("matrix dimension mismatch solution of linear equations"); - if (m== 0 || n == 0 || b.cols () == 0) + if (m == 0 || n == 0 || b.cols () == 0) retval = FloatComplexMatrix (n, b.cols (), FloatComplex (0.0, 0.0)); else {