1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
|
From 06f6ce21b038f60c297db3aa2ac2fb115e2012be Mon Sep 17 00:00:00 2001
From: szymonj99 <szymon.j@hotmail.com>
Date: Sat, 17 May 2025 21:26:27 +0000
Subject: [PATCH] Fix GCC + Clang compilation
---
src/include/Plugin.hpp | 2 +-
src/lib/Plugin.cpp | 4 ++--
src/plugins/CPU.cpp | 4 ++--
src/plugins/Nvidia.cpp | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/include/Plugin.hpp b/src/include/Plugin.hpp
index 1082ae4..6e193cf 100644
--- a/src/include/Plugin.hpp
+++ b/src/include/Plugin.hpp
@@ -41,7 +41,7 @@ class DevicePlugin {
virtual ~DevicePlugin() {}
// Helper for loading all DevicePlugin's
- static std::optional<std::vector<boost::shared_ptr<DevicePlugin>>> loadPlugins();
+ static std::optional<std::vector<std::shared_ptr<DevicePlugin>>> loadPlugins();
};
}; // namespace Plugin
diff --git a/src/lib/Plugin.cpp b/src/lib/Plugin.cpp
index dbd0d94..2f21378 100644
--- a/src/lib/Plugin.cpp
+++ b/src/lib/Plugin.cpp
@@ -9,8 +9,8 @@ namespace fs = std::filesystem;
std::string Plugin::pluginPath() { return TC_PLUGIN_PATH; }
-std::optional<std::vector<boost::shared_ptr<DevicePlugin>>> DevicePlugin::loadPlugins() {
- std::vector<boost::shared_ptr<DevicePlugin>> retval;
+std::optional<std::vector<std::shared_ptr<DevicePlugin>>> DevicePlugin::loadPlugins() {
+ std::vector<std::shared_ptr<DevicePlugin>> retval;
std::string pluginPath;
const char *pluginPathEnv = std::getenv("TUXCLOCKER_PLUGIN_PATH");
diff --git a/src/plugins/CPU.cpp b/src/plugins/CPU.cpp
index 5d15eaa..5c9e8bc 100644
--- a/src/plugins/CPU.cpp
+++ b/src/plugins/CPU.cpp
@@ -702,7 +702,7 @@ std::vector<TreeNode<DeviceNode>> getGovernors(CPUData data) {
std::vector<std::string> sysFsNames;
int enumId = 0;
for (auto &word : split_words(false, *contents)) {
- auto e = Enumeration{fromSysFsName(word), enumId};
+ auto e = Enumeration{fromSysFsName(word), static_cast<unsigned>(enumId)};
enumId++;
enumVec.push_back(e);
sysFsNames.push_back(word);
@@ -789,7 +789,7 @@ std::vector<TreeNode<DeviceNode>> getEPPNodes(CPUData data) {
EnumerationVec enumVec;
for (int i = 0; i < sysFsNames.size(); i++) {
- auto e = Enumeration{fromSysFsName(sysFsNames[i]), i};
+ auto e = Enumeration{fromSysFsName(sysFsNames[i]), static_cast<unsigned>(i)};
enumVec.push_back(e);
}
diff --git a/src/plugins/Nvidia.cpp b/src/plugins/Nvidia.cpp
index 36b8db7..72d4e5c 100644
--- a/src/plugins/Nvidia.cpp
+++ b/src/plugins/Nvidia.cpp
@@ -153,7 +153,7 @@ std::vector<TreeNode<DeviceNode>> getMemClockWrite(NvidiaGPUData data) {
return {};
}
// Transfer rate -> clock speed
- Range<int> range{values.u.range.min / 2, values.u.range.max / 2};
+ Range<int> range{static_cast<int>(values.u.range.min / 2), static_cast<int>(values.u.range.max / 2)};
// Seems the ..ALL_PERFORMANCE_LEVELS attribute doesn't work with the NVML function
auto setFuncNVML = [=](AssignmentArgument a) -> std::optional<AssignmentError> {
@@ -228,7 +228,7 @@ std::vector<TreeNode<DeviceNode>> getCoreClockWrite(NvidiaGPUData data) {
return {};
}
- Range<int> range{values.u.range.min, values.u.range.max};
+ Range<int> range{static_cast<int>(values.u.range.min), static_cast<int>(values.u.range.max)};
auto setFunc = [=](AssignmentArgument a) -> std::optional<AssignmentError> {
if (!std::holds_alternative<int>(a))
@@ -777,7 +777,7 @@ std::vector<TreeNode<DeviceNode>> getVoltageOffset(NvidiaGPUData data) {
return {};
// uV -> mV
- Range<int> range{values.u.range.min / 1000, values.u.range.max / 1000};
+ Range<int> range{static_cast<int>(values.u.range.min / 1000), static_cast<int>(values.u.range.max / 1000)};
auto getFunc = [data]() -> std::optional<AssignmentArgument> {
int value;
|