diff options
| author | Martin Reddy <lynx@lindenlab.com> | 2009-10-13 16:04:09 +0000 |
|---|---|---|
| committer | Martin Reddy <lynx@lindenlab.com> | 2009-10-13 16:04:09 +0000 |
| commit | 330e635c2ce2ea0650226f56559cf1068df0320d (patch) | |
| tree | 3351dc4dda3868262b5783e1f08cd7a9e27ebfb9 /indra | |
| parent | 25f3546626a9912c30e34913c6fda1719edf80ff (diff) | |
DEV-40417: Fixed a few cases where gcc 4.x can emit warnings
suggesting the use of extra parentheses.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llaudio/llaudioengine_fmod.cpp | 9 | ||||
| -rw-r--r-- | indra/llmath/tests/v2math_test.cpp | 2 | ||||
| -rw-r--r-- | indra/llmath/tests/v3math_test.cpp | 6 |
3 files changed, 10 insertions, 7 deletions
diff --git a/indra/llaudio/llaudioengine_fmod.cpp b/indra/llaudio/llaudioengine_fmod.cpp index 7b12b62d53..d7f58defca 100644 --- a/indra/llaudio/llaudioengine_fmod.cpp +++ b/indra/llaudio/llaudioengine_fmod.cpp @@ -132,6 +132,7 @@ bool LLAudioEngine_FMOD::init(const S32 num_channels, void* userdata) bool audio_ok = false; if (!audio_ok) + { if (NULL == getenv("LL_BAD_FMOD_ESD")) /*Flawfinder: ignore*/ { LL_DEBUGS("AppInit") << "Trying ESD audio output..." << LL_ENDL; @@ -148,8 +149,9 @@ bool LLAudioEngine_FMOD::init(const S32 num_channels, void* userdata) } else { LL_DEBUGS("AppInit") << "ESD audio output SKIPPED" << LL_ENDL; } - + } if (!audio_ok) + { if (NULL == getenv("LL_BAD_FMOD_OSS")) /*Flawfinder: ignore*/ { LL_DEBUGS("AppInit") << "Trying OSS audio output..." << LL_ENDL; @@ -165,8 +167,9 @@ bool LLAudioEngine_FMOD::init(const S32 num_channels, void* userdata) } else { LL_DEBUGS("AppInit") << "OSS audio output SKIPPED" << LL_ENDL; } - + } if (!audio_ok) + { if (NULL == getenv("LL_BAD_FMOD_ALSA")) /*Flawfinder: ignore*/ { LL_DEBUGS("AppInit") << "Trying ALSA audio output..." << LL_ENDL; @@ -182,7 +185,7 @@ bool LLAudioEngine_FMOD::init(const S32 num_channels, void* userdata) } else { LL_DEBUGS("AppInit") << "OSS audio output SKIPPED" << LL_ENDL; } - + } if (!audio_ok) { LL_WARNS("AppInit") << "Overall audio init failure." << LL_ENDL; diff --git a/indra/llmath/tests/v2math_test.cpp b/indra/llmath/tests/v2math_test.cpp index 748cdf913a..456faf7c0c 100644 --- a/indra/llmath/tests/v2math_test.cpp +++ b/indra/llmath/tests/v2math_test.cpp @@ -379,7 +379,7 @@ namespace tut x1 = 1.0f, y1 = 2.0f, x2 = 1.0f, y2 = 3.2234f; vec2.setVec(x1, y1); vec3.setVec(x2, y2); - ensure("2:operator < failed", (FALSE == vec3 < vec2)); + ensure("2:operator < failed", (FALSE == (vec3 < vec2))); } template<> template<> diff --git a/indra/llmath/tests/v3math_test.cpp b/indra/llmath/tests/v3math_test.cpp index 00cffde367..14159974a3 100644 --- a/indra/llmath/tests/v3math_test.cpp +++ b/indra/llmath/tests/v3math_test.cpp @@ -460,15 +460,15 @@ namespace tut { F32 x1 =-2.3f, y1 = 2.f,z1 = 1.2f, x2 = 1.3f, y2 = 1.11f, z2 = 1234.234f; LLVector3 vec3(x1,y1,z1), vec3a(x2,y2,z2); - ensure("1:operator< failed", (TRUE == vec3 < vec3a)); + ensure("1:operator< failed", (TRUE == (vec3 < vec3a))); x1 =-2.3f, y1 = 2.f,z1 = 1.2f, x2 = 1.3f, y2 = 2.f, z2 = 1234.234f; vec3.setVec(x1,y1,z1); vec3a.setVec(x2,y2,z2); - ensure("2:operator< failed ", (TRUE == vec3 < vec3a)); + ensure("2:operator< failed ", (TRUE == (vec3 < vec3a))); x1 =2.3f, y1 = 2.f,z1 = 1.2f, x2 = 1.3f, vec3.setVec(x1,y1,z1); vec3a.setVec(x2,y2,z2); - ensure("3:operator< failed ", (FALSE == vec3 < vec3a)); + ensure("3:operator< failed ", (FALSE == (vec3 < vec3a))); } template<> template<> |