Nux

Merge lp:~brandontschaefer/nux/lp.1350101-fix into lp: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:~brandontschaefer/nux/lp.1350101-fix
Merge into: lp:nux
Prerequisite: lp:~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:~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.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
=== modified file 'Nux/InputArea.cpp'
--- Nux/InputArea.cpp 2013-11-06 13:56:07 +0000
+++ Nux/InputArea.cpp 2014-07-30 16:37:50 +0000
@@ -25,8 +25,6 @@
25#include <sigc++/functors/ptr_fun.h>25#include <sigc++/functors/ptr_fun.h>
26#include <sigc++/functors/mem_fun.h>26#include <sigc++/functors/mem_fun.h>
2727
28#include "NuxCore/Logger.h"
29
30#include "Nux.h"28#include "Nux.h"
31#include "InputArea.h"29#include "InputArea.h"
32#include "NuxGraphics/GraphicsEngine.h"30#include "NuxGraphics/GraphicsEngine.h"
@@ -38,8 +36,6 @@
3836
39namespace nux37namespace nux
40{38{
41 DECLARE_LOGGER(logger, "nux.inputarea");
42
43 NUX_IMPLEMENT_OBJECT_TYPE(InputArea);39 NUX_IMPLEMENT_OBJECT_TYPE(InputArea);
4440
45 InputArea::InputArea(NUX_FILE_LINE_DECL)41 InputArea::InputArea(NUX_FILE_LINE_DECL)
4642
=== modified file 'Nux/MainLoopGLib.cpp'
--- Nux/MainLoopGLib.cpp 2013-12-17 00:17:50 +0000
+++ Nux/MainLoopGLib.cpp 2014-07-30 16:37:50 +0000
@@ -1,6 +1,5 @@
1#include "Nux.h"1#include "Nux.h"
2#include "Layout.h"2#include "Layout.h"
3#include "NuxCore/Logger.h"
4#include "NuxGraphics/GraphicsEngine.h"3#include "NuxGraphics/GraphicsEngine.h"
5#include "ClientArea.h"4#include "ClientArea.h"
6#include "WindowCompositor.h"5#include "WindowCompositor.h"
@@ -13,8 +12,6 @@
1312
14namespace nux13namespace nux
15{14{
16 DECLARE_LOGGER(logger, "nux.windows.thread");
17
18 #if (defined(NUX_OS_LINUX) || defined(NUX_USE_GLIB_LOOP_ON_WINDOWS)) && (!defined(NUX_DISABLE_GLIB_LOOP))15 #if (defined(NUX_OS_LINUX) || defined(NUX_USE_GLIB_LOOP_ON_WINDOWS)) && (!defined(NUX_DISABLE_GLIB_LOOP))
1916
20 static GMutex *gLibEventMutex = 0;17 static GMutex *gLibEventMutex = 0;
2118
=== modified file 'Nux/WindowCompositor.cpp'
--- Nux/WindowCompositor.cpp 2013-10-30 23:22:34 +0000
+++ Nux/WindowCompositor.cpp 2014-07-30 16:37:50 +0000
@@ -1348,15 +1348,6 @@
1348 }1348 }
1349 }1349 }
13501350
1351 namespace
1352 {
1353 void AssignWeakBaseWindowMatchingRaw(WindowCompositor::WeakBaseWindowPtr const& w, BaseWindow* bw, WindowCompositor::WeakBaseWindowPtr *ptr)
1354 {
1355 if (w.IsValid() && w.GetPointer() == bw)
1356 *ptr = w;
1357 }
1358 }
1359
1360 void WindowCompositor::ForEachBaseWindow(ForEachBaseWindowFunc const& func)1351 void WindowCompositor::ForEachBaseWindow(ForEachBaseWindowFunc const& func)
1361 {1352 {
1362 for (auto const& window : _view_window_list)1353 for (auto const& window : _view_window_list)
13631354
=== modified file 'Nux/XICClient.cpp'
--- Nux/XICClient.cpp 2014-01-02 22:54:48 +0000
+++ Nux/XICClient.cpp 2014-07-30 16:37:50 +0000
@@ -21,10 +21,6 @@
2121
22#include "XICClient.h"22#include "XICClient.h"
2323
24#include "NuxCore/Logger.h"
25
26DECLARE_LOGGER(logger, "xic.client");
27
28using namespace std;24using namespace std;
2925
30namespace nux26namespace nux
3127
=== modified file 'NuxCore/Object.cpp'
--- NuxCore/Object.cpp 2012-12-08 01:03:38 +0000
+++ NuxCore/Object.cpp 2014-07-30 16:37:50 +0000
@@ -28,18 +28,6 @@
28namespace nux28namespace nux
29{29{
30DECLARE_LOGGER(logger, "nux.core.object");30DECLARE_LOGGER(logger, "nux.core.object");
31namespace
32{
33bool debug_object_allocation_stack()
34{
35 // If the extra long environment variable is set, then every object that is
36 // created will record it's backtrace during allocation. This will slow
37 // down the library, so only use for local debugging.
38 static bool extra_debugging(::getenv("NUX_DEBUG_OBJECT_ALLOCATION_STACK"));
39 return extra_debugging;
40}
41
42}
4331
44 NUX_IMPLEMENT_ROOT_OBJECT_TYPE (Trackable);32 NUX_IMPLEMENT_ROOT_OBJECT_TYPE (Trackable);
45 NUX_IMPLEMENT_OBJECT_TYPE (Object);33 NUX_IMPLEMENT_OBJECT_TYPE (Object);

Subscribers

People subscribed via source and target branches