Mercurial > octave

changeset 22600:dd80fb1ef949 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: minor style fixes for C++ code.
author John W. Eaton <jwe@octave.org>
date Thu, 06 Oct 2016 12:10:22 -0400
parents 51b395d24782
children a2ee7fe43834 883b72cdf0b2
files libgui/src/m-editor/file-editor.h libinterp/corefcn/call-stack.cc libinterp/corefcn/call-stack.h libinterp/corefcn/jit-typeinfo.cc libinterp/corefcn/jit-typeinfo.h libinterp/octave-value/ov-classdef.h liboctave/array/CMatrix.cc liboctave/array/Sparse.cc liboctave/array/fCMatrix.cc
diffstat 9 files changed, 15 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- 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;
     }
--- 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;
--- 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:
 
--- 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;
--- 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<const signature_vec *, jit_function *, signature_cmp>
--- 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;
   }
--- 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
     {
--- 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<T> (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 ());
     }
--- 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
     {