Changeset 25836 for issm/trunk/src/c/classes/Params/DataSetParam.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/DataSetParam.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/DataSetParam.cpp

@@ -52 +52 @@
 int    DataSetParam::Id(void){ return -1; }/*{{{*/
 /*}}}*/
-void DataSetParam::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
+void DataSetParam::Marshall(MarshallHandle* marshallhandle){ /*{{{*/
 
-        if(marshall_direction==MARSHALLING_BACKWARD)value=new DataSet();
+        if(marshallhandle->OperationNumber()==MARSHALLING_LOAD)value=new DataSet();
 
-        MARSHALLING_ENUM(DataSetParamEnum);
-        MARSHALLING(enum_type);
-        value->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
+        int object_enum=DataSetParamEnum;
+        marshallhandle->call(object_enum);
+        marshallhandle->call(this->enum_type);
+        value->Marshall(marshallhandle);
 
 }

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