aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Wouter van Kesteren <woutershep@gmail.com> 2015-05-08 03:08:23 +0200
committerAvatar Bo ├śrsted Andresen <zlin@exherbo.org> 2015-08-21 17:18:35 +0200
commite6dfb43fcbb0a760777376611035485c352e85ae (patch)
tree51d2351668660c2a4cf3f96df9dc8a011cdcb3ce
parentdd6bc465003c0ee9636768a33750535ab349e403 (diff)
downloadpaludis-e6dfb43fcbb0a760777376611035485c352e85ae.tar.gz
paludis-e6dfb43fcbb0a760777376611035485c352e85ae.tar.xz
Permit Context destructor to emit exception
In C++11 destructors are noexcept by default so the throw would have been a std::terminate. Change-Id: Ib55cc9312488e77e53b17ba7b1b54660c8af1da2 Reviewed-on: https://galileo.mailstation.de/gerrit/1891 Reviewed-by: Saleem Abdulrasool <compnerd@compnerd.org> Reviewed-by: Kylie McClain <somasis@exherbo.org>
-rw-r--r--paludis/util/exception.cc2
-rw-r--r--paludis/util/exception.hh2
2 files changed, 2 insertions, 2 deletions
diff --git a/paludis/util/exception.cc b/paludis/util/exception.cc
index 7ae5468..6a46e4a 100644
--- a/paludis/util/exception.cc
+++ b/paludis/util/exception.cc
@@ -45,7 +45,7 @@ Context::Context(const std::string & s)
context->push_back(s);
}
-Context::~Context()
+Context::~Context() noexcept(false)
{
if (! context)
throw InternalError(PALUDIS_HERE, "no context");
diff --git a/paludis/util/exception.hh b/paludis/util/exception.hh
index c8ca10e..0f5a5df 100644
--- a/paludis/util/exception.hh
+++ b/paludis/util/exception.hh
@@ -55,7 +55,7 @@ namespace paludis
Context(const std::string &);
- ~Context();
+ ~Context() noexcept(false);
///\}