Update copyrights for 2009.

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

diff --git a/src/base.cpp b/src/base.cpp
index 3b5baae59f844db6906d382fe821e769575c9f08..345c17e2992980ab0087e81e7e482d25504386ea 100644 (file)
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -2,70 +2,42 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
+/* $Core */
+
 #include "inspircd_config.h"
 #include "base.h"
 #include <time.h>
-#include <map>
-#include <deque>
-#include <string>
 #include "inspircd.h"
-#include "modules.h"
-#include "helperfuncs.h"
 
 const int bitfields[]           =       {1,2,4,8,16,32,64,128};
 const int inverted_bitfields[]  =       {~1,~2,~4,~8,~16,~32,~64,~128};
 
-extern time_t TIME;
-
-bool Extensible::Extend(std::string key, char* p)
-{
-       // only add an item if it doesnt already exist
-       if (this->Extension_Items.find(key) == this->Extension_Items.end())
-       {
-               this->Extension_Items[key] = p;
-               log(DEBUG,"Extending object with item %s",key.c_str());
-               return true;
-       }
-       // item already exists, return false
-       return false;
-}
-
-bool Extensible::Shrink(std::string key)
+classbase::classbase()
 {
-       // only attempt to remove a map item that exists
-       if (this->Extension_Items.find(key) != this->Extension_Items.end())
-       {
-               this->Extension_Items.erase(this->Extension_Items.find(key));
-               log(DEBUG,"Shrinking object with item %s",key.c_str());
-               return true;
-       }
-       return false;
+       this->age = time(NULL);
 }
 
-char* Extensible::GetExt(std::string key)
+bool Extensible::Shrink(const std::string &key)
 {
-       if (this->Extension_Items.find(key) != this->Extension_Items.end())
-       {
-               return (this->Extension_Items.find(key))->second;
-       }
-       return NULL;
+       /* map::size_type map::erase( const key_type& key );
+        * returns the number of elements removed, std::map
+        * is single-associative so this should only be 0 or 1
+        */
+       return this->Extension_Items.erase(key);
 }
 
 void Extensible::GetExtList(std::deque<std::string> &list)
 {
-       for (std::map<std::string,char*>::iterator u = Extension_Items.begin(); u != Extension_Items.end(); u++)
+       for (ExtensibleStore::iterator u = Extension_Items.begin(); u != Extension_Items.end(); u++)
        {
                list.push_back(u->first);
        }
@@ -120,6 +92,6 @@ BoolSet::BoolSet(char bitmask)
 
 bool BoolSet::operator=(BoolSet other)
 {
-        this->bits = other.bits;
-        return true;
+       this->bits = other.bits;
+       return true;
 }