Replaced _CRT_SECURE macros with #pragma to avoid warnings because of multiple macro definitions/forced includes

git-svn-id: http://pugixml.googlecode.com/svn/trunk@526 99668b35-9821-0410-8761-19e4c4f06640

2 files changed, 2 insertions, 9 deletions

diff --git a/src/pugixml.cpp b/src/pugixml.cpp
index 51b7791..7de240f 100644
--- a/src/pugixml.cpp
+++ b/src/pugixml.cpp
@@ -11,10 +11,6 @@
  * 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 <stdlib.h>

@@ -36,6 +32,7 @@
 #ifdef _MSC_VER

 #	pragma warning(disable: 4127) // conditional expression is constant

 #	pragma warning(disable: 4611) // interaction between '_setjmp' and C++ object destruction is non-portable

+#	pragma warning(disable: 4996) // this function or variable may be unsafe

 #endif

 

 #ifdef __INTEL_COMPILER

diff --git a/src/pugixpath.cpp b/src/pugixpath.cpp
index 17674fb..90ae9bd 100644
--- a/src/pugixpath.cpp
+++ b/src/pugixpath.cpp
@@ -11,11 +11,6 @@
  * 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

@@ -42,6 +37,7 @@ typedef __int32 int32_t;
 

 #if defined(_MSC_VER)

 #	pragma warning(disable: 4127) // conditional expression is constant

+#	pragma warning(disable: 4996) // this function or variable may be unsafe

 #endif

 

 #ifdef __SNC__