Codechange: fmt (and std::format) do explicitly not support enums out-of-the-box
That it works for the version we have packaged it pure coincidence, as that is one of the few versions that due to a bug allow it. So add the appropriate template specialisations to support it out-of-the-box within OpenTTD.pull/564/head
parent
bc45c3f66c
commit
6f2f38b3ed
@ -0,0 +1,44 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of OpenTTD.
|
||||||
|
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
|
||||||
|
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** @file format.hpp String formatting functions and helpers. */
|
||||||
|
|
||||||
|
#ifndef FORMAT_HPP
|
||||||
|
#define FORMAT_HPP
|
||||||
|
|
||||||
|
#include "../3rdparty/fmt/format.h"
|
||||||
|
#include "strong_typedef_type.hpp"
|
||||||
|
|
||||||
|
template <typename E, typename Char>
|
||||||
|
struct fmt::formatter<E, Char, std::enable_if_t<std::is_enum<E>::value>> : fmt::formatter<typename std::underlying_type<E>::type> {
|
||||||
|
using underlying_type = typename std::underlying_type<E>::type;
|
||||||
|
using parent = typename fmt::formatter<underlying_type>;
|
||||||
|
|
||||||
|
constexpr fmt::format_parse_context::iterator parse(fmt::format_parse_context &ctx) {
|
||||||
|
return parent::parse(ctx);
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt::format_context::iterator format(const E &e, format_context &ctx) const {
|
||||||
|
return parent::format(underlying_type(e), ctx);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename T, typename Char>
|
||||||
|
struct fmt::formatter<T, Char, std::enable_if_t<std::is_base_of<StrongTypedefBase, T>::value>> : fmt::formatter<typename T::Type> {
|
||||||
|
using underlying_type = typename T::Type;
|
||||||
|
using parent = typename fmt::formatter<underlying_type>;
|
||||||
|
|
||||||
|
constexpr fmt::format_parse_context::iterator parse(fmt::format_parse_context &ctx) {
|
||||||
|
return parent::parse(ctx);
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt::format_context::iterator format(const T &t, format_context &ctx) const {
|
||||||
|
return parent::format(underlying_type(t), ctx);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif /* FORMAT_HPP */
|
Loading…
Reference in New Issue