Skip to content

Commit

Permalink
refactor: make clang-cl test compilable
Browse files Browse the repository at this point in the history
  • Loading branch information
OEOTYAN committed Dec 18, 2023
1 parent 2d6abdf commit 6655585
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 30 deletions.
41 changes: 13 additions & 28 deletions src/ll/api/base/Meta.h
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ struct TypeCounter {
};

template <class Group, class T, auto Id = int64{}>
consteval auto uniqueId() {
[[maybe_unused]] consteval auto uniqueId() {
if constexpr (TypeCounter<Group, Id>::exists(Id)) {
return uniqueId<Group, T, Id + 1>();
} else {
Expand All @@ -130,32 +130,22 @@ struct Setter {
};
#ifdef __INTELLISENSE__
template <class Group, auto Id = size_t{}>
consteval auto value() {
[[maybe_unused]] consteval auto value() {
return TypeList<>{};
}
template <class Group, concepts::Specializes<TypeList> T>
consteval auto assign() {
return TypeList<>{};
}
[[maybe_unused]] consteval void assign() {}
template <class Group, class T>
consteval auto push_back() {
return TypeList<>{};
}
[[maybe_unused]] consteval void push_back() {}
template <class Group, class T>
consteval auto push_front() {
return TypeList<>{};
}
[[maybe_unused]] consteval void push_front() {}
template <class Group, template <class> class W>
consteval auto wrap() {
return TypeList<>{};
}
[[maybe_unused]] consteval void wrap() {}
template <class Group, template <class> class M>
consteval auto map() {
return TypeList<>{};
}
[[maybe_unused]] consteval void map() {}
#else
template <class Group, auto Id = size_t{}, class UniqueTag = decltype([] {})>
consteval auto value() {
[[maybe_unused]] consteval auto value() {
if constexpr (requires(Getter<Group, Id + 1> g) { valueStored(g); }) {
return value<Group, Id + 1, UniqueTag>();
} else if constexpr (requires(Getter<Group, Id> g) { valueStored(g); }) {
Expand All @@ -165,42 +155,37 @@ consteval auto value() {
}
}
template <class Group, concepts::Specializes<TypeList> T, class UniqueTag = decltype([] {})>
consteval auto assign() {
[[maybe_unused]] consteval void assign() {
constexpr auto id = uniqueId<Group, UniqueTag>();
Setter<Group, id, T> setter{};
return T{};
}
template <class Group, class T, class UniqueTag = decltype([] {})>
consteval auto push_back() {
[[maybe_unused]] consteval void push_back() {
using now = decltype(value<Group, 0, UniqueTag>());
constexpr auto id = uniqueId<Group, UniqueTag>();
using next = typename now::template push_back<T>;
Setter<Group, id, next> setter{};
return next{};
}
template <class Group, class T, class UniqueTag = decltype([] {})>
consteval auto push_front() {
[[maybe_unused]] consteval void push_front() {
using now = decltype(value<Group, 0, UniqueTag>());
constexpr auto id = uniqueId<Group, UniqueTag>();
using next = typename now::template push_front<T>;
Setter<Group, id, next> setter{};
return next{};
}
template <class Group, template <class> class W, class UniqueTag = decltype([] {})>
consteval auto wrap() {
[[maybe_unused]] consteval void wrap() {
using now = decltype(value<Group, 0, UniqueTag>());
constexpr auto id = uniqueId<Group, UniqueTag>();
using next = typename now::template wrap<W>;
Setter<Group, id, next> setter{};
return next{};
}
template <class Group, template <class> class M, class UniqueTag = decltype([] {})>
consteval auto map() {
[[maybe_unused]] consteval void map() {
using now = decltype(value<Group, 0, UniqueTag>());
constexpr auto id = uniqueId<Group, UniqueTag>();
using next = typename now::template map<M>;
Setter<Group, id, next> setter{};
return next{};
}
#endif

Expand Down
2 changes: 1 addition & 1 deletion src/ll/test/TestDynamicCommand.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ static void setupTimingCommand() {
ll::logger.warn("TPS: {:.5f}", double(counttick) / std::chrono::duration<double>(end - begin).count());
ll::logger.warn("ECS cost {:.5f}ms per tick", allTime);

for (int i = 0; i < orderdTiming.size() && i < 20; i++) {
for (size_t i = 0; i < orderdTiming.size() && i < 20; i++) {
auto& data = orderdTiming[i];
ll::logger.warn(
" | {:.5f}ms {} for {:0>3} {}",
Expand Down
2 changes: 1 addition & 1 deletion src/mc/world/level/LevelSettings.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "mc/world/actor/player/PlayerPermissionLevel.h"
#include "mc/world/level/levelgen/GeneratorType.h"

class PackInstanceId;
struct PackInstanceId;

class LevelSettings {
public:
Expand Down

0 comments on commit 6655585

Please sign in to comment.