version 1.1.2.6, 2009/12/04 13:57:19
|
version 1.1.2.8, 2009/12/10 11:32:44
|
|
|
Uint32 SCMOStreamer::_appendToClassTable(const SCMOInstance& inst) | Uint32 SCMOStreamer::_appendToClassTable(const SCMOInstance& inst) |
{ | { |
Uint32 clsTableSize = _classTable.size(); | Uint32 clsTableSize = _classTable.size(); |
SCMBClass_Main* clsPtr = inst.inst.hdr->theClass->cls.hdr; |
SCMBClass_Main* clsPtr = inst.inst.hdr->theClass.ptr->cls.hdr; |
| |
const SCMBClass_Main* const* clsArray = _classTable.getData(); | const SCMBClass_Main* const* clsArray = _classTable.getData(); |
| |
|
|
out.putUint64(size); | out.putUint64(size); |
| |
// Write class data | // Write class data |
out.putBytes(clsArray[x],size); |
out.putBytes(clsArray[x],(size_t)size); |
} | } |
| |
} | } |
|
|
} | } |
| |
// Read class data | // Read class data |
SCMBClass_Main* scmbClassPtr = (SCMBClass_Main*)malloc(size); |
SCMBClass_Main* scmbClassPtr = (SCMBClass_Main*)malloc((size_t)size); |
if (0 == scmbClassPtr) | if (0 == scmbClassPtr) |
{ | { |
// Not enough memory! | // Not enough memory! |
throw PEGASUS_STD(bad_alloc)(); | throw PEGASUS_STD(bad_alloc)(); |
} | } |
| |
if (!in.getBytes(scmbClassPtr,size)) |
if (!in.getBytes(scmbClassPtr,(size_t)size)) |
{ | { |
return false; | return false; |
} | } |
|
|
_buf.putUint64(size); | _buf.putUint64(size); |
| |
// Write class data | // Write class data |
_buf.putBytes(instPtr,size); |
_buf.putBytes(instPtr,(size_t)size); |
} | } |
} | } |
| |
|
|
// updates without reallocation | // updates without reallocation |
| |
// Read instance data | // Read instance data |
SCMBInstance_Main* scmbInstPtr = (SCMBInstance_Main*)malloc(size+64); |
SCMBInstance_Main* scmbInstPtr = |
|
(SCMBInstance_Main*)malloc((size_t)size+64); |
if (0 == scmbInstPtr) | if (0 == scmbInstPtr) |
{ | { |
// Not enough memory! | // Not enough memory! |
throw PEGASUS_STD(bad_alloc)(); | throw PEGASUS_STD(bad_alloc)(); |
} | } |
| |
if(!_buf.getBytes(scmbInstPtr,size)) |
if(!_buf.getBytes(scmbInstPtr,(size_t)size)) |
{ | { |
return false; | return false; |
} | } |
|
|
scmbInstPtr->header.totalSize = size+64; | scmbInstPtr->header.totalSize = size+64; |
scmbInstPtr->header.freeBytes = 64; | scmbInstPtr->header.freeBytes = 64; |
scmbInstPtr->refCount.set(0); | scmbInstPtr->refCount.set(0); |
scmbInstPtr->theClass = |
scmbInstPtr->theClass.ptr = |
new SCMOClass((SCMBClass_Main*)clsArray[instArray[x].index]); | new SCMOClass((SCMBClass_Main*)clsArray[instArray[x].index]); |
| |
SCMOInstance* scmoInstPtr = new SCMOInstance(scmbInstPtr); | SCMOInstance* scmoInstPtr = new SCMOInstance(scmbInstPtr); |