From 959fee59377edc4eaf285d8e72d3c2c41e9fe3ab Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 16 Feb 2014 18:27:46 -0500 Subject: [PATCH] Fix Windows build --- include/service.h | 2 +- modules/extra/m_sasl_dh-aes.cpp | 2 +- modules/extra/m_sasl_dh-blowfish.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/service.h b/include/service.h index 5245ab1c7..db0b2af4b 100644 --- a/include/service.h +++ b/include/service.h @@ -148,7 +148,7 @@ class ServiceReference : public Reference * creates its own service type (that other modules must include the header file * for), as the core is not compiled with it so there is no RTTI for it. */ - this->ref = static_cast(Service::FindService(this->type, this->name)); + this->ref = static_cast(::Service::FindService(this->type, this->name)); if (this->ref) this->ref->AddReference(this); } diff --git a/modules/extra/m_sasl_dh-aes.cpp b/modules/extra/m_sasl_dh-aes.cpp index c61430a62..0b720b9a7 100644 --- a/modules/extra/m_sasl_dh-aes.cpp +++ b/modules/extra/m_sasl_dh-aes.cpp @@ -17,7 +17,7 @@ class DHAES : public Mechanism BN_free(key); sasl->Fail(sess); - return delete sess; + delete sess; } public: diff --git a/modules/extra/m_sasl_dh-blowfish.cpp b/modules/extra/m_sasl_dh-blowfish.cpp index a31d4727b..c8ea020d5 100644 --- a/modules/extra/m_sasl_dh-blowfish.cpp +++ b/modules/extra/m_sasl_dh-blowfish.cpp @@ -17,7 +17,7 @@ class DHBS : public Mechanism BN_free(key); sasl->Fail(sess); - return delete sess; + delete sess; } public: