Merge branch 'master' into jgrpp
# Conflicts: # CMakeLists.txt # src/3rdparty/md5/md5.h # src/3rdparty/squirrel/squirrel/squtils.h # src/animated_tile.cpp # src/console_func.h # src/core/CMakeLists.txt # src/core/container_func.hpp # src/core/smallstack_type.hpp # src/crashlog.cpp # src/crashlog.h # src/debug.h # src/economy.cpp # src/gamelog.cpp # src/industry_gui.cpp # src/lang/catalan.txt # src/misc_gui.cpp # src/network/network_content.h # src/newgrf.cpp # src/newgrf.h # src/newgrf_config.cpp # src/newgrf_config.h # src/newgrf_gui.cpp # src/os/unix/font_unix.cpp # src/os/windows/crashlog_win.cpp # src/rail_cmd.cpp # src/saveload/animated_tile_sl.cpp # src/script/api/script_tilelist.cpp # src/settings.cpp # src/settingsgen/settingsgen.cpp # src/sl/oldloader_sl.cpp # src/station.cpp # src/station_cmd.cpp # src/stdafx.h # src/strgen/strgen.cpp # src/strgen/strgen_base.cpp # src/table/settings/gui_settings.ini # src/train_gui.cpp # src/vehicle.cpp # src/vehicle_base.h # src/vehicle_cmd.cpp # src/vehicle_gui_base.h # src/viewport_sprite_sorter.h
This commit is contained in:
44
src/core/format.hpp
Normal file
44
src/core/format.hpp
Normal file
@@ -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 */
|
Reference in New Issue
Block a user