From 61a9963a38d2370ff66acd85bbc81c3362f12759 Mon Sep 17 00:00:00 2001 From: Trompettesib Date: Sat, 19 Apr 2025 22:08:44 +0200 Subject: [PATCH 1/3] Add missing algorithm include --- cubic-server/thread_pool/Pool.cpp | 2 ++ cubic-server/thread_pool/PriorityThreadPool.hpp | 1 + 2 files changed, 3 insertions(+) diff --git a/cubic-server/thread_pool/Pool.cpp b/cubic-server/thread_pool/Pool.cpp index 448d72280..40ca9d42b 100644 --- a/cubic-server/thread_pool/Pool.cpp +++ b/cubic-server/thread_pool/Pool.cpp @@ -1,3 +1,5 @@ +#include + #include "Pool.hpp" thread_pool::Pool::Pool(size_t nbThreads, const std::string &name, const Behavior &behavior): diff --git a/cubic-server/thread_pool/PriorityThreadPool.hpp b/cubic-server/thread_pool/PriorityThreadPool.hpp index 1db8db114..f8398e84e 100644 --- a/cubic-server/thread_pool/PriorityThreadPool.hpp +++ b/cubic-server/thread_pool/PriorityThreadPool.hpp @@ -4,6 +4,7 @@ //============= // STD includes //============= +#include #include #include #include From 9afa9710f14473add1a1839fd1af78b8c6021fc3 Mon Sep 17 00:00:00 2001 From: Trompettesib Date: Sat, 19 Apr 2025 22:10:01 +0200 Subject: [PATCH 2/3] Fix typo in % operator --- cubic-server/math/Vector2.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cubic-server/math/Vector2.hpp b/cubic-server/math/Vector2.hpp index 5782b26f2..fe0820511 100644 --- a/cubic-server/math/Vector2.hpp +++ b/cubic-server/math/Vector2.hpp @@ -126,7 +126,7 @@ class Vector2 { return *this; } - constexpr Vector2 operator%(const Vector2 &other) noexcept { return Vector2(other.x % this->x, other.z % this->y, other.z % this->z); } + constexpr Vector2 operator%(const Vector2 &other) noexcept { return Vector2(other.x % this->x, other.z % this->z); } constexpr Vector2 operator%(const T &other) noexcept { return Vector2(other % this->x, other % this->z); } From 0326f055750043f71ed10b5acbd0578452273238 Mon Sep 17 00:00:00 2001 From: Trompettesib Date: Sat, 19 Apr 2025 22:10:15 +0200 Subject: [PATCH 3/3] Fix include guard for prometheus --- cubic-server/Server.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cubic-server/Server.cpp b/cubic-server/Server.cpp index e537f10c7..e7d499790 100644 --- a/cubic-server/Server.cpp +++ b/cubic-server/Server.cpp @@ -14,7 +14,10 @@ #include +#if PROMETHEUS_SUPPORT == 1 #include "PrometheusExporter.hpp" +#endif + #include "Server.hpp" #include "World.hpp"