diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-18 06:15:12 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-18 06:15:12 -0500 |
| commit | 17f79c802023d3b220986321f51757b102b70e81 (patch) | |
| tree | 93fd855bf772d1f0deac96a504323a707c112ea7 /indra/llmath/tests | |
| parent | d0b4c4a7b2c454d1a287af4a3a7b7342609d555d (diff) | |
| parent | c89e281de1420254f8028f4dff907cf1ae985d7a (diff) | |
merge changes for viewer-vs2010
Diffstat (limited to 'indra/llmath/tests')
| -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 { |