Changeset 25836 for issm/trunk/src/c/classes/Params/StringArrayParam.cpp

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/classes/Params/StringArrayParam.cpp (modified) (1 diff)

issm/trunk/src/c

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post

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

@@ -73 +73 @@
 int    StringArrayParam::Id(void){ return -1; }/*{{{*/
 /*}}}*/
-void StringArrayParam::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
+void StringArrayParam::Marshall(MarshallHandle* marshallhandle){ /*{{{*/
 
-        int* sizes=NULL;
+        int object_enum = StringArrayParamEnum;
+   marshallhandle->call(object_enum);
 
-        if(marshall_direction==MARSHALLING_FORWARD || marshall_direction==MARSHALLING_SIZE){
-                if(numstrings)sizes=xNew<int>(numstrings);
-                for(int i=0;i<numstrings;i++)sizes[i]=strlen(value[i])+1;
-        }       
+        marshallhandle->call(this->enum_type);
+        marshallhandle->call(this->numstrings);
 
-        MARSHALLING_ENUM(StringArrayParamEnum);
-
-        MARSHALLING(enum_type);
-        MARSHALLING(numstrings);
-
-        if(numstrings){
-                MARSHALLING_DYNAMIC(sizes,int,numstrings);
-                if(marshall_direction==MARSHALLING_BACKWARD) value=xNew<char*>(numstrings);
-                for(int i=0;i<numstrings;i++)MARSHALLING_DYNAMIC(value[i],char,sizes[i]);
+        if(this->numstrings){
+                if(marshallhandle->OperationNumber()==MARSHALLING_LOAD){
+                        this->value=xNew<char*>(this->numstrings);
+                }
+                for(int i=0;i<numstrings;i++){
+                        marshallhandle->call(this->value[i]);
+                }
         }
-        else value=NULL;
-
-        //cleanup sizes array
-        if(sizes) xDelete<int>(sizes);
-
+        else{
+                this->value=NULL;
+        }
 }
 /*}}}*/

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post