Context Navigation

mxGetAssignedField.cpp

Timestamp:

01/27/12 08:19:58 (13 years ago)

Author:

Eric.Larour

Message:

merged trunk-jpl and trunk for revision 11236

Location:

issm/trunk

Files:

Property svn:ignore

-              old
+              new
+autom4te.cache
+aclocal.m4
 bin
+config.log
+config.h
+config.h.in
+config.status
 configure
+doxygen
+ISSM.paf
+ISSM.ppf
+ISSM.ppf_cache
+libtool
+list
 Makefile
 Makefile.in
-ISSM.paf
-list
-ISSM.ppf_cache
-config.log
-config.h
-.ignore.txt
-config.status
 stamp-h1
 svn-commit*
-ISSM.ppf
-config.h.in
-autom4te.cache
-aclocal.m4
-doxygen

Property svn:mergeinfo changed

-              r1
+              r11237
 #include "mex.h"
 mxArray* mxGetAssignedField(const mxArray* pmxa_array,int number, char* field){
+mxArray* mxGetAssignedField(const mxArray* pmxa_array,int number,const char* field){
         //output
 …
         //input
         mxArray*   inputs[2];
         mxArray*  pindex=NULL;
         const   char*   fnames[2];
         mwSize          ndim=2;
         mwSize          onebyone[2] = {1,1};
+        mxArray    *inputs[2];
+        mxArray    *pindex      = NULL;
+        const char *fnames[2];
+        mwSize      ndim        = 2;
+        mwSize      onebyone[2] = {1,1};
         //We want to call the subsasgn method, and get the returned array.This ensures that if we are running

Note: See TracChangeset for help on using the changeset viewer.