aboutsummaryrefslogtreecommitdiff
path: root/paludis
diff options
context:
space:
mode:
authorAvatar Wouter van Kesteren <woutershep@gmail.com> 2013-04-18 16:54:39 +0200
committerAvatar Wouter van Kesteren <woutershep@gmail.com> 2013-04-28 00:19:21 +0200
commit149850cb8bc0d261dd9f93161e5bf1f132fe6ed2 (patch)
tree1c67b193c15a090942d6ecf58eaa18b6d0bf24e4 /paludis
parenteb5bcb8eaf1a971491541ed646db224c3136063b (diff)
downloadpaludis-149850cb8bc0d261dd9f93161e5bf1f132fe6ed2.tar.gz
paludis-149850cb8bc0d261dd9f93161e5bf1f132fe6ed2.tar.xz
Mark ~RunningProcessHandle() as noexcept(false)
Diffstat (limited to 'paludis')
-rw-r--r--paludis/util/attributes.hh6
-rw-r--r--paludis/util/process.cc2
-rw-r--r--paludis/util/process.hh2
3 files changed, 8 insertions, 2 deletions
diff --git a/paludis/util/attributes.hh b/paludis/util/attributes.hh
index fa0f0302d..4fe4cef82 100644
--- a/paludis/util/attributes.hh
+++ b/paludis/util/attributes.hh
@@ -72,6 +72,12 @@
# define PALUDIS_HIDDEN
#endif
+#if defined(PALUDIS_HAVE_NOEXCEPT)
+# define PALUDIS_NOEXCEPT(x) noexcept(x)
+#else
+# define PALUDIS_NOEXCEPT(x)
+#endif
+
#define PALUDIS_TLS static __thread
#endif
diff --git a/paludis/util/process.cc b/paludis/util/process.cc
index bf256fe57..ff0cf5a3d 100644
--- a/paludis/util/process.cc
+++ b/paludis/util/process.cc
@@ -1012,7 +1012,7 @@ RunningProcessHandle::RunningProcessHandle(pid_t p, std::unique_ptr<RunningProce
{
}
-RunningProcessHandle::~RunningProcessHandle()
+RunningProcessHandle::~RunningProcessHandle() PALUDIS_NOEXCEPT(false)
{
if (-1 != _imp->pid)
{
diff --git a/paludis/util/process.hh b/paludis/util/process.hh
index 40f1fb0f9..5cebe8c97 100644
--- a/paludis/util/process.hh
+++ b/paludis/util/process.hh
@@ -125,7 +125,7 @@ namespace paludis
const pid_t,
std::unique_ptr<RunningProcessThread> &&);
- ~RunningProcessHandle();
+ ~RunningProcessHandle() PALUDIS_NOEXCEPT(false);
RunningProcessHandle(RunningProcessHandle &&);
RunningProcessHandle(const RunningProcessHandle &) = delete;