From 4c406c73633704f69b6b5fb9afde8b8c8c7ee0c1 Mon Sep 17 00:00:00 2001
From: pixl <pixlone@pm.me>
Date: Wed, 3 May 2023 15:14:51 -0400
Subject: [PATCH] Fix compiler errors and warnings on Ubuntu 20.04

Also fixes some warnings and errors seen on clang.
---
 CMakeLists.txt                                  | 2 +-
 src/ipcgull                                     | 2 +-
 src/logid/CMakeLists.txt                        | 3 ++-
 src/logid/Device.cpp                            | 3 ---
 src/logid/Device.h                              | 1 -
 src/logid/InputDevice.h                         | 1 +
 src/logid/backend/EventHandlerList.h            | 2 +-
 src/logid/backend/hidpp/Device.cpp              | 2 +-
 src/logid/backend/hidpp20/features/ChangeHost.h | 2 +-
 src/logid/backend/raw/IOMonitor.h               | 3 ++-
 10 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c87fa2c..5661b95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.12)
 
 set(CMAKE_INSTALL_PREFIX /usr)
 
diff --git a/src/ipcgull b/src/ipcgull
index 3b19a11..0ad3795 160000
--- a/src/ipcgull
+++ b/src/ipcgull
@@ -1 +1 @@
-Subproject commit 3b19a11e8adf5608c9facd6a4e93d8833cbc4e3f
+Subproject commit 0ad3795fcc383f51664e16c4ea1e86143207bf07
diff --git a/src/logid/CMakeLists.txt b/src/logid/CMakeLists.txt
index 15d8aa1..10a2f20 100644
--- a/src/logid/CMakeLists.txt
+++ b/src/logid/CMakeLists.txt
@@ -1,8 +1,9 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.12)
 project(logid)
 
 # C++20 is only needed for string literal template parameters
 set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/../CMake")
 
diff --git a/src/logid/Device.cpp b/src/logid/Device.cpp
index 739016f..73ecfee 100644
--- a/src/logid/Device.cpp
+++ b/src/logid/Device.cpp
@@ -100,7 +100,6 @@ Device::Device(std::string path, backend::hidpp::DeviceIndex index,
         _path(std::move(path)), _index(index),
         _config(_getConfig(manager, _hidpp20->name())),
         _profile_name(ipcgull::property_readable, ""),
-        _receiver(nullptr),
         _manager(manager),
         _nickname(manager),
         _ipc_node(manager->devicesNode()->make_child(_nickname)),
@@ -116,7 +115,6 @@ Device::Device(std::shared_ptr<backend::raw::RawDevice> raw_device,
         _path(raw_device->rawPath()), _index(index),
         _config(_getConfig(manager, _hidpp20->name())),
         _profile_name(ipcgull::property_readable, ""),
-        _receiver(nullptr),
         _manager(manager),
         _nickname(manager),
         _ipc_node(manager->devicesNode()->make_child(_nickname)),
@@ -132,7 +130,6 @@ Device::Device(Receiver* receiver, hidpp::DeviceIndex index,
         _path(receiver->path()), _index(index),
         _config(_getConfig(manager, _hidpp20->name())),
         _profile_name(ipcgull::property_readable, ""),
-        _receiver(receiver),
         _manager(manager),
         _nickname(manager),
         _ipc_node(manager->devicesNode()->make_child(_nickname)),
diff --git a/src/logid/Device.h b/src/logid/Device.h
index e3cf4c4..99da6dc 100644
--- a/src/logid/Device.h
+++ b/src/logid/Device.h
@@ -157,7 +157,6 @@ namespace logid {
         ipcgull::property<std::string> _profile_name;
         std::map<std::string, config::Profile>::iterator _profile;
 
-        Receiver* _receiver;
         const std::weak_ptr<DeviceManager> _manager;
 
         void _makeResetMechanism();
diff --git a/src/logid/InputDevice.h b/src/logid/InputDevice.h
index 67b2e8c..939d59f 100644
--- a/src/logid/InputDevice.h
+++ b/src/logid/InputDevice.h
@@ -21,6 +21,7 @@
 
 #include <memory>
 #include <string>
+#include <mutex>
 
 extern "C"
 {
diff --git a/src/logid/backend/EventHandlerList.h b/src/logid/backend/EventHandlerList.h
index 93436e8..edad88c 100644
--- a/src/logid/backend/EventHandlerList.h
+++ b/src/logid/backend/EventHandlerList.h
@@ -31,7 +31,7 @@ class EventHandlerLock;
 template <class T>
 struct EventHandlerList {
     typedef std::list<typename T::EventHandler> list_t;
-    typedef list_t::const_iterator iterator_t;
+    typedef typename list_t::const_iterator iterator_t;
 
     std::list<typename T::EventHandler> list;
     mutable std::shared_mutex mutex;
diff --git a/src/logid/backend/hidpp/Device.cpp b/src/logid/backend/hidpp/Device.cpp
index 50cfb38..f0da17c 100644
--- a/src/logid/backend/hidpp/Device.cpp
+++ b/src/logid/backend/hidpp/Device.cpp
@@ -310,7 +310,7 @@ bool Device::isStable10() {
 }
 
 bool Device::isStable20() {
-    static constexpr std::string ping_seq = "hello";
+    static const std::string ping_seq = "hello";
 
     hidpp20::Root root(this);
 
diff --git a/src/logid/backend/hidpp20/features/ChangeHost.h b/src/logid/backend/hidpp20/features/ChangeHost.h
index 559a6bb..14e5b33 100644
--- a/src/logid/backend/hidpp20/features/ChangeHost.h
+++ b/src/logid/backend/hidpp20/features/ChangeHost.h
@@ -40,7 +40,7 @@ namespace logid::backend::hidpp20 {
         struct HostInfo {
             uint8_t hostCount;
             uint8_t currentHost;
-            [[maybe_unused]] bool enhancedHostSwitch;
+            bool enhancedHostSwitch;
         };
 
         HostInfo getHostInfo();
diff --git a/src/logid/backend/raw/IOMonitor.h b/src/logid/backend/raw/IOMonitor.h
index d26f955..7fd8670 100644
--- a/src/logid/backend/raw/IOMonitor.h
+++ b/src/logid/backend/raw/IOMonitor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 PixlOne
+ * Copyright 2019-2023 PixlOne
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
 #include <functional>
 #include <map>
 #include <mutex>
+#include <thread>
 #include <condition_variable>
 
 namespace logid::backend::raw {