summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2014-03-10 04:55:03 -0400
committerAdam <Adam@anope.org>2014-03-10 04:56:17 -0400
commit3fef01e35bba71528a3d13f9d1bcfcab2b0270e3 (patch)
tree6e2af2958ce74afd3387a987462e677c002be8c0
parentb0597e35ec6720d3f736653caa67a9a496680c2c (diff)
Fix compile error in m_sasl_dh-aes and m_sasl_dh-blowfish on unusually old g++ versions
-rw-r--r--modules/extra/m_sasl_dh-aes.cpp10
-rw-r--r--modules/extra/m_sasl_dh-blowfish.cpp10
2 files changed, 10 insertions, 10 deletions
diff --git a/modules/extra/m_sasl_dh-aes.cpp b/modules/extra/m_sasl_dh-aes.cpp
index 0b720b9a7..a4fc5ea44 100644
--- a/modules/extra/m_sasl_dh-aes.cpp
+++ b/modules/extra/m_sasl_dh-aes.cpp
@@ -21,10 +21,10 @@ class DHAES : public Mechanism
}
public:
- struct Session : SASL::Session
+ struct DHAESSession : SASL::Session
{
DH* dh;
- Session(Mechanism *m, const Anope::string &u, DH* dh_params) : SASL::Session(m, u)
+ DHAESSession(Mechanism *m, const Anope::string &u, DH* dh_params) : SASL::Session(m, u)
{
if (!(dh = DH_new()))
return;
@@ -39,7 +39,7 @@ class DHAES : public Mechanism
}
}
- ~Session()
+ ~DHAESSession()
{
if (dh)
DH_free(dh);
@@ -50,7 +50,7 @@ class DHAES : public Mechanism
const size_t keysize;
SASL::Session* CreateSession(const Anope::string &uid) anope_override
{
- return new Session(this, uid, dh_params);
+ return new DHAESSession(this, uid, dh_params);
}
DHAES(Module *o) : Mechanism(o, "DH-AES"), keysize(256 / 8)
@@ -72,7 +72,7 @@ class DHAES : public Mechanism
void ProcessMessage(SASL::Session *session, const SASL::Message &m) anope_override
{
- Session *sess = anope_dynamic_static_cast<Session *>(session);
+ DHAESSession *sess = anope_dynamic_static_cast<DHAESSession *>(session);
if (!sess->dh)
{
diff --git a/modules/extra/m_sasl_dh-blowfish.cpp b/modules/extra/m_sasl_dh-blowfish.cpp
index c8ea020d5..1bfd50173 100644
--- a/modules/extra/m_sasl_dh-blowfish.cpp
+++ b/modules/extra/m_sasl_dh-blowfish.cpp
@@ -21,10 +21,10 @@ class DHBS : public Mechanism
}
public:
- struct Session : SASL::Session
+ struct DHBSSession : SASL::Session
{
DH* dh;
- Session(Mechanism *m, const Anope::string &u, DH* dh_params) : SASL::Session(m, u)
+ DHBSSession(Mechanism *m, const Anope::string &u, DH* dh_params) : SASL::Session(m, u)
{
if (!(dh = DH_new()))
return;
@@ -39,7 +39,7 @@ class DHBS : public Mechanism
}
}
- ~Session()
+ ~DHBSSession()
{
if (dh)
DH_free(dh);
@@ -50,7 +50,7 @@ class DHBS : public Mechanism
const size_t keysize;
SASL::Session* CreateSession(const Anope::string &uid) anope_override
{
- return new Session(this, uid, dh_params);
+ return new DHBSSession(this, uid, dh_params);
}
DHBS(Module *o) : Mechanism(o, "DH-BLOWFISH"), keysize(256 / 8)
@@ -72,7 +72,7 @@ class DHBS : public Mechanism
void ProcessMessage(SASL::Session *session, const SASL::Message &m) anope_override
{
- Session *sess = anope_dynamic_static_cast<Session *>(session);
+ DHBSSession *sess = anope_dynamic_static_cast<DHBSSession *>(session);
if (!sess->dh)
{