Changeset 12330 for issm/trunk/src/c/objects/Loads/Penpair.h

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/Loads/Penpair.h (modified) (1 diff)

issm/trunk/src/c/objects/Loads/Penpair.h

@@ -37 +37 @@
                 int   Id(); 
                 int   MyRank();
-                #ifdef _SERIAL_
-                void  Marshall(char** pmarshalled_dataset);
-                int   MarshallSize();
-                void  Demarshall(char** pmarshalled_dataset);
-                #endif
                 int   ObjectEnum();
                 Object* copy();