Changeset 3396

Timestamp:

04/05/10 13:36:05 (15 years ago)

Author:

seroussi

Message:

need to recover enum_type for Hook and ElementProperties as they are not called by dataset

Location:

issm/trunk/src/c/objects

Files:

• ElementProperties.cpp (modified) (1 diff)
• Hook.cpp (modified) (1 diff)

issm/trunk/src/c/objects/ElementProperties.cpp

@@ -265 +265 @@
         char* marshalled_dataset=NULL;
         int   nonnill=0;
+        int   enum_type;
 
         /*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):*/
+        /* Recover enum_type as ElementProperties is not directly called by dataset */
+        memcpy(&enum_type,marshalled_dataset,sizeof(int)); marshalled_dataset+=sizeof(int);
 
         memcpy(&numnodes,marshalled_dataset,sizeof(numnodes));marshalled_dataset+=sizeof(numnodes);

issm/trunk/src/c/objects/Hook.cpp

@@ -141 +141 @@
         char* marshalled_dataset=NULL;
         int   i;
+        int   enum_type;
 
         /*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):*/
+        /*get enum type of object since Hook is not directly called by DataSet: */
+        memcpy(&enum_type,marshalled_dataset,sizeof(int)); marshalled_dataset+=sizeof(int);
 
         memcpy(&num,marshalled_dataset,sizeof(num));marshalled_dataset+=sizeof(num);