Changeset 25507 for issm/trunk-jpl/src/c/shared/io/Marshalling/Marshalling.h

Timestamp:

09/01/20 14:46:34 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: cleanup

File:

• issm/trunk-jpl/src/c/shared/io/Marshalling/Marshalling.h (modified) (1 diff)

issm/trunk-jpl/src/c/shared/io/Marshalling/Marshalling.h

@@ -119 +119 @@
 }
 
-#define MARSHALLING_ENUM(EN)\
-        int type_enum=EN;\
-        if(marshall_direction==MARSHALLING_WRITE){\
-                memcpy(*pmarshalled_data,&type_enum,sizeof(int));\
-                *pmarshalled_data+=sizeof(int);\
-        }\
-        else if(marshall_direction==MARSHALLING_SIZE){\
-                *pmarshalled_data_size+=sizeof(int);\
-        }\
-        else if(marshall_direction==MARSHALLING_LOAD){\
-                *pmarshalled_data+=sizeof(int);\
-        }\
-        else _error_("Wrong direction during the Marshall process");\
-
-
-#define MARSHALLING(FIELD)\
-        \
-        if(marshall_direction==MARSHALLING_WRITE){\
-                memcpy(*pmarshalled_data,&FIELD,sizeof(FIELD));\
-                *pmarshalled_data+=sizeof(FIELD);\
-        }\
-        else if(marshall_direction==MARSHALLING_SIZE){\
-                *pmarshalled_data_size+=sizeof(FIELD);\
-        }\
-        else if(marshall_direction==MARSHALLING_LOAD){\
-                memcpy(&FIELD,*pmarshalled_data,sizeof(FIELD));\
-                *pmarshalled_data+=sizeof(FIELD);\
-        }\
-        else _error_("Wrong direction during the Marshall process");
-
-
-#define MARSHALLING_DYNAMIC(FIELD,TYPE,SIZE) \
-        \
-        {\
-                bool field_null=true;\
-                if (FIELD)field_null=false;\
-                MARSHALLING(field_null);\
-                \
-                if(!field_null){\
-                        if(marshall_direction==MARSHALLING_WRITE){\
-                                        memcpy(*pmarshalled_data,FIELD,SIZE*sizeof(TYPE));\
-                                        *pmarshalled_data+=SIZE*sizeof(TYPE);\
-                        }\
-                        else if(marshall_direction==MARSHALLING_SIZE){\
-                                *pmarshalled_data_size+=SIZE*sizeof(TYPE);\
-                        }\
-                        else if(marshall_direction==MARSHALLING_LOAD){\
-                                FIELD=xNew<TYPE>(SIZE);\
-                                memcpy(FIELD,*pmarshalled_data,SIZE*sizeof(TYPE));\
-                                *pmarshalled_data+=SIZE*sizeof(TYPE);\
-                        }\
-                        else _error_("Wrong direction during the Marshall process");\
-                }\
-        }
-
 #endif