amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-15 15:19:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codefix 1d10e8ee6: explicitly delete unwanted indexers (#15522)

Browse Source 
Prevents typed-indexers being used via implicit conversion.
This commit is contained in:
Peter Nelson
2026-04-23 08:32:25 +01:00
committed by GitHub
parent 146499ab99
commit 44c63bc400
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/convertible_through_base.hpp
+4
View File
@@ -37,12 +37,16 @@ concept ConvertibleThroughBaseOrTo = std::is_convertible_v<T, TTo> || Convertibl
template <typename Container, typename Index>
class TypedIndexContainer : public Container {
public:
Container::reference at(size_t pos) = delete;
Container::reference at(const Index &pos) { return this->Container::at(pos.base()); }
Container::const_reference at(size_t pos) const = delete;
Container::const_reference at(const Index &pos) const { return this->Container::at(pos.base()); }
Container::reference operator[](size_t pos) = delete;
Container::reference operator[](const Index &pos) { return this->Container::operator[](pos.base()); }
Container::const_reference operator[](size_t pos) const = delete;
Container::const_reference operator[](const Index &pos) const { return this->Container::operator[](pos.base()); }
};
src/core/enum_type.hpp
+4
View File
@@ -246,12 +246,16 @@ public:
template <typename Container, typename Index>
class EnumClassIndexContainer : public Container {
public:
Container::reference at(size_t pos) = delete;
Container::reference at(const Index &pos) { return this->Container::at(to_underlying(pos)); }
Container::const_reference at(size_t pos) const = delete;
Container::const_reference at(const Index &pos) const { return this->Container::at(to_underlying(pos)); }
Container::reference operator[](size_t pos) = delete;
Container::reference operator[](const Index &pos) { return this->Container::operator[](to_underlying(pos)); }
Container::const_reference operator[](size_t pos) const = delete;
Container::const_reference operator[](const Index &pos) const { return this->Container::operator[](to_underlying(pos)); }
};