Context Navigation

synchronisable

Timestamp:

Dec 23, 2008, 11:09:55 PM (16 years ago)

Author:

rgrieder

Message:

Merged revision 2371 to bugger branch.

Location:

code/branches/bugger

Files:

code/branches/bugger
- Property svn:mergeinfo changed
  /code/branches/network (added) merged: 2356
  /code/branches/network64 (added) merged: 2210-2211,2245-2247,2255,2307,2309-2312,2316,2355

-                      r2371
+                      r2531
+#ifndef NDEBUG
+    ObjectList<Synchronisable>::iterator it;
+    for(it = ObjectList<Synchronisable>::begin(); it!=ObjectList<Synchronisable>::end(); ++it){
+      if( it->getObjectID()==this->objectID )
+        assert(*it==this || (it->objectID==OBJECTID_UNKNOWN && it->objectMode_==0x0));
+    }
+#endif
+//#ifndef NDEBUG
+//    ObjectList<Synchronisable>::iterator it;
+//    for(it = ObjectList<Synchronisable>::begin(); it!=ObjectList<Synchronisable>::end(); ++it){
+//        if(!(*it==this || (it->objectID==OBJECTID_UNKNOWN && it->objectMode_==0x0)))
+//        {
+//            COUT(1) << "Assertion failed: *it==this || (it->objectID==OBJECTID_UNKNOWN && it->objectMode_==0x0)" << std::endl;
+//            COUT(1) << "Possible reason for this error: Client created a synchronized object without the Server's approval." << std::endl;
+//            abort();
+//        }
+//    }
+//#endif
     this->creatorID = OBJECTID_UNKNOWN;
 …
     Identifier* id = ClassByID(header->classID);
+    if (!id)
+    {
+        COUT(1) << "Assertion failed: id" << std::endl;
+        COUT(1) << "Possible reason for this error: Client received a synchronizable object whose class has no factory." << std::endl;
+        abort();
+    }
     assert(id);
     BaseObject* creator = 0;

-                      r2371
+                      r2531
     static uint32_t popDeletedObject(){ uint32_t i = deletedObjects_.front(); deletedObjects_.pop(); return i; }
     inline uint32_t getObjectID(){return objectID;}
     inline unsigned int getCreatorID(){return creatorID;}
     inline uint32_t getClassID(){return classID;}
     inline unsigned int getPriority(){ return objectFrequency_;}
+    inline uint32_t getObjectID() const {return objectID;}
+    inline unsigned int getCreatorID() const {return creatorID;}
+    inline uint32_t getClassID() const {return classID;}
+    inline unsigned int getPriority() const { return objectFrequency_;}
   protected:

Note: See TracChangeset for help on using the changeset viewer.

/code/branches/network (added)	merged: 2356
/code/branches/network64 (added)	merged: 2210-2211,2245-2247,2255,2307,2309-2312,2316,2355