Changeset 25836 for issm/trunk/src/c/kml/KML_MultiGeometry.h

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/kml/KML_MultiGeometry.h (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/kml/KML_MultiGeometry.h

@@ -34 +34 @@
                 int   ObjectEnum(){_error_("Not implemented yet.");};
                 Object* copy(){_error_("Not implemented yet.");};
-                void Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ _error_("not implemented yet!");};
+                void Marshall(MarshallHandle* marshallhandle){ _error_("not implemented yet!");};
                 /*}}}*/
 

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