diff options
author | Aleric Inglewood | 2010-09-30 02:17:43 +0200 |
---|---|---|
committer | McCabe Maxsted | 2010-10-01 23:56:59 -0700 |
commit | b5b6e556ed7e9fa6bdea2365e82765981ee9f28c (patch) | |
tree | f984604269dc1d49b271cbfefbe9dd2ce6bf13c7 /linden/indra/llcharacter | |
parent | Update of doc/contributions.txt (diff) | |
download | meta-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 'linden/indra/llcharacter')
-rw-r--r-- | linden/indra/llcharacter/llgesture.cpp | 2 | ||||
-rw-r--r-- | linden/indra/llcharacter/lljointsolverrp3.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/llcharacter/llgesture.cpp b/linden/indra/llcharacter/llgesture.cpp index 4ee29fe..83e4e35 100644 --- a/linden/indra/llcharacter/llgesture.cpp +++ b/linden/indra/llcharacter/llgesture.cpp | |||
@@ -304,7 +304,7 @@ BOOL LLGestureList::trigger(KEY key, MASK mask) | |||
304 | } | 304 | } |
305 | else | 305 | else |
306 | { | 306 | { |
307 | llwarns << "NULL gesture in gesture list (" << i << ")" << llendl | 307 | llwarns << "NULL gesture in gesture list (" << i << ")" << llendl; |
308 | } | 308 | } |
309 | } | 309 | } |
310 | return FALSE; | 310 | return FALSE; |
diff --git a/linden/indra/llcharacter/lljointsolverrp3.cpp b/linden/indra/llcharacter/lljointsolverrp3.cpp index 0ea92a2..6599a76 100644 --- a/linden/indra/llcharacter/lljointsolverrp3.cpp +++ b/linden/indra/llcharacter/lljointsolverrp3.cpp | |||
@@ -211,7 +211,7 @@ void LLJointSolverRP3::solve() | |||
211 | //------------------------------------------------------------------------- | 211 | //------------------------------------------------------------------------- |
212 | LLVector3 abacCompOrthoVec = abVec - acVec * ((abVec * acVec)/(acVec * acVec)); | 212 | LLVector3 abacCompOrthoVec = abVec - acVec * ((abVec * acVec)/(acVec * acVec)); |
213 | 213 | ||
214 | // llinfos << "abacCompOrthoVec : " << abacCompOrthoVec << llendl | 214 | // llinfos << "abacCompOrthoVec : " << abacCompOrthoVec << llendl; |
215 | 215 | ||
216 | //------------------------------------------------------------------------- | 216 | //------------------------------------------------------------------------- |
217 | // compute the normal of the original ABC plane (and store for later) | 217 | // compute the normal of the original ABC plane (and store for later) |