organicmaps/pugixml
13
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity Actions

Intel C++ 11 has the same warning pop bug... Disable warning popping on all Intel C++ versions. Fixes Intel C++ 11 compilation in PUGIXML_NO_STL mode.

Browse source 
git-svn-id: http://pugixml.googlecode.com/svn/trunk@862 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine@gmail.com 2012-03-15 07:08:32 +00:00
parent 276aee800a
commit 800288d351
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/pugixml.cpp
View file

@ -50,7 +50,6 @@
#endif
#ifdef __INTEL_COMPILER
# pragma warning(push)
# pragma warning(disable: 177) // function was declared but never referenced
# pragma warning(disable: 279) // controlling expression is constant
# pragma warning(disable: 1478 1786) // function was declared "deprecated"
@ -9900,16 +9899,10 @@ namespace pugi
# pragma option pop
#endif
// Some Intel C++ versions (9, 10) do not properly keep warning state for function templates,
// Intel C++ does not properly keep warning state for function templates,
// so popping warning state at the end of translation unit leads to warnings in the middle.
#if !defined(__INTEL_COMPILER) || __INTEL_COMPILER >= 1100
# ifdef __INTEL_COMPILER
# pragma warning(pop)
# endif
# ifdef _MSC_VER
# pragma warning(pop)
# endif
#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
# pragma warning(pop)
#endif
// Undefine all local macros (makes sure we're not leaking macros in header-only mode)