From 1172d9bc4a1dbb2a16513bd918ade85486f54243 Mon Sep 17 00:00:00 2001
From: "arseny.kapoulkine"
<arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>
Date: Sat, 8 May 2010 17:32:01 +0000
Subject: [PATCH] Fixed tests in NO_STL mode and IntelC deprecated constant
git-svn-id: http://pugixml.googlecode.com/svn/trunk@388 99668b35-9821-0410-8761-19e4c4f06640
---
src/pugixml.hpp | 5 ++++-
tests/test_deprecated.cpp | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/pugixml.hpp b/src/pugixml.hpp
index 6e3fc994..2206450e 100644
--- a/src/pugixml.hpp
+++ b/src/pugixml.hpp
@@ -292,7 +292,10 @@ namespace pugi
const unsigned int format_write_bom = 0x02;
// \deprecated This constant is deprecated and will be removed in future versions; use format_write_bom instead
- PUGIXML_DEPRECATED const unsigned int format_write_bom_utf8 = format_write_bom;
+#ifndef __INTEL_COMPILER
+ PUGIXML_DEPRECATED
+#endif
+ const unsigned int format_write_bom_utf8 = format_write_bom;
/**
* If this flag is on, no indentation is performed and no line breaks are written to output file.
diff --git a/tests/test_deprecated.cpp b/tests/test_deprecated.cpp
index f401fbde..691b40a0 100644
--- a/tests/test_deprecated.cpp
+++ b/tests/test_deprecated.cpp
@@ -44,7 +44,8 @@ TEST(document_parse_transfer_ownership)
CHECK(doc.parse(transfer_ownership_tag(), text));
CHECK_NODE(doc, STR("<node />"));
}
-
+
+#ifndef PUGIXML_NO_STL
// as_utf16 - it's now as_wide
TEST(as_utf16)
{
@@ -57,3 +58,4 @@ TEST(as_utf16)
CHECK(as_utf16("?\xd0\x80\xe2\x80\xbd") == L"?\x0400\x203D");
#endif
}
+#endif
--
GitLab