Fix being able to see the modes of private/secret channels.

[user/henk/code/inspircd.git] / src / inspircd.cpp

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 8cc1dd8787d0f38458d1bf4f038394ab416284a7..dea4b45755fcfa595b91fc2c5164f91c7ae83448 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -136,15 +136,6 @@ namespace
 #endif
        }
 
-       // Deletes a pointer and then zeroes it.
-       template<typename T>
-       void DeleteZero(T*& pr)
-       {
-               T* p = pr;
-               pr = NULL;
-               delete p;
-       }
-
        // Drops to the unprivileged user/group specified in <security:runas{user,group}>.
        void DropRoot()
        {
@@ -423,9 +414,9 @@ void InspIRCd::Cleanup()
                delete FakeClient->server;
                FakeClient->cull();
        }
-       DeleteZero(this->FakeClient);
-       DeleteZero(this->XLines);
-       DeleteZero(this->Config);
+       stdalgo::delete_zero(this->FakeClient);
+       stdalgo::delete_zero(this->XLines);
+       stdalgo::delete_zero(this->Config);
        SocketEngine::Deinit();
        Logs->CloseLogs();
 }