Simplify stringjoiner: take 1 parameter, join from begin() to end() and use space...

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

diff --git a/include/bancache.h b/include/bancache.h
index ea09d389f25bd9ef267ec05dc027c5e9458bee07..7f51ca75e673e187dccf9d4089a3ac3b68aa27e9 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
@@ -52,14 +51,15 @@ class CoreExport BanCacheHit
 /* 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;
+typedef TR1NS::unordered_map<std::string, BanCacheHit*, TR1NS::hash<std::string> > BanCacheHash;
 
 /** A manager for ban cache, which allocates and deallocates and checks cached bans.
  */
 class CoreExport BanCacheManager
 {
- private:
        BanCacheHash* BanHash;
+       bool RemoveIfExpired(BanCacheHash::iterator& it);
+
  public:
 
        /** Creates and adds a Ban Cache item.
@@ -83,5 +83,3 @@ class CoreExport BanCacheManager
        }
        ~BanCacheManager();
 };
-
-#endif