diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-10-05 15:33:53 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-10-05 15:33:53 -0400 |
| commit | d1ccfc5495524758161d5004a78f834f47f9c017 (patch) | |
| tree | 45abb066dbb25394251231ea0d996fe043bc842c /indra/test/llsd_new_tut.cpp | |
| parent | bf7e1bb2d2b78d5f49c8c2276308646ce4854a29 (diff) | |
Changed the handling of the different naming of fpclassify on windows and Linux in llsd_new_tut.cpp to be more clean at Nat's recommendation.
Diffstat (limited to 'indra/test/llsd_new_tut.cpp')
| -rw-r--r-- | indra/test/llsd_new_tut.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/test/llsd_new_tut.cpp b/indra/test/llsd_new_tut.cpp index 18bc03d5d6..b2fa54a688 100644 --- a/indra/test/llsd_new_tut.cpp +++ b/indra/test/llsd_new_tut.cpp @@ -34,13 +34,15 @@ #if LL_WINDOWS #include <float.h> -namespace std +namespace { int fpclassify(double x) { return _fpclass(x); } } +#else +using std::fpclassify; #endif namespace tut @@ -229,8 +231,8 @@ namespace tut } else { - int left = std::fpclassify(v.asReal()); - int right = std::fpclassify(eReal); + int left = fpclassify(v.asReal()); + int right = fpclassify(eReal); ensure_equals(s+" to real", left, right); // ensure_equals(s+" to string", v.asString(), eString); |