Author: kpvdr
Date: Thu Aug 30 18:02:19 2012
New Revision: 1379040
URL: http://svn.apache.org/viewvc?rev=1379040&view=rev
Log:
NO-JIRA: Minor updates which allow gcc 4.7 to compile
Modified:
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h
qpid/branches/asyncstore/cpp/src/tests/storePerftools/jrnlPerf/Journal.cpp
Modified:
qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp?rev=1379040&r1=1379039&r2=1379040&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp
(original)
+++ qpid/branches/asyncstore/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp Thu
Aug 30 18:02:19 2012
@@ -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;
Modified:
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp?rev=1379040&r1=1379039&r2=1379040&view=diff
==============================================================================
---
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp
(original)
+++
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp
Thu Aug 30 18:02:19 2012
@@ -50,7 +50,7 @@ PerfTest::PerfTest(const TestOptions& to
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() {
Modified:
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h
URL:
http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h?rev=1379040&r1=1379039&r2=1379040&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h
(original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h
Thu Aug 30 18:02:19 2012
@@ -68,7 +68,7 @@ private:
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;
Modified:
qpid/branches/asyncstore/cpp/src/tests/storePerftools/jrnlPerf/Journal.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/jrnlPerf/Journal.cpp?rev=1379040&r1=1379039&r2=1379040&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/jrnlPerf/Journal.cpp
(original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/jrnlPerf/Journal.cpp
Thu Aug 30 18:02:19 2012
@@ -22,6 +22,7 @@
*/
#include "Journal.h"
+#include <unistd.h> // ::usleep()
#ifdef JOURNAL2
# include "qpid/asyncStore/jrnl2/DataToken.h"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
