changeset 23891:142a9c7e403a

Avoid CamelCase in variables names in mxGetProperty cset (bd9e719f04cc). * mex.cc, mexproto.h: Use property_name for argument name in mxGetProperty prototype. * mxarray.in.h (get_property): Add space between declaration of "const char *" and /*name*/ to stop syntax highlighter freaking out.
author Rik <rik@octave.org>
date Fri, 11 Aug 2017 11:39:40 -0700
parents 89a1ed157a2a
children ba46a8015b26 75eff5b667b3
files libinterp/corefcn/mex.cc libinterp/corefcn/mexproto.h libinterp/corefcn/mxarray.in.h
diffstat 3 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/mex.cc	Mon Jun 22 11:37:59 2015 -0700
+++ b/libinterp/corefcn/mex.cc	Fri Aug 11 11:39:40 2017 -0700
@@ -2975,9 +2975,10 @@
   ptr->set_class_name (name);
 }
 
-mxArray *mxGetProperty (const mxArray *ptr, mwIndex idx, const char *propertyName)
+mxArray *
+mxGetProperty (const mxArray *ptr, mwIndex idx, const char *property_name)
 {
-  return ptr->get_property (idx, propertyName);
+  return ptr->get_property (idx, property_name);
 }
 
 // Cell support.
--- a/libinterp/corefcn/mexproto.h	Mon Jun 22 11:37:59 2015 -0700
+++ b/libinterp/corefcn/mexproto.h	Fri Aug 11 11:39:40 2017 -0700
@@ -243,8 +243,8 @@
 extern OCTINTERP_API mxClassID mxGetClassID (const mxArray *ptr);
 extern OCTINTERP_API const char * mxGetClassName (const mxArray *ptr);
 extern OCTINTERP_API void mxSetClassName (mxArray *ptr, const char *name);
-extern OCTINTERP_API mxArray * mxGetProperty(const mxArray *ptr, mwIndex idx,
-                                             const char *propertName);
+extern OCTINTERP_API mxArray * mxGetProperty (const mxArray *ptr, mwIndex idx,
+                                              const char *property_name);
 
 /* Cell support.  */
 extern OCTINTERP_API mxArray * mxGetCell (const mxArray *ptr, mwIndex idx);
--- a/libinterp/corefcn/mxarray.in.h	Mon Jun 22 11:37:59 2015 -0700
+++ b/libinterp/corefcn/mxarray.in.h	Fri Aug 11 11:39:40 2017 -0700
@@ -224,7 +224,7 @@
 
   virtual void set_class_name (const char *name_arg) = 0;
 
-  virtual mxArray * get_property (mwIndex /*idx*/, const char */*name*/) const
+  virtual mxArray * get_property (mwIndex /*idx*/, const char * /*name*/) const
   {
     return nullptr;
   }