From b0d03755f23f72e747e9874c32d00b5cf3f955cf Mon Sep 17 00:00:00 2001 From: brain Date: Tue, 20 Jun 2006 11:26:57 +0000 Subject: [PATCH] Class Request and class Event now take a void* in their constructor to save on a cast. Please note that the data type *returned* by GetData() in both cases is still char*, as C++ will not let you return a void*. This to be addressed by someone else with templates when they have the time. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4038 e03df62e-2008-0410-955e-edbf42e46eb7 --- include/modules.h | 8 ++++---- src/modules.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/modules.h b/include/modules.h index f15341e01..426ec9a65 100644 --- a/include/modules.h +++ b/include/modules.h @@ -190,7 +190,7 @@ class Request : public ModuleMessage protected: /** This member holds a pointer to arbitary data set by the emitter of the message */ - char* data; + void* data; /** This is a pointer to the sender of the message, which can be used to * directly trigger events, or to create a reply. */ @@ -201,7 +201,7 @@ class Request : public ModuleMessage public: /** Create a new Request */ - Request(char* anydata, Module* src, Module* dst); + Request(void* anydata, Module* src, Module* dst); /** Fetch the Request data */ char* GetData(); @@ -230,7 +230,7 @@ class Event : public ModuleMessage protected: /** This member holds a pointer to arbitary data set by the emitter of the message */ - char* data; + void* data; /** This is a pointer to the sender of the message, which can be used to * directly trigger events, or to create a reply. */ @@ -243,7 +243,7 @@ class Event : public ModuleMessage public: /** Create a new Event */ - Event(char* anydata, Module* src, const std::string &eventid); + Event(void* anydata, Module* src, const std::string &eventid); /** Get the Event data */ char* GetData(); diff --git a/src/modules.cpp b/src/modules.cpp index ab49859fe..24b3e1945 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -156,11 +156,11 @@ Version::Version(int major, int minor, int revision, int build, int flags) : Maj Admin::Admin(std::string name, std::string email, std::string nick) : Name(name), Email(email), Nick(nick) { }; -Request::Request(char* anydata, Module* src, Module* dst) : data(anydata), source(src), dest(dst) { }; +Request::Request(void* anydata, Module* src, Module* dst) : data(anydata), source(src), dest(dst) { }; char* Request::GetData() { - return this->data; + return (char*)this->data; } Module* Request::GetSource() @@ -185,11 +185,11 @@ char* Request::Send() } } -Event::Event(char* anydata, Module* src, const std::string &eventid) : data(anydata), source(src), id(eventid) { }; +Event::Event(void* anydata, Module* src, const std::string &eventid) : data(anydata), source(src), id(eventid) { }; char* Event::GetData() { - return this->data; + return (char*)this->data; } Module* Event::GetSource() -- 2.39.5