From: brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Tue, 14 Nov 2006 18:50:50 +0000 (+0000)
Subject: Inherit ModuleException from std::exception rather than classbase
X-Git-Tag: v2.0.23~6637
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=9f35df1ad1599f62f040261fec821b703a3643af;p=user%2Fhenk%2Fcode%2Finspircd.git

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 481929595..818ef88cd 100644
--- 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 f5fce322b..22bd3619b 100644
--- 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 7354420a9..35fb02085 100644
--- 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();