diff options
| author | Gordon Sim <gsim@apache.org> | 2013-08-06 15:58:06 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2013-08-06 15:58:06 +0000 |
| commit | 019bfab57680b3b2e65bda40aed3ddaf9d6024b1 (patch) | |
| tree | 5226ae948ce04d9aa967093e4cbbb7a6d766068f | |
| parent | 59a3dc87c224373e83a6a35cdbfb85fa4bab67e4 (diff) | |
| download | qpid-python-019bfab57680b3b2e65bda40aed3ddaf9d6024b1.tar.gz | |
QPID-5042: use more protable encode and decode
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1511013 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | cpp/src/qpid/broker/PagedQueue.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/qpid/broker/PagedQueue.cpp b/cpp/src/qpid/broker/PagedQueue.cpp index 9bce28061a..e11be471c0 100644 --- a/cpp/src/qpid/broker/PagedQueue.cpp +++ b/cpp/src/qpid/broker/PagedQueue.cpp @@ -295,7 +295,8 @@ void PagedQueue::Page::load(MemoryMappedFile& file, ProtocolRegistry& protocols) bool haveData = used > 0; used = 4;//first 4 bytes are the count if (haveData) { - uint32_t count = *(reinterpret_cast<uint32_t*>(region)); + qpid::framing::Buffer buffer(region, sizeof(uint32_t)); + uint32_t count = buffer.getLong(); //decode messages into Page::messages for (size_t i = 0; i < count; ++i) { Message message; @@ -331,7 +332,8 @@ void PagedQueue::Page::unload(MemoryMappedFile& file) if (i->getState() == ACQUIRED) acquired.add(i->getSequence()); } uint32_t count = messages.size(); - ::memcpy(region, &count, sizeof(count)); + qpid::framing::Buffer buffer(region, sizeof(uint32_t)); + buffer.putLong(count); file.flush(region, size); file.unmap(region, size); //remove messages from memory |