Skip to content

Commit 6a1197f

Browse files
committed
Merge remote-tracking branch 'origin/v0.11' into v0.11
2 parents b2df344 + 97ec97e commit 6a1197f

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

include/endstone/command/command.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class Command {
7272
void setName(std::string name)
7373
{
7474
if (!isRegistered()) {
75-
std::ranges::transform(name, name.begin(), [](unsigned char c) { return std::tolower(c); });
75+
std::transform(name.begin(), name.end(), name.begin(), [](unsigned char c) { return std::tolower(c); });
7676
name_ = std::move(name);
7777
}
7878
}
@@ -194,7 +194,7 @@ class Command {
194194
return true;
195195
}
196196

197-
return std::ranges::any_of(permissions_, [&target](const auto &p) { return target.hasPermission(p); });
197+
return std::any_of(permissions_.begin(), permissions_.end(), [&target](const auto &p) { return target.hasPermission(p); });
198198
}
199199

200200
/**

include/endstone/nbt/array.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ class ArrayTag : public TagBase {
2929
using value_type = T;
3030
using size_type = std::size_t;
3131
using storage_type = std::vector<value_type>;
32-
using iterator = storage_type::iterator;
33-
using const_iterator = storage_type::const_iterator;
34-
using difference_type = storage_type::difference_type;
32+
using iterator = typename storage_type::iterator;
33+
using const_iterator = typename storage_type::const_iterator;
34+
using difference_type = typename storage_type::difference_type;
3535

3636
// Constructors
3737
ArrayTag() = default;

include/endstone/permissions/permission.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ class Permission {
144144
if (!plugin_manager_) {
145145
return nullptr;
146146
}
147-
std::ranges::transform(name, name.begin(), [](unsigned char c) { return std::tolower(c); });
147+
std::transform(name.begin(), name.end(), name.begin(), [](unsigned char c) { return std::tolower(c); });
148148
auto *perm = plugin_manager_->getPermission(name);
149149
if (!perm) {
150150
perm = &plugin_manager_->addPermission(std::make_unique<Permission>(name));

0 commit comments

Comments
 (0)