TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Preserve input type in deleted enumerated_array::operator[]()

Browse source 
Any integer type can convert to match this signature, but the diagnostic
will only report that this deleted function was matched.  Switch to a
template function so that the diagnostic can report the unconverted
integer type.
This commit is contained in:
Kp 2022-12-31 16:21:47 +00:00
parent df8e998721
commit 147dd52f7d
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
common/main/d_array.h
View file

@ -24,6 +24,16 @@ namespace dcx {
* Other types for E are not likely to be useful, but are not blocked.
*/
template <typename T, std::size_t N, typename E>
/* `std::size_t` is `unsigned` on i686-w64-mingw32, and `unsigned long` on
* x86_64-pc-linux-gnu.
*
* As a result, if `E` is `unsigned`, then i686-w64-mingw32 breaks due to
* `operator[](E)` and `operator[](std::size_t)` being the same signature. If
* `E` is `unsigned long`, then x86_64-pc-linux-gnu breaks for the same reason.
* Disallow both `unsigned` and `unsigned long`, so that any attempt to use
* either for `E` will break everywhere, rather than breaking only some
* platforms.
*/
requires(!std::is_same<unsigned, E>::value && !std::is_same<unsigned long, E>::value)
struct enumerated_array : std::array<T, N>
{
@ -47,7 +57,9 @@ struct enumerated_array : std::array<T, N>
{
return this->base_type::operator[](static_cast<std::size_t>(position));
}
const_reference operator[](std::size_t) const = delete;
template <typename I>
requires(std::is_integral_v<I>)
const_reference operator[](I) const = delete;
[[nodiscard]]
static constexpr bool valid_index(std::size_t s)
{