Changeset 11237 for issm/trunk/src/c/objects/Params/IntMatParam.h

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:

• . (modified) (2 props)
• src/c/objects/Params/IntMatParam.h (modified) (1 diff)

issm/trunk

@@ +1 @@
+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

@@ +1 @@
+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

issm/trunk/src/c/objects/Params/IntMatParam.h

@@ -82 +82 @@
                 void  UnitConversion(int direction_enum);
 
-                char* GetParameterName(void);
+                void GetParameterName(char**pname);
                 #ifdef _SERIAL_
                 void  SetMatlabField(mxArray* dataref);

@@ +1 @@
+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