Merge lp:~vanvugt/compiz/fix-1075048 into lp:compiz/0.9.9

Proposed by Daniel van Vugt
Status: Merged
Approved by: Sam Spilsbury
Approved revision: 3448
Merged at revision: 3454
Proposed branch: lp:~vanvugt/compiz/fix-1075048
Merge into: lp:compiz/0.9.9
Diff against target: 18 lines (+4/-1)
1 file modified
compizconfig/libcompizconfig/tests/compizconfig_test_ccs_object.cpp (+4/-1)
To merge this branch: bzr merge lp:~vanvugt/compiz/fix-1075048
Reviewer Review Type Date Requested Status
Sam Spilsbury Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+132842@code.launchpad.net

Commit message

Fix warning/error about an unused expression, which breaks the build when
using clang (LP: #1075048)

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
Sam Spilsbury (smspillaz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'compizconfig/libcompizconfig/tests/compizconfig_test_ccs_object.cpp'
2--- compizconfig/libcompizconfig/tests/compizconfig_test_ccs_object.cpp 2012-10-26 11:53:45 +0000
3+++ compizconfig/libcompizconfig/tests/compizconfig_test_ccs_object.cpp 2012-11-05 07:05:22 +0000
4@@ -119,10 +119,13 @@
5
6 ccsObjectInit (to, &ccsDefaultObjectAllocator);
7 ccsObjectAddInterface (to, reinterpret_cast <const CCSInterface *> (&SomeDummyInterface), CCS_INTERFACE_TYPE_DUMMY);
8+
9+ Dummy2Interface *i = NULL;
10 ASSERT_DEATH ({
11- GET_INTERFACE (Dummy2Interface, to);
12+ i = GET_INTERFACE (Dummy2Interface, to);
13 },
14 "Unable to find interface type*");
15+ EXPECT_EQ (NULL, i); // Avoid warnings/errors about i being unused.
16
17 ccsObjectRemoveInterface (to, CCS_INTERFACE_TYPE_DUMMY);
18 free (to);

Subscribers

People subscribed via source and target branches