From a248138cedaa1095907e9f9177f613a1940ae377 Mon Sep 17 00:00:00 2001
From: "arseny.kapoulkine"
 <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>
Date: Tue, 1 Jun 2010 05:40:03 +0000
Subject: Constant deprecation is disabled only on old IntelC, removed
 deprecation warnings with appropriate define instead of disabling warning via
 pragma

git-svn-id: http://pugixml.googlecode.com/svn/trunk@489 99668b35-9821-0410-8761-19e4c4f06640
---
 src/pugixml.cpp   | 5 ++++-
 src/pugixml.hpp   | 4 ++--
 src/pugixpath.cpp | 8 +++++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/pugixml.cpp b/src/pugixml.cpp
index 0706ef4..7f6e13a 100644
--- a/src/pugixml.cpp
+++ b/src/pugixml.cpp
@@ -11,6 +11,10 @@
  * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
  */
 
+#ifdef _MSC_VER
+#	define _CRT_SECURE_NO_WARNINGS // disable deprecation warnings for CRT functions
+#endif
+
 #include "pugixml.hpp"
 
 #if !defined(PUGIXML_NO_XPATH) && defined(PUGIXML_NO_EXCEPTIONS)
@@ -34,7 +38,6 @@
 
 #ifdef _MSC_VER
 #	pragma warning(disable: 4127) // conditional expression is constant
-#	pragma warning(disable: 4996) // this function or variable may be unsafe
 #endif
 
 #ifdef __BORLANDC__
diff --git a/src/pugixml.hpp b/src/pugixml.hpp
index d278358..6f4cece 100644
--- a/src/pugixml.hpp
+++ b/src/pugixml.hpp
@@ -232,7 +232,7 @@ namespace pugi
 	 *
 	 * \deprecated This flag is deprecated
  	 */
-#ifndef __INTEL_COMPILER
+#if !defined(__INTEL_COMPILER) || __INTEL_COMPILER > 800
 	PUGIXML_DEPRECATED
 #endif
  	const unsigned int parse_wnorm_attribute	= 0x0040;
@@ -303,7 +303,7 @@ 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
-#ifndef __INTEL_COMPILER
+#if !defined(__INTEL_COMPILER) || __INTEL_COMPILER > 800
 	PUGIXML_DEPRECATED
 #endif
 	const unsigned int format_write_bom_utf8 = format_write_bom;
diff --git a/src/pugixpath.cpp b/src/pugixpath.cpp
index 75d0e6e..77d1e71 100644
--- a/src/pugixpath.cpp
+++ b/src/pugixpath.cpp
@@ -11,6 +11,11 @@
  * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
  */
 
+#ifdef _MSC_VER
+#	define _CRT_SECURE_NO_WARNINGS // disable deprecation warnings for CRT functions
+#	define _SCL_SECURE_NO_WARNINGS // disable deprecation warnings for STL functions
+#endif
+
 #include "pugixml.hpp"
 
 #ifndef PUGIXML_NO_XPATH
@@ -35,11 +40,8 @@
 typedef __int32 int32_t;
 #endif
 
-
 #if defined(_MSC_VER)
 #	pragma warning(disable: 4127) // conditional expression is constant
-#	pragma warning(disable: 4702) // unreachable code
-#	pragma warning(disable: 4996) // this function or variable may be unsafe
 #endif
 
 #include <algorithm>
-- 
cgit v1.2.3