pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(connection): Address sanitizer patch

Browse Source
This commit is contained in:
Michael Carlberg 2016-12-31 01:28:48 +01:00
parent 31608bb706
commit a59d892d0b
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/x11/connection.hpp
View File

@ -35,9 +35,9 @@ namespace detail {
public: public:
template <typename... Args> template <typename... Args>
explicit connection_base(Args&&... args) explicit connection_base(Args&&... args)
: xpp::core::core(forward<Args>(args)...) : xpp::core(forward<Args>(args)...)
, interfaces<connection_base<Derived, Extensions...>, Extensions...>(*this) , 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())... { , Extensions::error_dispatcher(static_cast<Extensions&>(*this).get())... {
m_root_window = screen_of_display(default_screen())->root; m_root_window = screen_of_display(default_screen())->root;
} }
@ -48,10 +48,6 @@ namespace detail {
return o; 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 { void operator()(const shared_ptr<xcb_generic_error_t>& error) const {
check<xpp::x::extension, Extensions...>(error); 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); static make_type make(xcb_connection_t* conn = nullptr);
template <typename... Args> 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) { const connection& operator=(const connection& o) {
return o; return o;