mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-14 10:09:11 +00:00
Code Issues Activity

Codechange: Make std::stack use std::vector container in string formatting/drawing. (#7305)

Browse Source 
This is a very minor performance increase which can add up during operations such
as sorting. Performance impact my be platform/compiler dependent.
This commit is contained in:
PeterN
2019-03-02 08:06:02 +00:00
committed by GitHub
parent 7ecfae8f7f
commit 63fe6c6598
2 changed files with 3 additions and 2 deletions

3
src/gfx_layout.h

@@ -19,6 +19,7 @@
#include <map> #include <map>
#include <string> #include <string>
#include <stack> #include <stack>
#include <vector>
#ifdef WITH_ICU_LAYOUT #ifdef WITH_ICU_LAYOUT
#include "layout/ParagraphLayout.h" #include "layout/ParagraphLayout.h"
@@ -35,7 +36,7 @@ struct FontState {
FontSize fontsize; ///< Current font size. FontSize fontsize; ///< Current font size.
TextColour cur_colour; ///< Current text colour. TextColour cur_colour; ///< Current text colour.
std::stack<TextColour> colour_stack; ///< Stack of colours to assist with colour switching. std::stack<TextColour, std::vector<TextColour>> colour_stack; ///< Stack of colours to assist with colour switching.
FontState() : fontsize(FS_END), cur_colour(TC_INVALID) {} FontState() : fontsize(FS_END), cur_colour(TC_INVALID) {}
FontState(TextColour colour, FontSize fontsize) : fontsize(fontsize), cur_colour(colour) {} FontState(TextColour colour, FontSize fontsize) : fontsize(fontsize), cur_colour(colour) {}

2
src/strings.cpp

@@ -791,7 +791,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
WChar b = '\0'; WChar b = '\0';
uint next_substr_case_index = 0; uint next_substr_case_index = 0;
char *buf_start = buff; char *buf_start = buff;
std::stack<const char *> str_stack; std::stack<const char *, std::vector<const char *>> str_stack;
str_stack.push(str_arg); str_stack.push(str_arg);
for (;;) { for (;;) {