summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorarseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>2011-02-16 20:00:36 +0000
committerarseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>2011-02-16 20:00:36 +0000
commitc21c682c4e79564b1117c4984f88c514ac92ee91 (patch)
tree6bf7b2d591f902eba591b20fc9300f4f852848a9
parent5f4ecb9ec3f96ead5f41c1302aafc53d9e38e66f (diff)
Fixed C++/CLI compilation error
git-svn-id: http://pugixml.googlecode.com/svn/trunk@806 99668b35-9821-0410-8761-19e4c4f06640
-rw-r--r--src/pugixml.cpp3
1 files changed, 2 insertions, 1 deletions
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))
{