template <typename T>
inline T* ReadOwnedPtr() {
unsigned PtrId = ReadInt();
+
+ if (PtrId == 0)
+ return NULL;
+
T* x = SerializeTrait<T>::Materialize(*this);
RegisterPtr(PtrId,x);
return x;
template <typename T>
void EmitOwnedPtr(T* ptr) {
EmitPtr(ptr);
- SerializeTrait<T>::Emit(*this,*ptr);
+ if (ptr) SerializeTrait<T>::Emit(*this,*ptr);
}
void Flush() { if (inRecord()) EmitRecord(); }
void Deserializer::ReadPtr(void*& PtrRef) {
unsigned PtrId = ReadInt();
+ if (PtrId == 0) {
+ PtrRef = NULL;
+ return;
+ }
+
BPatchEntry& E = BPatchMap[PtrId];
if (E.Ptr == NULL) {
}
unsigned Serializer::getPtrId(void* ptr) {
+ if (!ptr)
+ return 0;
+
MapTy::iterator I = PtrMap.find(ptr);
if (I == PtrMap.end()) {
- unsigned id = PtrMap.size();
+ unsigned id = PtrMap.size()+1;
PtrMap[ptr] = id;
return id;
}