From d1ccfc5495524758161d5004a78f834f47f9c017 Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Wed, 5 Oct 2011 15:33:53 -0400
Subject: 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.
---
indra/test/llsd_new_tut.cpp | 8 +++++---
1 file 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);
--
cgit v1.2.3