Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
// \__,_|_|___/ .__/|_|\__,_|\__, |
// |_| |___/
display::display()
// \__,_|_|___/ .__/|_|\__,_|\__, |
// |_| |___/
display::display()
- : d(std::unique_ptr<struct wl_display,
- std::function<void(struct wl_display *)>>(
+ : d(std::unique_ptr<struct wl_display, void (*)(struct wl_display *)>(
wl_display_connect(NULL),
wl_display_connect(NULL),
[](struct wl_display *d) {
logdebug("wl::display ~display @ %p", d);
wl_display_disconnect(d);
})),
[](struct wl_display *d) {
logdebug("wl::display ~display @ %p", d);
wl_display_disconnect(d);
})),
+#else
+ &wl_display_disconnect)),
+#endif
+ r(d.get()) {
+}
// \__,_|_|___/ .__/|_|\__,_|\__, |
// |_| |___/
struct display {
// \__,_|_|___/ .__/|_|\__,_|\__, |
// |_| |___/
struct display {
- std::unique_ptr<struct wl_display, std::function<void(struct wl_display *)>>
- d;
+ std::unique_ptr<struct wl_display, void(*)(struct wl_display *)> d;
struct registry r;
display();
struct registry r;
display();