Merge lp:~michihenning/unity-scopes-api/fix-arm-build-warning into lp:unity-scopes-api

[Michi Henning]

Suppressed warning for arm build and updated comment regarding alignment.

Suppressed warning for arm build and updated comment regarding alignment.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:304
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/570/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/97/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/95
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/95/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/96/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/570/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:304
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/571/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/98/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/96
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/96/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/97/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/571/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:304
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/572/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/103/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/97
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/97/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/98/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/572/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:304
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/573/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/98
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/98/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/99

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/573/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

Ok

review: Approve

=== modified file 'src/scopes/internal/zmq_middleware/ZmqReceiver.cpp'
--- src/scopes/internal/zmq_middleware/ZmqReceiver.cpp	2014-01-07 12:22:29 +0000
+++ src/scopes/internal/zmq_middleware/ZmqReceiver.cpp	2015-02-10 05:31:32 +0000
@@ -71,13 +71,15 @@
         if (reinterpret_cast<uintptr_t>(buf) % sizeof(capnp::word) == 0)
         {
             // String buffer is word-aligned, point directly at the start of the string.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-align"
             segments_.push_back(kj::ArrayPtr<capnp::word const>(reinterpret_cast<capnp::word const*>(buf), num_words));
+#pragma GCC diagnostic pop
         }
         else
         {
-            // No coverage here because std::string appears to always have its buffer word-aligned.
-            // Because the standard doesn't guarantee this though, and it might change in the future,
-            // the code below remains enabled.
+            // No coverage here because, on amd64, std::string has its buffer word-aligned but,
+            // on armhf, capnp::word is 8-byte aligned and the string buffer is 4-byte aligned.
             //
             // String buffer is not word-aligned, make a copy and point at that.
             unique_ptr<capnp::word[]> words(new capnp::word[num_words]);                    // LCOV_EXCL_LINE