diff options
author | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-01-16 07:33:43 -0800 |
---|---|---|
committer | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-01-16 07:33:43 -0800 |
commit | 22923e12267ce18197b73c2dfae3eb626167fd9d (patch) | |
tree | 3ebd47bcf6cff73d68777a7e2744b5020cc5f2d4 | |
parent | 3626372cc9cd23c87ddbd54689699bd60e252ad5 (diff) | |
parent | 5b6fa9589fe61c4ff031f62e822044979c2a46fd (diff) |
Merge pull request #12 from cassej/master
fix exception declaration
-rw-r--r-- | include/exception.h | 2 | ||||
-rw-r--r-- | include/origexception.h | 3 | ||||
-rw-r--r-- | src/origexception.cpp | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/include/exception.h b/include/exception.h index 061c106..429b2cf 100644 --- a/include/exception.h +++ b/include/exception.h @@ -42,7 +42,7 @@ public: /** * Destructor */ - virtual ~Exception() + virtual ~Exception() throw() { } diff --git a/include/origexception.h b/include/origexception.h index bce0945..ca59e7f 100644 --- a/include/origexception.h +++ b/include/origexception.h @@ -47,7 +47,7 @@ public: /** * Destructor */ - virtual ~OrigException(); + virtual ~OrigException() throw(); /** * Restore the exception - because the exception was not handled by C++ code @@ -60,4 +60,3 @@ public: * End of namespace */ } - diff --git a/src/origexception.cpp b/src/origexception.cpp index 299730e..3cdd42a 100644 --- a/src/origexception.cpp +++ b/src/origexception.cpp @@ -49,7 +49,7 @@ OrigException::OrigException(OrigException &&exception) : /** * Destructor */ -OrigException::~OrigException() +OrigException::~OrigException() noexcept { // skip if the exception was restored if (_restored) return; |