diff options
author | Oz Linden <oz@lindenlab.com> | 2014-12-17 14:28:58 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-12-17 14:28:58 -0500 |
commit | 4666497507b2489004a4ebcf77c0e33723291bcd (patch) | |
tree | 677050cb13533b17e2c5e170a8438aef221b85ca /indra/test/llsd_new_tut.cpp | |
parent | 11ecd9a2d97f2daeba932bcda557d3ae17956ed8 (diff) | |
parent | f8ed44f8ec80916e684c2783da02f89474710de6 (diff) |
merge up to latest changes from callum and nat
Diffstat (limited to 'indra/test/llsd_new_tut.cpp')
-rwxr-xr-x | indra/test/llsd_new_tut.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/test/llsd_new_tut.cpp b/indra/test/llsd_new_tut.cpp index 81db191ca6..458df3361e 100755 --- a/indra/test/llsd_new_tut.cpp +++ b/indra/test/llsd_new_tut.cpp @@ -33,18 +33,7 @@ #include "llsdtraits.h" #include "llstring.h" -#if LL_WINDOWS -#include <float.h> -namespace -{ - int fpclassify(double x) - { - return _fpclass(x); - } -} -#else using std::fpclassify; -#endif namespace tut { |