Changeset 11527 for issm/trunk/src/mex/ControlInputSetGradient/ControlInputSetGradient.h

Timestamp:

02/24/12 08:12:47 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 11526

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src/mex (modified) (1 prop)
• src/mex/ControlInputSetGradient/ControlInputSetGradient.h (modified) (2 diffs)

issm/trunk/src/mex

@@ -4 +4 @@
 *.mexa64
 .deps
+*.exe
+*.exp
+*.lib
+*.obj
+*.mexw64
+*.mexw64.manifest
+*.mexw64.map
+*.mexw32
+*.mexw32.manifest
+*.mexw32.map
+*.exe.manifest

@@ -4 +4 @@
 *.mexa64
 .deps
+*.exe
+*.exp
+*.lib
+*.obj
+*.mexw64
+*.mexw64.manifest
+*.mexw64.map
+*.mexw32
+*.mexw32.manifest
+*.mexw32.map
+*.exe.manifest

issm/trunk/src/mex/ControlInputSetGradient/ControlInputSetGradient.h

@@ -24 +24 @@
 #define MATERIALSIN (mxArray*)prhs[4]
 #define PARAMETERSIN (mxArray*)prhs[5]
-#define CONTROLTYPE (mxArray*)prhs[6]
-#define GRADIENT (mxArray*)prhs[7]
+#define GRADIENT (mxArray*)prhs[6]
 
 /* serial output macros: */
@@ -39 +38 @@
 #define NLHS  6
 #undef NRHS
-#define NRHS  8
+#define NRHS  7
 
 #endif

@@ -4 +4 @@
 *.mexa64
 .deps
+*.exe
+*.exp
+*.lib
+*.obj
+*.mexw64
+*.mexw64.manifest
+*.mexw64.map
+*.mexw32
+*.mexw32.manifest
+*.mexw32.map
+*.exe.manifest