diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-12-15 09:13:24 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-12-15 09:13:24 -0500 |
| commit | 4a136572857fcf5d5fd21789a777bbde67c1076d (patch) | |
| tree | aa5076a08a1b3b090555559de1c81542b86c56b1 /indra/llrender | |
| parent | 3c53f8abded5da7e9743b743170538a1ede5635a (diff) | |
SL-10153: auto name{expression} declares an initializer_list
instead of a variable of type decltype(expression).
Using SHGetKnownFolderPath(FOLDERID_Fonts) in LLFontGL::getFontPathSystem()
requires new Windows #include files.
A variable with a constructor can't be declared within the braces of a switch
statement, even outside any of its case clauses.
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index bb56988422..9b43680949 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -44,6 +44,12 @@ // Third party library includes #include <boost/tokenizer.hpp> +#if LL_WINDOWS +#include <Shlobj.h> +#include <Knownfolders.h> +#include <Objbase.h> +#endif // LL_WINDOWS + const S32 BOLD_OFFSET = 1; // static class members |