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
diff --git a/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp b/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp
index 2d4a487..0f578cf 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp
@@ -97,9 +97,9 @@
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;
diff --git a/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp
index fadc531..85dd7fa 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp
+++ b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp
@@ -50,7 +50,7 @@
m_resultQueue(m_poller),
m_store(0)
{
- std::memset((void*)m_msgData, 0, (size_t)to.m_msgSize);
+ std::memset(m_msgData, 0, (size_t)to.m_msgSize);
}
PerfTest::~PerfTest() {
diff --git a/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h
index 0e45bae..edb913f 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h
@@ -68,7 +68,7 @@
const qpid::asyncStore::AsyncStoreOptions& m_storeOpts;
TestResult m_testResult;
qpid::framing::FieldTable m_queueArgs;
- const char* m_msgData;
+ char* m_msgData;
boost::shared_ptr<qpid::sys::Poller> m_poller;
qpid::sys::Thread m_pollingThread;
qpid::broker::AsyncResultQueueImpl m_resultQueue;
diff --git a/cpp/src/tests/storePerftools/jrnlPerf/Journal.cpp b/cpp/src/tests/storePerftools/jrnlPerf/Journal.cpp
index 8207249..22ba509 100644
--- a/cpp/src/tests/storePerftools/jrnlPerf/Journal.cpp
+++ b/cpp/src/tests/storePerftools/jrnlPerf/Journal.cpp
@@ -22,6 +22,7 @@
*/
#include "Journal.h"
+#include <unistd.h> // ::usleep()
#ifdef JOURNAL2
# include "qpid/asyncStore/jrnl2/DataToken.h"
