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

Merge branch 'master' into add_noexcept

Browse Source
This commit is contained in:
Brandl, Matthäus (MBR) 2018-03-01 11:13:28 +01:00
commit ebe591ffeb
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pugixml.cpp
View File

@ -76,6 +76,10 @@
# pragma diag_suppress=237 // controlling expression is constant # pragma diag_suppress=237 // controlling expression is constant
#endif #endif
#ifdef __TI_COMPILER_VERSION__
# pragma diag_suppress 179 // function was declared but never referenced
#endif
// Inlining controls // Inlining controls
#if defined(_MSC_VER) && _MSC_VER >= 1300 #if defined(_MSC_VER) && _MSC_VER >= 1300
# define PUGI__NO_INLINE __declspec(noinline) # define PUGI__NO_INLINE __declspec(noinline)

2
src/pugixml.hpp
View File

@ -99,6 +99,8 @@
#ifndef PUGIXML_OVERRIDE #ifndef PUGIXML_OVERRIDE
# if __cplusplus >= 201103 # if __cplusplus >= 201103
# define PUGIXML_OVERRIDE override # define PUGIXML_OVERRIDE override
# elif defined(_MSC_VER) && _MSC_VER >= 1700
# define PUGIXML_OVERRIDE override
# else # else
# define PUGIXML_OVERRIDE # define PUGIXML_OVERRIDE
# endif # endif