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

Refactor noexcept macros

Browse Source 
Define noexcept using _MSC_VER instead of _MSC_FULL_VER (first release
of MSVC 2015 should have it), remove redundant PUGIXML_HAS_NOEXCEPT and
define PUGIXML_NOEXCEPT_IF_NOT_COMPACT in terms of PUGIXML_NOEXCEPT.
This commit is contained in:
Arseny Kapoulkine 2018-03-15 22:31:13 -07:00
parent 655bc825a1
commit 951c8f15d2
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/pugixml.hpp
View File

@ -82,23 +82,21 @@
#endif
// If C++ is 2011 or higher, add 'noexcept' specifiers
#ifndef PUGIXML_HAS_NOEXCEPT
#ifndef PUGIXML_NOEXCEPT
# if __cplusplus >= 201103
# define PUGIXML_HAS_NOEXCEPT
# elif defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023026
# define PUGIXML_HAS_NOEXCEPT
# define PUGIXML_NOEXCEPT noexcept
# elif defined(_MSC_VER) && _MSC_VER >= 1900
# define PUGIXML_NOEXCEPT noexcept
# else
# define PUGIXML_NOEXCEPT
# endif
#endif
#ifdef PUGIXML_HAS_NOEXCEPT
# define PUGIXML_NOEXCEPT noexcept
# ifdef PUGIXML_COMPACT
// Some functions can not be noexcept in compact mode
#ifdef PUGIXML_COMPACT
# define PUGIXML_NOEXCEPT_IF_NOT_COMPACT
# else
# define PUGIXML_NOEXCEPT_IF_NOT_COMPACT noexcept
# endif
#else
# define PUGIXML_NOEXCEPT
# define PUGIXML_NOEXCEPT_IF_NOT_COMPACT
# define PUGIXML_NOEXCEPT_IF_NOT_COMPACT PUGIXML_NOEXCEPT
#endif
// If C++ is 2011 or higher, add 'override' qualifiers