3party/pugixml
0
0
Fork 0
mirror of https://github.com/zeux/pugixml.git synced 2024-12-25 20:14:10 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #623 from r-barnes/master

Browse Source 
throw() -> noexcept
This commit is contained in:
Arseny Kapoulkine 2024-10-22 18:59:45 -07:00 committed by GitHub
commit 7e702740ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/manual.adoc
View File

@ -2115,7 +2115,7 @@ By default, XPath functions throw `xpath_exception` object in case of errors; ad
[source]
----
virtual const char* xpath_exception::what() const throw();
virtual const char* xpath_exception::what() const noexcept;
const xpath_parse_result& xpath_exception::result() const;
----
@ -3140,7 +3140,7 @@ const unsigned int +++<a href="#parse_wnorm_attribute">parse_wnorm_attribute</a>
operator +++<a href="#xpath_query::unspecified_bool_type">unspecified_bool_type</a>+++() const;
+++<span class="tok-k">class</span> <a href="#xpath_exception">xpath_exception</a>+++: public std::exception
virtual const char* +++<a href="#xpath_exception::what">what</a>+++() const throw();
virtual const char* +++<a href="#xpath_exception::what">what</a>+++() const noexcept;
const xpath_parse_result& +++<a href="#xpath_exception::result">result</a>+++() const;

2
src/pugixml.cpp
View File

@ -12442,7 +12442,7 @@ namespace pugi
assert(_result.error);
}
PUGI_IMPL_FN const char* xpath_exception::what() const throw()
PUGI_IMPL_FN const char* xpath_exception::what() const PUGIXML_NOEXCEPT
{
return _result.error;
}

6
src/pugixml.hpp
View File

@ -96,14 +96,14 @@
# endif
#endif
// If C++ is 2011 or higher, add 'noexcept' specifiers
// If C++ is 2011 or higher, use 'noexcept' specifiers
#ifndef PUGIXML_NOEXCEPT
# if __cplusplus >= 201103
# define PUGIXML_NOEXCEPT noexcept
# elif defined(_MSC_VER) && _MSC_VER >= 1900
# define PUGIXML_NOEXCEPT noexcept
# else
# define PUGIXML_NOEXCEPT
# define PUGIXML_NOEXCEPT throw()
# endif
#endif
@ -1348,7 +1348,7 @@ namespace pugi
explicit xpath_exception(const xpath_parse_result& result);
// Get error message
virtual const char* what() const throw() PUGIXML_OVERRIDE;
virtual const char* what() const PUGIXML_NOEXCEPT PUGIXML_OVERRIDE;
// Get parse result
const xpath_parse_result& result() const;