Merge lp:~raof/mir/fix-clanger into lp:~mir-team/mir/trunk

[Chris Halse Rogers]

Fix clearly-broken code, for which clang produced deliberately broken output

Fix unit-tests when built with clang.

Actually, this also fixes unit-tests when built with g++, but
we obviously never actually checked the return value from
property_get().

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:807
http://jenkins.qa.ubuntu.com/job/mir-ci/900/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1152/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1037
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/138
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/138/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/545

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/900/rebuild

review: Needs Fixing (continuous-integration)

[Robert Ancell (robert-ancell)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:807
http://jenkins.qa.ubuntu.com/job/mir-ci/901/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1038
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/139
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/139/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/546

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/901/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

=== modified file '3rd_party/android-deps/std/properties.h'
--- 3rd_party/android-deps/std/properties.h	2013-03-13 04:54:15 +0000
+++ 3rd_party/android-deps/std/properties.h	2013-07-04 06:14:26 +0000
@@ -42,6 +42,7 @@
         value[0] = '\0';
         len = 0;
     }
+    return len;
 }
 }