diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-16 21:54:57 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-16 21:54:57 -0500 |
| commit | cd885c0a09903837784dc9393769ba177aea8163 (patch) | |
| tree | ecb272c440c8a709263b4c24d884bf72307e113d /indra/llmath/tests/m3math_test.cpp | |
| parent | 008938e37292cc8b66e19f2df3f745e9b178b86d (diff) | |
| parent | 4497502d0d3784a2cfd6871e7609290de2023475 (diff) | |
Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010
Diffstat (limited to 'indra/llmath/tests/m3math_test.cpp')
| -rw-r--r-- | indra/llmath/tests/m3math_test.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llmath/tests/m3math_test.cpp b/indra/llmath/tests/m3math_test.cpp index 622ee28288..479a00b99f 100644 --- a/indra/llmath/tests/m3math_test.cpp +++ b/indra/llmath/tests/m3math_test.cpp @@ -36,11 +36,11 @@ #include "../v3dmath.h" #include "../test/lltut.h" -
-#if LL_WINDOWS
-// disable unreachable code warnings caused by usage of skip.
-#pragma warning(disable: 4702)
-#endif
+ +#if LL_WINDOWS +// disable unreachable code warnings caused by usage of skip. +#pragma warning(disable: 4702) +#endif namespace tut { |