From 14e834b900426c6dfb742acee3e62d60fab46869 Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Mon, 3 Jul 2023 09:58:57 +0200 Subject: c++,window: Fixed compilation issues for window. --- src/window/xcb.cpp | 3 +-- src/window/xcb.h | 2 +- tests/.nix/derivation.nix | 6 ++++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/window/xcb.cpp b/src/window/xcb.cpp index 5e6540c..0a27643 100644 --- a/src/window/xcb.cpp +++ b/src/window/xcb.cpp @@ -212,8 +212,7 @@ error_or>> create_xcb_device(io_provider& provide return heap>(display, screen, xcb_connection, xcb_screen, std::move(fd_wrapped)); } -template<> -window::window(device& dev_, xcb_window_t xcb_win, xcb_colormap_t xcb_colormap_, const video_mode& vid_mode_, std::string_view& title_view_): +window::window(device& dev_, xcb_window_t xcb_win, xcb_colormap_t xcb_colormap_, const video_mode& vid_mode_, const std::string_view& title_view_): device_{&dev_}, xcb_window_{xcb_win}, xcb_colormap_{xcb_colormap_}, diff --git a/src/window/xcb.h b/src/window/xcb.h index c031cbd..f4e9b9a 100644 --- a/src/window/xcb.h +++ b/src/window/xcb.h @@ -67,7 +67,7 @@ private: own>> event_feeder = nullptr; public: - window(device& dev_, xcb_window_t xcb_win, xcb_colormap_t xcb_colormap_, const video_mode& vid_mode_, std::string_view title_view_); + window(device& dev_, xcb_window_t xcb_win, xcb_colormap_t xcb_colormap_, const video_mode& vid_mode_, const std::string_view& title_view_); ~window(); diff --git a/tests/.nix/derivation.nix b/tests/.nix/derivation.nix index 1e20c5c..198588a 100644 --- a/tests/.nix/derivation.nix +++ b/tests/.nix/derivation.nix @@ -18,11 +18,13 @@ stdenvNoCC.mkDerivation { scons clang clang-tools - forstio.core forstio.async - forstio.test forstio.codec forstio.codec-json + forstio.core + forstio.io + forstio.test + forstio.window ]; doCheck = true; -- cgit v1.2.3