Changeset 342 for trunk

Timestamp:

Mar 13, 2006 8:38:26 PM (18 years ago)

Author:

cxsong

Message:

added doSerialization(), removed serialization()

Location:

trunk/src/mesh

Files:

• grid2d.cc (modified) (3 diffs)
• grid2d.h (modified) (3 diffs)

trunk/src/mesh/grid2d.cc

@@ -53 +53 @@
 //      expand points and add them to m_data
 //
-RpGrid2d::RpGrid2d(DataValType x_min, DataValType x_max, int x_delta,
-                   DataValType y_min, DataValType y_max, int y_delta)
+RpGrid2d::RpGrid2d(DataValType x_min, DataValType x_max, DataValType x_delta,
+                   DataValType y_min, DataValType y_max, DataValType y_delta)
 {
         setUniformGrid(x_min, x_max, x_delta, y_min, y_max, y_delta);
@@ -60 +60 @@
 
 RP_ERROR
-RpGrid2d::setUniformGrid(DataValType x_min, DataValType x_max, int x_delta,
-                   DataValType y_min, DataValType y_max, int y_delta)
+RpGrid2d::setUniformGrid(DataValType x_min, DataValType x_max, DataValType x_delta,
+           DataValType y_min, DataValType y_max, DataValType y_delta)
 {
         // expand array, inclusive of origin and max
@@ -154 +154 @@
 }
 
-// 
-// serialize object to a byte stream
-// Output:
-//      nbytes: total number of bytes in the byte stream 
-//      return pointer to buffer holding the byte stream
-//
-char* 
-RpGrid2d::serialize(int& nbytes)
-{
-        // call base class serialize()
-        char* buf = RpGrid1d::serialize(nbytes);
-
-        // now, override the header with correct object type
-        writeRpHeader(buf, RpCurrentVersion[GRID2D], nbytes);
-
-        return buf;     
+//
+// serialization
+//
+RP_ERROR
+RpGrid2d::doSerialize(char* buf, int nbytes)
+{
+        RP_ERROR err;
+
+        // call base class doSerialize()
+        err = RpGrid1d::doSerialize(buf, nbytes);
+
+        if (err == RP_SUCCESS) {
+                // now, override the header with correct object type
+                writeRpHeader(buf, RpCurrentVersion[GRID2D], nbytes);
+        }
+
+        return err;
+
 }
 

trunk/src/mesh/grid2d.h

@@ -27 +27 @@
         // constructor - uniform 2d grid, data expanded inclusive of 
         //              origin and max
-        RpGrid2d(DataValType x_min, DataValType x_max, int x_delta,
-                 DataValType y_min, DataValType y_max, int y_delta);
+        RpGrid2d(DataValType x_min, DataValType x_max, DataValType x_delta,
+                 DataValType y_min, DataValType y_max, DataValType y_delta);
 
         // constructor - 2d rectilinear grid
@@ -43 +43 @@
         RP_ERROR addAllPoints(DataValType* points, int npoints);
 
-        RP_ERROR setUniformGrid(DataValType xmin, DataValType xmax, int xdelta,
-                                DataValType ymin, DataValType ymax, int ydelta);
+        RP_ERROR setUniformGrid(DataValType xmin, DataValType xmax, 
+                        DataValType xdelta,
+                        DataValType ymin, DataValType ymax, DataValType ydelta);
 
         // add points of a rectilinear grid
@@ -59 +60 @@
 
         // serialize data 
-        virtual char * serialize(int& nbytes);
+        //virtual char * serialize(int& nbytes);
+        virtual RP_ERROR doSerialize(char* buf, int nbytes);
+
         virtual RP_ERROR deserialize(const char* buf);