Fix build errors on CentOS 6 and OpenBSD.

[user/henk/code/inspircd.git] / include / bancache.h

diff --git a/include/bancache.h b/include/bancache.h
index 70ec09f0233ce0e5c84c05e4f0355e6a654132d3..6e19e1ebe753d4afb0a3e309bb20e323782edfb7 100644 (file)
--- a/include/bancache.h
+++ b/include/bancache.h
@@ -18,8 +18,7 @@
  */
 
 
-#ifndef BANCACHE_H
-#define BANCACHE_H
+#pragma once
 
 /** Stores a cached ban entry.
  * Each ban has one of these hashed in a hash_map to make for faster removal
@@ -41,25 +40,22 @@ class CoreExport BanCacheHit
         */
        time_t Expiry;
 
-       BanCacheHit(const std::string &type, const std::string &reason, time_t seconds)
-               : Type(type), Reason(reason), Expiry(ServerInstance->Time() + seconds)
-       {
-       }
+       BanCacheHit(const std::string& type, const std::string& reason, time_t seconds);
 
        bool IsPositive() const { return (!Reason.empty()); }
 };
 
-/* A container of ban cache items.
- * must be defined after class BanCacheHit.
- */
-typedef std::tr1::unordered_map<std::string, BanCacheHit*, std::tr1::hash<std::string> > BanCacheHash;
-
 /** A manager for ban cache, which allocates and deallocates and checks cached bans.
  */
 class CoreExport BanCacheManager
 {
- private:
-       BanCacheHash* BanHash;
+       /** A container of ban cache items.
+        */
+       typedef TR1NS::unordered_map<std::string, BanCacheHit*, TR1NS::hash<std::string> > BanCacheHash;
+
+       BanCacheHash BanHash;
+       bool RemoveIfExpired(BanCacheHash::iterator& it);
+
  public:
 
        /** Creates and adds a Ban Cache item.
@@ -77,12 +73,5 @@ class CoreExport BanCacheManager
         */
        void RemoveEntries(const std::string& type, bool positive);
 
-       BanCacheManager()
-       {
-               this->BanHash = new BanCacheHash();
-       }
        ~BanCacheManager();
-       void RehashCache();
 };
-
-#endif