From c21c682c4e79564b1117c4984f88c514ac92ee91 Mon Sep 17 00:00:00 2001 From: "arseny.kapoulkine" Date: Wed, 16 Feb 2011 20:00:36 +0000 Subject: Fixed C++/CLI compilation error git-svn-id: http://pugixml.googlecode.com/svn/trunk@806 99668b35-9821-0410-8761-19e4c4f06640 --- src/pugixml.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pugixml.cpp b/src/pugixml.cpp index d5539c7..0df89d2 100644 --- a/src/pugixml.cpp +++ b/src/pugixml.cpp @@ -40,6 +40,7 @@ # pragma warning(disable: 4611) // interaction between '_setjmp' and C++ object destruction is non-portable # pragma warning(disable: 4702) // unreachable code # pragma warning(disable: 4996) // this function or variable may be unsafe +# pragma warning(disable: 4793) // function compiled as native: presence of '_setjmp' makes a function unmanaged #endif #ifdef __INTEL_COMPILER @@ -5634,7 +5635,7 @@ namespace #if defined(MSVC_CRT_VERSION) || defined(__BORLANDC__) if (_finite(value)) return (value == 0) ? PUGIXML_TEXT("0") : 0; if (_isnan(value)) return PUGIXML_TEXT("NaN"); - return PUGIXML_TEXT("-Infinity") + (value > 0); + return value > 0 ? PUGIXML_TEXT("Infinity") : PUGIXML_TEXT("-Infinity"); #elif defined(fpclassify) && defined(FP_NAN) && defined(FP_INFINITE) && defined(FP_ZERO) switch (fpclassify(value)) { -- cgit v1.2.3