Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

throw() -> noexcept #623

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/manual.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
----

Expand Down Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/pugixml.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12391,7 +12391,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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/pugixml.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1314,7 +1314,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;
Expand Down
Loading