aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llrender/llfont.cpp
diff options
context:
space:
mode:
authorAleric Inglewood2010-09-30 02:17:43 +0200
committerMcCabe Maxsted2010-10-01 23:56:59 -0700
commitb5b6e556ed7e9fa6bdea2365e82765981ee9f28c (patch)
treef984604269dc1d49b271cbfefbe9dd2ce6bf13c7 /linden/indra/llrender/llfont.cpp
parentUpdate of doc/contributions.txt (diff)
downloadmeta-impy-b5b6e556ed7e9fa6bdea2365e82765981ee9f28c.zip
meta-impy-b5b6e556ed7e9fa6bdea2365e82765981ee9f28c.tar.gz
meta-impy-b5b6e556ed7e9fa6bdea2365e82765981ee9f28c.tar.bz2
meta-impy-b5b6e556ed7e9fa6bdea2365e82765981ee9f28c.tar.xz
SNOW-86: Dangerous macro leads to possible wrong code
See http://redmine.imprudenceviewer.org/issues/571 This patch appeared to already have been partially applied. I added more semi-colons after all llendl (and LLENDL) macros, and wrapped the lllog ... llendl construct into do { ... } while(0) as is usual for macros that mimic a single statement. The patch was double checked with regular expression greps and a compile.
Diffstat (limited to '')
-rw-r--r--linden/indra/llrender/llfont.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llrender/llfont.cpp b/linden/indra/llrender/llfont.cpp
index dd33128..5ee3929 100644
--- a/linden/indra/llrender/llfont.cpp
+++ b/linden/indra/llrender/llfont.cpp
@@ -311,7 +311,7 @@ BOOL LLFont::addChar(const llwchar wch) const
311 // Try looking it up in the backup Unicode font 311 // Try looking it up in the backup Unicode font
312 if (mFallbackFontp) 312 if (mFallbackFontp)
313 { 313 {
314 //llinfos << "Trying to add glyph from fallback font!" << llendl 314 //llinfos << "Trying to add glyph from fallback font!" << llendl;
315 LLFontList::iterator iter; 315 LLFontList::iterator iter;
316 for(iter = mFallbackFontp->begin(); iter != mFallbackFontp->end(); iter++) 316 for(iter = mFallbackFontp->begin(); iter != mFallbackFontp->end(); iter++)
317 { 317 {