aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--paludis/repository.cc2
-rw-r--r--paludis/repository.hh3
-rw-r--r--paludis/repository_name_cache.cc2
-rw-r--r--paludis/repository_name_cache.hh2
-rw-r--r--paludis/util/exception.hh4
5 files changed, 6 insertions, 7 deletions
diff --git a/paludis/repository.cc b/paludis/repository.cc
index 6e0cc7e..e1b247a 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 358e79b..a16171a 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 87ee32a..a47e1c4 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 eac19e7..4402919 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 9b6674b..9c0d9e3 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.