Nux

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

Proposed by Brandon Schaefer on 2014-07-30
Status: Merged
Approved by: Stephen M. Webb on 2014-07-30
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 2014-07-30 Needs Fixing on 2014-07-30
Stephen M. Webb (community) 2014-07-30 Approve on 2014-07-30
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.
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
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
Stephen M. Webb (bregma) wrote :

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

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Nux/InputArea.cpp'
2--- Nux/InputArea.cpp 2013-11-06 13:56:07 +0000
3+++ Nux/InputArea.cpp 2014-07-30 16:37:50 +0000
4@@ -25,8 +25,6 @@
5 #include <sigc++/functors/ptr_fun.h>
6 #include <sigc++/functors/mem_fun.h>
7
8-#include "NuxCore/Logger.h"
9-
10 #include "Nux.h"
11 #include "InputArea.h"
12 #include "NuxGraphics/GraphicsEngine.h"
13@@ -38,8 +36,6 @@
14
15 namespace nux
16 {
17- DECLARE_LOGGER(logger, "nux.inputarea");
18-
19 NUX_IMPLEMENT_OBJECT_TYPE(InputArea);
20
21 InputArea::InputArea(NUX_FILE_LINE_DECL)
22
23=== modified file 'Nux/MainLoopGLib.cpp'
24--- Nux/MainLoopGLib.cpp 2013-12-17 00:17:50 +0000
25+++ Nux/MainLoopGLib.cpp 2014-07-30 16:37:50 +0000
26@@ -1,6 +1,5 @@
27 #include "Nux.h"
28 #include "Layout.h"
29-#include "NuxCore/Logger.h"
30 #include "NuxGraphics/GraphicsEngine.h"
31 #include "ClientArea.h"
32 #include "WindowCompositor.h"
33@@ -13,8 +12,6 @@
34
35 namespace nux
36 {
37- DECLARE_LOGGER(logger, "nux.windows.thread");
38-
39 #if (defined(NUX_OS_LINUX) || defined(NUX_USE_GLIB_LOOP_ON_WINDOWS)) && (!defined(NUX_DISABLE_GLIB_LOOP))
40
41 static GMutex *gLibEventMutex = 0;
42
43=== modified file 'Nux/WindowCompositor.cpp'
44--- Nux/WindowCompositor.cpp 2013-10-30 23:22:34 +0000
45+++ Nux/WindowCompositor.cpp 2014-07-30 16:37:50 +0000
46@@ -1348,15 +1348,6 @@
47 }
48 }
49
50- namespace
51- {
52- void AssignWeakBaseWindowMatchingRaw(WindowCompositor::WeakBaseWindowPtr const& w, BaseWindow* bw, WindowCompositor::WeakBaseWindowPtr *ptr)
53- {
54- if (w.IsValid() && w.GetPointer() == bw)
55- *ptr = w;
56- }
57- }
58-
59 void WindowCompositor::ForEachBaseWindow(ForEachBaseWindowFunc const& func)
60 {
61 for (auto const& window : _view_window_list)
62
63=== modified file 'Nux/XICClient.cpp'
64--- Nux/XICClient.cpp 2014-01-02 22:54:48 +0000
65+++ Nux/XICClient.cpp 2014-07-30 16:37:50 +0000
66@@ -21,10 +21,6 @@
67
68 #include "XICClient.h"
69
70-#include "NuxCore/Logger.h"
71-
72-DECLARE_LOGGER(logger, "xic.client");
73-
74 using namespace std;
75
76 namespace nux
77
78=== modified file 'NuxCore/Object.cpp'
79--- NuxCore/Object.cpp 2012-12-08 01:03:38 +0000
80+++ NuxCore/Object.cpp 2014-07-30 16:37:50 +0000
81@@ -28,18 +28,6 @@
82 namespace nux
83 {
84 DECLARE_LOGGER(logger, "nux.core.object");
85-namespace
86-{
87-bool debug_object_allocation_stack()
88-{
89- // If the extra long environment variable is set, then every object that is
90- // created will record it's backtrace during allocation. This will slow
91- // down the library, so only use for local debugging.
92- static bool extra_debugging(::getenv("NUX_DEBUG_OBJECT_ALLOCATION_STACK"));
93- return extra_debugging;
94-}
95-
96-}
97
98 NUX_IMPLEMENT_ROOT_OBJECT_TYPE (Trackable);
99 NUX_IMPLEMENT_OBJECT_TYPE (Object);

Subscribers

People subscribed via source and target branches