Skip to content

Fix compile errors #298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Trompettesib wants to merge 3 commits into
base: master
Choose a base branch
from
+7 −1
Open

Fix compile errors #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61a9963
Add missing algorithm include
Trompettesib Apr 19, 2025
9afa971
Fix typo in % operator
Trompettesib Apr 19, 2025
0326f05
Fix include guard for prometheus
Trompettesib Apr 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions cubic-server/Server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@

#include <mbedtls/rsa.h>

#if PROMETHEUS_SUPPORT == 1
#include "PrometheusExporter.hpp"
#endif

#include "Server.hpp"
#include "World.hpp"

Expand Down
2 changes: 1 addition & 1 deletion cubic-server/math/Vector2.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ class Vector2 {
return *this;
}

constexpr Vector2 operator%(const Vector2 &other) noexcept { return Vector2<T>(other.x % this->x, other.z % this->y, other.z % this->z); }
constexpr Vector2 operator%(const Vector2 &other) noexcept { return Vector2<T>(other.x % this->x, other.z % this->z); }

constexpr Vector2 operator%(const T &other) noexcept { return Vector2<T>(other % this->x, other % this->z); }

Expand Down
2 changes: 2 additions & 0 deletions cubic-server/thread_pool/Pool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#include <algorithm>

#include "Pool.hpp"

thread_pool::Pool::Pool(size_t nbThreads, const std::string &name, const Behavior &behavior):
Expand Down
1 change: 1 addition & 0 deletions cubic-server/thread_pool/PriorityThreadPool.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
//=============
// STD includes
//=============
#include <algorithm>
#include <atomic>
#include <climits>
#include <cstdint>
Expand Down