Nux

Merge lp://qastaging/~brandontschaefer/nux/lp.1350101-fix into lp://qastaging/nux

  1. lp.1350101-fix
  2. Merge into trunk
Proposed by Brandon Schaefer
Status: Merged
Approved by: Stephen M. Webb
Approved revision: 846
Merged at revision: 849
Proposed branch: lp://qastaging/~brandontschaefer/nux/lp.1350101-fix
Merge into: lp://qastaging/nux
Prerequisite: lp://qastaging/~townsend/nux/fix-lp1342896
Diff against target: 99 lines (+0/-32)
5 files modified
Nux/InputArea.cpp (+0/-4)
Nux/MainLoopGLib.cpp (+0/-3)
Nux/WindowCompositor.cpp (+0/-9)
Nux/XICClient.cpp (+0/-4)
NuxCore/Object.cpp (+0/-12)
To merge this branch: bzr merge lp://qastaging/~brandontschaefer/nux/lp.1350101-fix
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Stephen M. Webb (community) Approve
Review via email: mp+228898@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2014-07-30.

Commit message

Fixes FTBFS. Remove unused functions. This seems to be brought up only in gcc/g++ 4.9.

Description of the change

Fixes FTBFS. Remove unused functions. This seems to be brought up only in gcc/g++ 4.9.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:846
http://jenkins.qa.ubuntu.com/job/nux-ci/111/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-utopic-amd64-ci/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-utopic-armhf-ci/4
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-utopic-i386-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/nux-ci/111/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Stephen M. Webb (bregma) wrote : Posted in a previous version of this proposal

NOTE: needs lp:~townsend/nux/fix-lp1342896 as a prerequisite.

Fixes build failures by removing dead code. Approved.

review: Approve
Revision history for this message
Stephen M. Webb (bregma) wrote :

Re-approving resubmission: I'll wait for Jenkins to chime in before top-approving.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:846
http://jenkins.qa.ubuntu.com/job/nux-ci/113/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-utopic-amd64-ci/6/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-utopic-armhf-ci/6
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-utopic-i386-ci/6/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/nux-ci/113/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches