From 8f27f244d0a0525a43d7acd840d71e6ecbe9e046 Mon Sep 17 00:00:00 2001
From: "arseny.kapoulkine"
 <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>
Date: Thu, 1 Jul 2010 18:01:12 +0000
Subject: parse_wnorm_attribute is no longer deprecated (it's part of W3C
 recommendations, after all)

git-svn-id: http://pugixml.googlecode.com/svn/trunk@557 99668b35-9821-0410-8761-19e4c4f06640
---
 src/pugixml.cpp | 2 +-
 src/pugixml.hpp | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/pugixml.cpp b/src/pugixml.cpp
index ef30fb0..79a8fdf 100644
--- a/src/pugixml.cpp
+++ b/src/pugixml.cpp
@@ -1771,7 +1771,7 @@ namespace
 
 	strconv_attribute_t get_strconv_attribute(unsigned int optmask)
 	{
-		STATIC_ASSERT(parse_escapes == 0x10 && parse_eol == 0x20 && parse_wconv_attribute == 0x40);
+		STATIC_ASSERT(parse_escapes == 0x10 && parse_eol == 0x20 && parse_wconv_attribute == 0x40 && parse_wnorm_attribute == 0x80);
 		
 		switch ((optmask >> 4) & 15) // get bitmask for flags (wconv wnorm eol escapes)
 		{
diff --git a/src/pugixml.hpp b/src/pugixml.hpp
index afc4ddc..376d4e4 100644
--- a/src/pugixml.hpp
+++ b/src/pugixml.hpp
@@ -227,12 +227,7 @@ namespace pugi
  	 * 3. Leading/trailing whitespace characters are trimmed
  	 * 
  	 * This flag is off by default.
-	 *
-	 * \deprecated This flag is deprecated
  	 */
-#if !defined(__INTEL_COMPILER) || __INTEL_COMPILER > 800
-	PUGIXML_DEPRECATED
-#endif
  	const unsigned int parse_wnorm_attribute	= 0x0080;
 
  	/**
-- 
cgit v1.2.3