Inherit ModuleException from std::exception rather than classbase

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5740 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/include/modules.h b/include/modules.h
index 48192959591f7f6b8b1330d2de079953d99f53f8..818ef88cdb2815f0661d4383a924fde0ef8c397d 100644 (file)
--- a/include/modules.h
+++ b/include/modules.h
@@ -313,7 +313,7 @@ class Event : public ModuleMessage
  * be loaded. If this happens, the error message returned by ModuleException::GetReason will be displayed to the user
  * attempting to load the module, or dumped to the console if the ircd is currently loading for the first time.
  */
-class ModuleException : public classbase
+class ModuleException : public std::exception
 {
  private:
        /** Holds the error message to be displayed
@@ -328,8 +328,9 @@ class ModuleException : public classbase
        ModuleException(std::string message) : err(message) {}
        /** This destructor solves world hunger, cancels the world debt, and causes the world to end.
         * Actually no, it does nothing. Never mind.
+        * @throws Nothing!
         */
-       virtual ~ModuleException() {};
+       virtual ~ModuleException() throw() {};
        /** Returns the reason for the exception.
         * The module should probably put something informative here as the user will see this upon failure.
         */

diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index f5fce322b670436a31f2fb1e2b8a6e4f77593e99..22bd3619b6c89a9a1b578a9308a298302fa5279b 100644 (file)
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -192,6 +192,7 @@ class HelpopException : public ModuleException
        std::string err;
  public:
        HelpopException(std::string message) : err(message) { }
+       ~HelpopException() throw() { };
        virtual const char* GetReason() { return err.c_str(); }
 };
 

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index 7354420a975041e6c8e0cb0ac62b03b387d0ee22..35fb02085c30e9e240418e94104154149b6cd44e 100644 (file)
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -70,6 +70,8 @@ class RandquoteException : public ModuleException
  public:
        RandquoteException(const std::string &message) : err(message) { }
 
+       ~RandquoteException() throw () { }
+
        virtual const char* GetReason()
        {
                return err.c_str();