External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Constant deprecation is disabled only on old IntelC, removed deprecation warnings with appropriate define instead of disabling warning via pragma

Browse Source 
git-svn-id: http://pugixml.googlecode.com/svn/trunk@489 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine 2010-06-01 05:40:03 +00:00
parent 1f8ba5aa60
commit a248138ced
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pugixml.cpp
View File

@ -11,6 +11,10 @@
* Copyright (C) 2003, by Kristen Wegner (kristen@tima.net) * 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" #include "pugixml.hpp"
#if !defined(PUGIXML_NO_XPATH) && defined(PUGIXML_NO_EXCEPTIONS) #if !defined(PUGIXML_NO_XPATH) && defined(PUGIXML_NO_EXCEPTIONS)
@ -34,7 +38,6 @@
#ifdef _MSC_VER #ifdef _MSC_VER
# pragma warning(disable: 4127) // conditional expression is constant # pragma warning(disable: 4127) // conditional expression is constant
# pragma warning(disable: 4996) // this function or variable may be unsafe
#endif #endif
#ifdef __BORLANDC__ #ifdef __BORLANDC__

4
src/pugixml.hpp
View File

@ -232,7 +232,7 @@ namespace pugi
* *
* \deprecated This flag is deprecated * \deprecated This flag is deprecated
*/ */
#ifndef __INTEL_COMPILER #if !defined(__INTEL_COMPILER) || __INTEL_COMPILER > 800
PUGIXML_DEPRECATED PUGIXML_DEPRECATED
#endif #endif
const unsigned int parse_wnorm_attribute = 0x0040; const unsigned int parse_wnorm_attribute = 0x0040;
@ -303,7 +303,7 @@ namespace pugi
const unsigned int format_write_bom = 0x02; const unsigned int format_write_bom = 0x02;
/// \deprecated This constant is deprecated and will be removed in future versions; use format_write_bom instead /// \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 PUGIXML_DEPRECATED
#endif #endif
const unsigned int format_write_bom_utf8 = format_write_bom; const unsigned int format_write_bom_utf8 = format_write_bom;

8
src/pugixpath.cpp
View File

@ -11,6 +11,11 @@
* Copyright (C) 2003, by Kristen Wegner (kristen@tima.net) * 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" #include "pugixml.hpp"
#ifndef PUGIXML_NO_XPATH #ifndef PUGIXML_NO_XPATH
@ -35,11 +40,8 @@
typedef __int32 int32_t; typedef __int32 int32_t;
#endif #endif
#if defined(_MSC_VER) #if defined(_MSC_VER)
# pragma warning(disable: 4127) // conditional expression is constant # 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 #endif
#include <algorithm> #include <algorithm>