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

[Brandon Schaefer]

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

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

[PS Jenkins bot (ps-jenkins)]

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)

[Stephen M. Webb (bregma)]

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

Fixes build failures by removing dead code. Approved.

review: Approve

[Stephen M. Webb (bregma)]

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

review: Approve

[PS Jenkins bot (ps-jenkins)]

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)

=== 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 @@
 #include <sigc++/functors/ptr_fun.h>
 #include <sigc++/functors/mem_fun.h>
 
-#include "NuxCore/Logger.h"
-
 #include "Nux.h"
 #include "InputArea.h"
 #include "NuxGraphics/GraphicsEngine.h"
@@ -38,8 +36,6 @@
 
 namespace nux
 {
-  DECLARE_LOGGER(logger, "nux.inputarea");
-
   NUX_IMPLEMENT_OBJECT_TYPE(InputArea);
 
   InputArea::InputArea(NUX_FILE_LINE_DECL)

=== 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 @@
 #include "Nux.h"
 #include "Layout.h"
-#include "NuxCore/Logger.h"
 #include "NuxGraphics/GraphicsEngine.h"
 #include "ClientArea.h"
 #include "WindowCompositor.h"
@@ -13,8 +12,6 @@
 
 namespace nux
 {
-  DECLARE_LOGGER(logger, "nux.windows.thread");
-
   #if (defined(NUX_OS_LINUX) || defined(NUX_USE_GLIB_LOOP_ON_WINDOWS)) && (!defined(NUX_DISABLE_GLIB_LOOP))
 
   static GMutex *gLibEventMutex = 0;

=== 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 @@
     }
   }
 
-  namespace
-  {
-    void AssignWeakBaseWindowMatchingRaw(WindowCompositor::WeakBaseWindowPtr const& w, BaseWindow* bw, WindowCompositor::WeakBaseWindowPtr *ptr)
-    {
-      if (w.IsValid() && w.GetPointer() == bw)
-        *ptr = w;
-    }
-  }
-
   void WindowCompositor::ForEachBaseWindow(ForEachBaseWindowFunc const& func)
   {
     for (auto const& window : _view_window_list)

=== 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 @@
 
 #include "XICClient.h"
 
-#include "NuxCore/Logger.h"
-
-DECLARE_LOGGER(logger, "xic.client");
-
 using namespace std;
 
 namespace nux

=== 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 @@
 namespace nux
 {
 DECLARE_LOGGER(logger, "nux.core.object");
-namespace
-{
-bool debug_object_allocation_stack()
-{
-  // If the extra long environment variable is set, then every object that is
-  // created will record it's backtrace during allocation.  This will slow
-  // down the library, so only use for local debugging.
-  static bool extra_debugging(::getenv("NUX_DEBUG_OBJECT_ALLOCATION_STACK"));
-  return extra_debugging;
-}
-
-}
 
   NUX_IMPLEMENT_ROOT_OBJECT_TYPE (Trackable);
   NUX_IMPLEMENT_OBJECT_TYPE (Object);