Misc cleanups #6570
Misc cleanups #6570
Conversation
github-actions
bot
added
AI
| @@ -87,7 +87,7 @@ namespace | |||
| #ifdef CAIRO_HAS_WIN32_FONT | |||
| bool is_valid_font_file(const std::string& file) | |||
| { | |||
| static const std::array<std::string, 3> font_exts { ".ttf", ".ttc", ".otf" }; | |||
| static const std::array font_exts { ".ttf", ".ttc", ".otf" }; | |||
There was a problem hiding this comment.
No idea if it's a problem. but this change means three std::string values are constructed every time this function is called.
There was a problem hiding this comment.
Using auto two lines down should help, depending on the API of filesystem::ends_with. Or append s to each of the constants.
| @@ -106,7 +106,7 @@ static void verify(const unit_map& units, const config& cfg) { | |||
| u->write(u_cfg); | |||
|
|
|||
| bool is_ok = true; | |||
| static const std::array<std::string, 4> fields {{"type","hitpoints","experience","side"}}; | |||
| static const std::array fields {"type","hitpoints","experience","side"}; | |||
There was a problem hiding this comment.
Again you've changed the type from std::string to const char*. Same as previous comment.
| @@ -4726,7 +4726,7 @@ void game_lua_kernel::set_game_display(game_display * gd) { | |||
| * elsewhere (in the C++ code). | |||
| * Any child tags not in this list will be passed to Lua's on_load event. | |||
| */ | |||
| static const std::array<std::string, 24> handled_file_tags {{ | |||
| static const std::array handled_file_tags { | |||
There was a problem hiding this comment.
Same thing again.
(Aside: It seems to me that the function using this could just be an std::find call.)
| @@ -57,52 +57,52 @@ BOOST_AUTO_TEST_CASE( utils_split_test ) | |||
|
|
|||
| { | |||
| auto split = utils::split(test_string); | |||
| std::array<std::string, 7> expect = {"a", "bb", "ccc || d", "ee", "fff | | g", "hh", "iii"}; | |||
| std::array expect = {"a", "bb", "ccc || d", "ee", "fff | | g", "hh", "iii"}; | |||
There was a problem hiding this comment.
This probably no longer compiles because of the type change. My suggestion here is to just append s to each constant. (Note: use of that literal suffix does require using namespace std::literals; if I recall correctly.)
There was a problem hiding this comment.
Other tests already did the same thing without the literal.
There was a problem hiding this comment.
Oh, I misread the code. Sorry about that. This one is fine.
| #define ENUM_AND_ARRAY(...) \ | ||
| enum class type { __VA_ARGS__ }; \ | ||
| \ | ||
| /** Provide a variable template for an array of matching size. */ \ |
There was a problem hiding this comment.
This is not a variable template. A variable template is like template<typename T> bool whatever = something<T>::value;. Please fix the comment.
Also, why remove count? You could leave the count declaration and just use it here.
There was a problem hiding this comment.
Ah, you're right, I meant alias template. I removed count since I made values use the alias so I figured might as well subsume it.
| return gui::button::TYPE_IMAGE; | ||
| } else if(type == "radiobox") { | ||
| return gui::button::TYPE_RADIO; | ||
| } else if(type == "turbo") { |
There was a problem hiding this comment.
…what on earth is a "turbo"?
(Not an issue, I just don't understand.)
For CI.