Changeset 20500 for issm/trunk/src/c/classes/Params/StringParam.cpp

Timestamp:

04/12/16 21:32:01 (9 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 20497

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c/classes/Params/StringParam.cpp (modified) (1 diff)

issm/trunk

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

issm/trunk/src/c/classes/Params/StringParam.cpp

@@ -56 +56 @@
 }
 /*}}}*/
+void StringParam::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
+
+        int size;
+
+        if(marshall_direction==MARSHALLING_FORWARD || marshall_direction == MARSHALLING_SIZE)size=strlen(value)+1;
+        
+        MARSHALLING_ENUM(StringParamEnum);
+        MARSHALLING(enum_type);
+        MARSHALLING(size);
+        MARSHALLING_DYNAMIC(value,char,size);
+
+}
+/*}}}*/
 
 /*StringParam virtual functions definitions: */

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad