From a59d892d0bdc9d7944a16e3490744b45d9088454 Mon Sep 17 00:00:00 2001
From: Michael Carlberg <c@rlberg.se>
Date: Sat, 31 Dec 2016 01:28:48 +0100
Subject: [PATCH] fix(connection): Address sanitizer patch

---
 include/x11/connection.hpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/include/x11/connection.hpp b/include/x11/connection.hpp
index 792a8319..f83cdc89 100644
--- a/include/x11/connection.hpp
+++ b/include/x11/connection.hpp
@@ -35,9 +35,9 @@ namespace detail {
    public:
     template <typename... Args>
     explicit connection_base(Args&&... args)
-        : xpp::core::core(forward<Args>(args)...)
+        : xpp::core(forward<Args>(args)...)
         , interfaces<connection_base<Derived, Extensions...>, Extensions...>(*this)
-        , Extensions(static_cast<xcb_connection_t*>(*this))...
+        , Extensions(m_c.get())...
         , Extensions::error_dispatcher(static_cast<Extensions&>(*this).get())... {
       m_root_window = screen_of_display(default_screen())->root;
     }
@@ -48,10 +48,6 @@ namespace detail {
       return o;
     }
 
-    virtual operator xcb_connection_t*() const {
-      return *static_cast<const core&>(*this);
-    }
-
     void operator()(const shared_ptr<xcb_generic_error_t>& error) const {
       check<xpp::x::extension, Extensions...>(error);
     }
@@ -110,7 +106,7 @@ class connection : public detail::connection_base<connection&, XPP_EXTENSION_LIS
   static make_type make(xcb_connection_t* conn = nullptr);
 
   template <typename... Args>
-  explicit connection(Args&&... args) : base_type::connection_base(forward<Args>(args)...) {}
+  explicit connection(Args&&... args) : base_type(forward<Args>(args)...) {}
 
   const connection& operator=(const connection& o) {
     return o;