diff options
| -rw-r--r-- | paludis/repository.cc | 2 | ||||
| -rw-r--r-- | paludis/repository.hh | 3 | ||||
| -rw-r--r-- | paludis/repository_name_cache.cc | 2 | ||||
| -rw-r--r-- | paludis/repository_name_cache.hh | 2 | ||||
| -rw-r--r-- | paludis/util/exception.hh | 4 |
5 files changed, 6 insertions, 7 deletions
diff --git a/paludis/repository.cc b/paludis/repository.cc index 6e0cc7e5f..e1b247a09 100644 --- a/paludis/repository.cc +++ b/paludis/repository.cc @@ -139,7 +139,7 @@ Repository::~Repository() } const RepositoryName -Repository::name() const +Repository::name() const noexcept { return _imp->name; } diff --git a/paludis/repository.hh b/paludis/repository.hh index 358e79bc3..a16171a8f 100644 --- a/paludis/repository.hh +++ b/paludis/repository.hh @@ -275,8 +275,7 @@ namespace paludis /** * Return our name. */ - const RepositoryName name() const PALUDIS_ATTRIBUTE((nothrow)) - PALUDIS_ATTRIBUTE((warn_unused_result)); + const RepositoryName name() const noexcept PALUDIS_ATTRIBUTE((warn_unused_result)); ///\} diff --git a/paludis/repository_name_cache.cc b/paludis/repository_name_cache.cc index 87ee32a7a..a47e1c4d3 100644 --- a/paludis/repository_name_cache.cc +++ b/paludis/repository_name_cache.cc @@ -313,7 +313,7 @@ RepositoryNameCache::remove(const QualifiedPackageName & q) } bool -RepositoryNameCache::usable() const +RepositoryNameCache::usable() const noexcept { return _imp->usable; } diff --git a/paludis/repository_name_cache.hh b/paludis/repository_name_cache.hh index eac19e72f..440291917 100644 --- a/paludis/repository_name_cache.hh +++ b/paludis/repository_name_cache.hh @@ -84,7 +84,7 @@ namespace paludis * Initially this will be true. After the first query the value may * change to false (the query will return a zero pointer too). */ - bool usable() const PALUDIS_ATTRIBUTE((nothrow)); + bool usable() const noexcept; /** * Implement cache regeneration. diff --git a/paludis/util/exception.hh b/paludis/util/exception.hh index 9b6674b66..9c0d9e3d2 100644 --- a/paludis/util/exception.hh +++ b/paludis/util/exception.hh @@ -96,14 +96,14 @@ namespace paludis ///\name Basic operations ///\{ - virtual ~Exception() PALUDIS_ATTRIBUTE((nothrow)); + virtual ~Exception(); ///\} /** * Return our descriptive error message. */ - const std::string & message() const noexcept PALUDIS_ATTRIBUTE((nothrow)); + const std::string & message() const noexcept; /** * Make a backtrace. |