Skip to content

Commit 1ef21c0

Browse files
author
rt
committed
nlc
1 parent ac9f2cf commit 1ef21c0

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

rts/Rendering/Fonts/glFont.h

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,8 @@ class CglFont : public CTextWrap
9999
void SetOutlineDepth(float z) { textDepth.y = z; }
100100

101101
float GetCharacterWidth(const char32_t c);
102-
#if defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 6)
103-
#define _final
104-
#else
105-
#define _final final
106-
#endif
107-
inline float GetTextWidth(const std::string& text) _final;
108-
#undef _final
102+
103+
inline float GetTextWidth(const std::string& text) override;
109104
inline float GetTextHeight(const std::string& text, float* descender = nullptr, int* numLines = nullptr);
110105

111106
static std::deque<std::string> SplitIntoLines(const std::u8string&);

0 commit comments

Comments
 (0)