Changeset 12330 for issm/trunk/src/c/objects/Inputs/DoubleInput.cpp

Timestamp:

06/01/12 17:26:03 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 12326M

File:

• issm/trunk/src/c/objects/Inputs/DoubleInput.cpp (modified) (3 diffs)

issm/trunk/src/c/objects/Inputs/DoubleInput.cpp

@@ -59 +59 @@
 }
 /*}}}*/
-#ifdef _SERIAL_
-/*FUNCTION DoubleInput::Marshall{{{1*/
-void  DoubleInput::Marshall(char** pmarshalled_dataset){
-
-        char* marshalled_dataset=NULL;
-        int   enum_value=0;
-
-        /*recover marshalled_dataset: */
-        marshalled_dataset=*pmarshalled_dataset;
-
-        /*get enum value of DoubleInput: */
-        enum_value=DoubleInputEnum;
-        
-        /*marshall enum: */
-        memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value);
-        
-        /*marshall DoubleInput data: */
-        memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type);
-        memcpy(marshalled_dataset,&value,sizeof(value));marshalled_dataset+=sizeof(value);
-
-        *pmarshalled_dataset=marshalled_dataset;
-}
-/*}}}*/
-/*FUNCTION DoubleInput::MarshallSize{{{1*/
-int   DoubleInput::MarshallSize(){
-        
-        return sizeof(value)+
-                +sizeof(enum_type)+
-                +sizeof(int); //sizeof(int) for enum value
-}
-/*}}}*/
-/*FUNCTION DoubleInput::Demarshall{{{1*/
-void  DoubleInput::Demarshall(char** pmarshalled_dataset){
-
-        char* marshalled_dataset=NULL;
-        int   i;
-
-        /*recover marshalled_dataset: */
-        marshalled_dataset=*pmarshalled_dataset;
-
-        /*this time, no need to get enum type, the pointer directly points to the beginning of the 
-         *object data (thanks to DataSet::Demarshall):*/
-        memcpy(&enum_type,marshalled_dataset,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type);
-        memcpy(&value,marshalled_dataset,sizeof(value));marshalled_dataset+=sizeof(value);
-
-        /*return: */
-        *pmarshalled_dataset=marshalled_dataset;
-        return;
-}
-/*}}}*/
-#endif
 /*FUNCTION DoubleInput::ObjectEnum{{{1*/
 int DoubleInput::ObjectEnum(void){
@@ -159 +108 @@
 /*FUNCTION DoubleInput::GetInputValue(bool* pvalue) {{{1*/
 void DoubleInput::GetInputValue(bool* pvalue){
-#ifdef _SERIAL_
-        *pvalue=(bool)value;
-#else
         _error_("Double input of enum %s cannot return a boolean",EnumToStringx(enum_type));
-#endif
 
 }
@@ -169 +114 @@
 /*FUNCTION DoubleInput::GetInputValue(int* pvalue){{{1*/
 void DoubleInput::GetInputValue(int* pvalue){
-#ifdef _SERIAL_
-        *pvalue=(int)value;
-#else
         _error_("Double input of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));
-#endif
 
 }