summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2011-05-09 19:56:20 +0000
committerAndrew Stitcher <astitcher@apache.org>2011-05-09 19:56:20 +0000
commit7bfe51aa2850d8f3623fb439caa8ce123aba0a4e (patch)
tree2f0b342660e753111b429af17d525346aef4a531
parent35f91f5e74abfc0c0214e5d7eaf1bad69405801b (diff)
downloadqpid-python-7bfe51aa2850d8f3623fb439caa8ce123aba0a4e.tar.gz
QPID-3004: Get Clang to compile qpid c++
- Avoid pointer alignment conversion error by using union instead git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1101184 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qmf/engine/SchemaImpl.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/qpid/cpp/src/qmf/engine/SchemaImpl.cpp b/qpid/cpp/src/qmf/engine/SchemaImpl.cpp
index e0948a9911..f75663e131 100644
--- a/qpid/cpp/src/qmf/engine/SchemaImpl.cpp
+++ b/qpid/cpp/src/qmf/engine/SchemaImpl.cpp
@@ -55,9 +55,12 @@ void SchemaHash::update(uint8_t data)
void SchemaHash::update(const char* data, uint32_t len)
{
- uint64_t* first = (uint64_t*) hash;
- uint64_t* second = (uint64_t*) hash + 1;
-
+ union h {
+ uint8_t b[16];
+ uint64_t q[2];
+ }* h = reinterpret_cast<union h*>(&hash[0]);
+ uint64_t* first = &h->q[0];
+ uint64_t* second = &h->q[1];
for (uint32_t idx = 0; idx < len; idx++) {
*first = *first ^ (uint64_t) data[idx];
*second = *second << 1;