From 17ea4ed8f5c4b08668223897c6de87dd3bdd598c Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Fri, 2 Sep 2011 15:28:16 -0400
Subject: Fixed service_reference to work correctly with external classes

---
 modules/extra/ldap.h                    | 4 ++--
 modules/extra/m_ldap_authentication.cpp | 2 +-
 modules/extra/m_ldap_oper.cpp           | 2 +-
 modules/extra/m_xmlrpc.cpp              | 2 +-
 modules/extra/m_xmlrpc_main.cpp         | 2 +-
 modules/extra/sql.h                     | 4 ++--
 modules/extra/ssl.h                     | 4 ++--
 modules/extra/xmlrpc.h                  | 4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'modules/extra')

diff --git a/modules/extra/ldap.h b/modules/extra/ldap.h
index 7ac0d545f..e4be8a1a3 100644
--- a/modules/extra/ldap.h
+++ b/modules/extra/ldap.h
@@ -111,10 +111,10 @@ class LDAPInterface
 	virtual void OnError(const LDAPResult &err) { }
 };
 
-class LDAPProvider : public Service<LDAPProvider>
+class LDAPProvider : public Service<Base>
 {
  public:
-	LDAPProvider(Module *c, const Anope::string &n) : Service<LDAPProvider>(c, n) { }
+	LDAPProvider(Module *c, const Anope::string &n) : Service<Base>(c, n) { }
 
 	/** Attempt to bind to the LDAP server as an admin
 	 * @param i The LDAPInterface the result is sent to
diff --git a/modules/extra/m_ldap_authentication.cpp b/modules/extra/m_ldap_authentication.cpp
index 4b1b8ca27..25d75a410 100644
--- a/modules/extra/m_ldap_authentication.cpp
+++ b/modules/extra/m_ldap_authentication.cpp
@@ -165,7 +165,7 @@ class OnRegisterInterface : public LDAPInterface
 
 class NSIdentifyLDAP : public Module
 {
-	service_reference<LDAPProvider> ldap;
+	service_reference<LDAPProvider, Base> ldap;
 	IdentifyInterface iinterface;
 	OnIdentifyInterface oninterface;
 	OnRegisterInterface orinterface;
diff --git a/modules/extra/m_ldap_oper.cpp b/modules/extra/m_ldap_oper.cpp
index 7ea68dc67..59ad0e670 100644
--- a/modules/extra/m_ldap_oper.cpp
+++ b/modules/extra/m_ldap_oper.cpp
@@ -76,7 +76,7 @@ class IdentifyInterface : public LDAPInterface
 
 class LDAPOper : public Module
 {
-	service_reference<LDAPProvider> ldap;
+	service_reference<LDAPProvider, Base> ldap;
 	IdentifyInterface iinterface;
 
 	Anope::string binddn;
diff --git a/modules/extra/m_xmlrpc.cpp b/modules/extra/m_xmlrpc.cpp
index 5a5556822..01cbc7c85 100644
--- a/modules/extra/m_xmlrpc.cpp
+++ b/modules/extra/m_xmlrpc.cpp
@@ -220,7 +220,7 @@ class ModuleXMLRPC;
 static ModuleXMLRPC *me;
 class ModuleXMLRPC : public Module
 {
-	service_reference<SSLService> sslref;
+	service_reference<SSLService, Base> sslref;
 
  public:
 	MyXMLRPCServiceInterface xmlrpcinterface;
diff --git a/modules/extra/m_xmlrpc_main.cpp b/modules/extra/m_xmlrpc_main.cpp
index ee8306e34..a8294b576 100644
--- a/modules/extra/m_xmlrpc_main.cpp
+++ b/modules/extra/m_xmlrpc_main.cpp
@@ -255,7 +255,7 @@ class MyXMLRPCEvent : public XMLRPCEvent
 
 class ModuleXMLRPCMain : public Module
 {
-	service_reference<XMLRPCServiceInterface> xmlrpc;
+	service_reference<XMLRPCServiceInterface, Base> xmlrpc;
 
 	MyXMLRPCEvent stats;
 
diff --git a/modules/extra/sql.h b/modules/extra/sql.h
index bc7267ce0..2487b2305 100644
--- a/modules/extra/sql.h
+++ b/modules/extra/sql.h
@@ -108,10 +108,10 @@ class SQLInterface
 
 /** Class providing the SQL service, modules call this to execute queries
  */
-class SQLProvider : public Service<SQLProvider>
+class SQLProvider : public Service<Base>
 {
  public:
-	SQLProvider(Module *c, const Anope::string &n) : Service<SQLProvider>(c, n) { }
+	SQLProvider(Module *c, const Anope::string &n) : Service<Base>(c, n) { }
 
 	virtual void Run(SQLInterface *i, const SQLQuery &query) = 0;
 
diff --git a/modules/extra/ssl.h b/modules/extra/ssl.h
index 8261e4705..5b404067a 100644
--- a/modules/extra/ssl.h
+++ b/modules/extra/ssl.h
@@ -1,8 +1,8 @@
 
-class SSLService : public Service<SSLService>
+class SSLService : public Service<Base>
 {
  public:
-	SSLService(Module *o, const Anope::string &n) : Service<SSLService>(o, n) { }
+	SSLService(Module *o, const Anope::string &n) : Service<Base>(o, n) { }
 	
 	virtual void Init(Socket *s) = 0;
 };
diff --git a/modules/extra/xmlrpc.h b/modules/extra/xmlrpc.h
index 3a5c05332..a76400728 100644
--- a/modules/extra/xmlrpc.h
+++ b/modules/extra/xmlrpc.h
@@ -55,10 +55,10 @@ class XMLRPCEvent
 	virtual void Run(XMLRPCServiceInterface *iface, XMLRPCClientSocket *source, XMLRPCRequest *request) = 0;
 };
 
-class XMLRPCServiceInterface : public Service<XMLRPCServiceInterface>
+class XMLRPCServiceInterface : public Service<Base>
 {
  public:
-	XMLRPCServiceInterface(Module *creator, const Anope::string &sname) : Service<XMLRPCServiceInterface>(creator, sname) { }
+	XMLRPCServiceInterface(Module *creator, const Anope::string &sname) : Service<Base>(creator, sname) { }
 
 	virtual void Register(XMLRPCEvent *event) = 0;
 
-- 
cgit