Merge lp:~dobey/unity-scope-click/gcc5-fixes into lp:unity-scope-click

Proposed by dobey
Status: Merged
Approved by: Charles Kerr
Approved revision: 357
Merged at revision: 357
Proposed branch: lp:~dobey/unity-scope-click/gcc5-fixes
Merge into: lp:unity-scope-click
Diff against target: 12 lines (+1/-1)
1 file modified
scope/tests/test_query.cpp (+1/-1)
To merge this branch: bzr merge lp:~dobey/unity-scope-click/gcc5-fixes
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+266569@code.launchpad.net

Commit message

Fix new warning from GCC 5 about left hand not operator.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

heh.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scope/tests/test_query.cpp'
2--- scope/tests/test_query.cpp 2015-04-14 20:43:12 +0000
3+++ scope/tests/test_query.cpp 2015-07-31 14:28:39 +0000
4@@ -506,7 +506,7 @@
5 ASSERT_EQ(unsetenv(Configuration::PURCHASES_ENVVAR), 0);
6 }
7
8-MATCHER_P(HasAttributes, b, "") { return !arg["attributes"].is_null() == b; }
9+MATCHER_P(HasAttributes, b, "") { return (!arg["attributes"].is_null()) == b; }
10
11 TEST(QueryTest, testPushPackagePushesAttributes)
12 {

Subscribers

People subscribed via source and target branches

to all changes: