diff options
author | Kim van der Riet <kpvdr@apache.org> | 2012-08-30 18:02:19 +0000 |
---|---|---|
committer | Kim van der Riet <kpvdr@apache.org> | 2012-08-30 18:02:19 +0000 |
commit | 0f327ee25b5ab4b9a38a8620a666e6bfc66000e7 (patch) | |
tree | 2a4fa70079009ece6f889bbdde86dd7721a54413 /cpp/src/tests | |
parent | 3c029508e940ac5308a7b2369fba074480a0d12d (diff) | |
download | qpid-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/tests')
-rw-r--r-- | cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp | 2 | ||||
-rw-r--r-- | cpp/src/tests/storePerftools/asyncPerf/PerfTest.h | 2 | ||||
-rw-r--r-- | cpp/src/tests/storePerftools/jrnlPerf/Journal.cpp | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp index fadc531150..85dd7fa715 100644 --- a/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp +++ b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp @@ -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() { diff --git a/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h index 0e45bae4aa..edb913fc72 100644 --- a/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h +++ b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h @@ -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; diff --git a/cpp/src/tests/storePerftools/jrnlPerf/Journal.cpp b/cpp/src/tests/storePerftools/jrnlPerf/Journal.cpp index 8207249600..22ba509ef5 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" |