From: Marcus Fritzsch <marcus_fritzsch@mentor.com>
Date: Thu, 29 Jun 2017 12:28:41 +0000 (+0200)
Subject: wayland: do not special-case ~display for DEBUG_OUTPUT
X-Git-Tag: 4.99.1~284
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=5968e97fec8fe24398f05c694d6882895671b9f6;p=staging%2Fwindowmanager.git

wayland: do not special-case ~display for DEBUG_OUTPUT

Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
---

diff --git a/src/wayland.cpp b/src/wayland.cpp
index 3162d4e..62c1afe 100644
--- a/src/wayland.cpp
+++ b/src/wayland.cpp
@@ -18,17 +18,8 @@ namespace wl {
 //             |_|            |___/
 display::display()
    : d(std::unique_ptr<struct wl_display, void (*)(struct wl_display *)>(
-        wl_display_connect(nullptr),
-#ifdef DEBUG_OUTPUT
-        [](struct wl_display *d) {
-           logdebug("wl::display ~display @ %p", d);
-           wl_display_disconnect(d);
-        })),
-#else
-        &wl_display_disconnect)),
-#endif
-     r(d.get()) {
-}
+        wl_display_connect(nullptr), &wl_display_disconnect)),
+     r(d.get()) {}
 
 bool display::ok() const { return d && wl_display_get_error(d.get()) == 0; }