summaryrefslogtreecommitdiff
path: root/cpp/src/qpid
diff options
context:
space:
mode:
authorKim van der Riet <kpvdr@apache.org>2012-08-30 18:02:19 +0000
committerKim van der Riet <kpvdr@apache.org>2012-08-30 18:02:19 +0000
commit0f327ee25b5ab4b9a38a8620a666e6bfc66000e7 (patch)
tree2a4fa70079009ece6f889bbdde86dd7721a54413 /cpp/src/qpid
parent3c029508e940ac5308a7b2369fba074480a0d12d (diff)
downloadqpid-python-0f327ee25b5ab4b9a38a8620a666e6bfc66000e7.tar.gz
NO-JIRA: Minor updates which allow gcc 4.7 to compile
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1379040 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid')
-rw-r--r--cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp b/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp
index 2d4a487791..0f578cfa79 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp
@@ -97,9 +97,9 @@ RecordHeader::getHeaderSize() {
uint32_t
RecordHeader::getCheckSum(uint32_t initialValue) const {
uint32_t cs = initialValue;
- for (unsigned char* p = (unsigned char*)this;
- p < (unsigned char*)this + getHeaderSize() + getBodySize();
- p++) {
+ for (unsigned char const * p = reinterpret_cast<unsigned char const *>(this);
+ p < reinterpret_cast<unsigned char const *>(this) + getHeaderSize() + getBodySize();
+ p++) {
cs ^= (uint32_t)(*p);
bool carry = cs & uint32_t(0x80000000);
cs <<= 1;