Changeset 314 for trunk/src

Timestamp:

Mar 10, 2006 8:26:54 AM (18 years ago)

Author:

cxsong

Message:

added key cmp func map in serializer

Location:

trunk/src/mesh

Files:

• serializer.cc (modified) (4 diffs)
• serializer.h (modified) (1 diff)

trunk/src/mesh/serializer.cc

@@ -9 +9 @@
 {
         const char* key = obj->objectName();
+
         // add object pointer to object map
         m_objMap[key] = obj; 
@@ -105 +106 @@
 RpSerializer::getObject(const char* objectName)
 {
+#ifdef DEBUG
+                printf("RpSerializer::getObject: %s, len=%d\n", objectName,strlen(objectName));
+#endif
         typeObjMap::iterator iter = m_objMap.find(objectName);
         
@@ -271 +275 @@
         typeObjMap::iterator iter;
         for (iter = m_objMap.begin(); iter != m_objMap.end(); iter++)
-                printf("objMap: %s \t %x\n", (*iter).first, (unsigned)(*iter).second);
+                printf("objMap: %s= ptr=%x\n", (*iter).first, (unsigned)(*iter).second);
 
         typeRefCount::iterator it;
         for (it = m_refCount.begin(); it != m_refCount.end(); it++)
-                printf("count: %s \t %d\n", (*it).first, (*it).second);
+                printf("count: %s= count=%d\n", (*it).first, (*it).second);
 };
 
@@ -292 +296 @@
 
         if (header == RpGrid1d_current_version) {
-                obj = new RpGrid1d; // create new object
+                obj = new RpGrid1d(); // create new object
                 obj->deserialize(buf);
                 return obj;

trunk/src/mesh/serializer.h

@@ -62 +62 @@
         RpSerializable* createObject(std::string header, const char* buf);
 
+        struct rpStrCmp {
+                bool operator()( const char* s1, const char* s2 ) const {
+                        return strcmp( s1, s2 ) < 0;
+                }
+        };
+
 private:
-        typedef map<const char*, RpSerializable*> typeObjMap;
-        typedef map<const char*, int> typeRefCount;
+        typedef map<const char*, RpSerializable*, rpStrCmp> typeObjMap;
+        typedef map<const char*, int, rpStrCmp> typeRefCount;
 
         // archive of objects referenced by their names (e.g., output.field)