From 5ca206ce46474fc47bfd966996df9fdbcb094a6c Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sun, 21 Nov 2010 16:55:05 +0000 Subject: moving into ychat subdir --- src/maps/hashmap.h | 78 ------------------------- src/maps/hashmap.tmpl | 151 ------------------------------------------------ src/maps/mtools.h | 36 ------------ src/maps/mtools.tmpl | 37 ------------ src/maps/nhashmap.h | 46 --------------- src/maps/nhashmap.tmpl | 36 ------------ src/maps/shashmap.h | 72 ----------------------- src/maps/shashmap.tmpl | 154 ------------------------------------------------- 8 files changed, 610 deletions(-) delete mode 100644 src/maps/hashmap.h delete mode 100644 src/maps/hashmap.tmpl delete mode 100644 src/maps/mtools.h delete mode 100644 src/maps/mtools.tmpl delete mode 100644 src/maps/nhashmap.h delete mode 100644 src/maps/nhashmap.tmpl delete mode 100644 src/maps/shashmap.h delete mode 100644 src/maps/shashmap.tmpl (limited to 'src/maps') diff --git a/src/maps/hashmap.h b/src/maps/hashmap.h deleted file mode 100644 index 913b274..0000000 --- a/src/maps/hashmap.h +++ /dev/null @@ -1,78 +0,0 @@ -/*:* - *: File: ./src/maps/hashmap.h - *: - *: yChat; Homepage: ychat.buetow.org; Version 0.9.0-CURRENT - *: - *: Copyright (C) 2003 Paul C. Buetow, Volker Richter - *: Copyright (C) 2004 Paul C. Buetow - *: Copyright (C) 2005 EXA Digital Solutions GbR - *: Copyright (C) 2006, 2007 Paul C. Buetow - *: - *: This program is free software; you can redistribute it and/or - *: modify it under the terms of the GNU General Public License - *: as published by the Free Software Foundation; either version 2 - *: of the License, or (at your option) any later version. - *: - *: This program is distributed in the hope that it will be useful, - *: but WITHOUT ANY WARRANTY; without even the implied warranty of - *: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *: GNU General Public License for more details. - *: - *: You should have received a copy of the GNU General Public License - *: along with this program; if not, write to the Free Software - *: Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *:*/ - -#ifndef HASHMAP_H -#define HASHMAP_H - -#include - -using namespace std; - -template -struct compare_allocator -{ - inline bool operator()(key_type_ t_key_1, key_type_ t_key_2) const; -}; - -template -struct equals_allocator -{ - inline bool operator()(key_type_ t_key_1, key_type_ t_key_2) const; -}; - -template -struct size_hash -{ - inline int operator()(key_type_ t_key) const; -}; - -template -struct self_hash -{ - inline int operator()(key_type_ t_key) const; -}; - -template -< -class obj_type, -class key_type_ = string, -class hash_type = size_hash, -class alloc_type = compare_allocator -> -struct hashmap : public __gnu_cxx::hash_map -{ - virtual inline void set_elem(obj_type t_obj, key_type_ t_key); - virtual inline obj_type get_elem(key_type_ t_key); - virtual inline obj_type get_set_elem(obj_type t_obj, key_type_ t_key); - virtual inline obj_type get_or_callback_set - (obj_type (*func)(void*), void* p_void, key_type_ t_key); - virtual inline vector* get_key_vector(); - virtual inline bool exists(key_type_ t_key); - virtual inline void run_func( void (*func)(obj_type) ); - virtual inline void run_func( void (*func)(obj_type, void*), void* v_arg ); -}; - -#include "hashmap.tmpl" -#endif diff --git a/src/maps/hashmap.tmpl b/src/maps/hashmap.tmpl deleted file mode 100644 index cea2131..0000000 --- a/src/maps/hashmap.tmpl +++ /dev/null @@ -1,151 +0,0 @@ -/*:* - *: File: ./src/maps/hashmap.tmpl - *: - *: yChat; Homepage: ychat.buetow.org; Version 0.9.0-CURRENT - *: - *: Copyright (C) 2003 Paul C. Buetow, Volker Richter - *: Copyright (C) 2004 Paul C. Buetow - *: Copyright (C) 2005 EXA Digital Solutions GbR - *: Copyright (C) 2006, 2007 Paul C. Buetow - *: - *: This program is free software; you can redistribute it and/or - *: modify it under the terms of the GNU General Public License - *: as published by the Free Software Foundation; either version 2 - *: of the License, or (at your option) any later version. - *: - *: This program is distributed in the hope that it will be useful, - *: but WITHOUT ANY WARRANTY; without even the implied warranty of - *: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *: GNU General Public License for more details. - *: - *: You should have received a copy of the GNU General Public License - *: along with this program; if not, write to the Free Software - *: Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *:*/ - -template -bool -compare_allocator::operator()(key_type_ t_key_1, key_type_ t_key_2) const -{ - return t_key_1.compare(t_key_2) == 0; -} - -template -bool -equals_allocator::operator()(key_type_ t_key_1, key_type_ t_key_2) const -{ - return t_key_1 == t_key_2; -} - -template -int -size_hash::operator()(key_type_ t_key) const -{ - int i_hash = 0; - int i_size = t_key.size(); - - for ( size_t i = 0; i < i_size; ++i ) - i_hash = ( i_hash << 5 ) ^ t_key.at(i) ^ i_hash; - - return i_hash; -} - -template -int -self_hash::operator()(key_type_ t_key) const -{ - return t_key; -} - - -template -obj_type -hashmap::get_set_elem(obj_type t_obj, key_type_ t_key) -{ - typename hashmap::iterator iter = this->find(t_key); - - if ( iter == this->end() ) - { - set_elem(t_obj, t_key); - return obj_type(); - } - - obj_type t_ret = iter->second; - iter->second = t_obj; - - return t_ret; -} - -template -obj_type -hashmap::get_or_callback_set -(obj_type (*func)(void*), void* p_void, key_type_ t_key) -{ - typename hashmap::iterator iter = this->find(t_key); - - if ( iter == this->end() ) - { - obj_type t_obj = (*func) (p_void); - set_elem(t_obj, t_key); - return t_obj; - } - - return iter->second; -} - -template -void -hashmap::set_elem(obj_type t_obj, key_type_ t_key) -{ - (*this)[t_key] = t_obj; -} - -template -obj_type -hashmap::get_elem(key_type_ t_key) -{ - typename hashmap::iterator iter = this->find(t_key); - - if ( iter != this->end() ) - return iter->second; - - return obj_type(); -} - -template -vector* -hashmap::get_key_vector() -{ - vector* p_vec = new vector; - typename hashmap::iterator iter; - - for ( iter = this->begin(); iter != this->end(); ++iter ) - p_vec->push_back(iter->first); - - return p_vec; -} - -template -bool -hashmap::exists(key_type_ t_key) -{ - return this->find(t_key) != this->end(); -} - -template -void -hashmap::run_func( void (*func)(obj_type) ) -{ - typename hashmap::iterator iter; - for ( iter = this->begin(); iter != this->end(); ++iter ) - ( *func ) ( iter->second ); -} - -template -void -hashmap::run_func( void (*func)(obj_type, void*), void* v_arg ) -{ - typename hashmap::iterator iter; - for ( iter = this->begin(); iter != this->end(); ++iter ) - ( *func ) ( iter->second, v_arg ); -} diff --git a/src/maps/mtools.h b/src/maps/mtools.h deleted file mode 100644 index dadcdc8..0000000 --- a/src/maps/mtools.h +++ /dev/null @@ -1,36 +0,0 @@ -/*:* - *: File: ./src/maps/mtools.h - *: - *: yChat; Homepage: ychat.buetow.org; Version 0.9.0-CURRENT - *: - *: Copyright (C) 2003 Paul C. Buetow, Volker Richter - *: Copyright (C) 2004 Paul C. Buetow - *: Copyright (C) 2005 EXA Digital Solutions GbR - *: Copyright (C) 2006, 2007 Paul C. Buetow - *: - *: This program is free software; you can redistribute it and/or - *: modify it under the terms of the GNU General Public License - *: as published by the Free Software Foundation; either version 2 - *: of the License, or (at your option) any later version. - *: - *: This program is distributed in the hope that it will be useful, - *: but WITHOUT ANY WARRANTY; without even the implied warranty of - *: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *: GNU General Public License for more details. - *: - *: You should have received a copy of the GNU General Public License - *: along with this program; if not, write to the Free Software - *: Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *:*/ - -#ifndef MTOOLS_H -#define MTOOLS_H - -template -struct mtools -{ - static void delete_obj(type_ type_obj); -}; - -#include "mtools.tmpl" -#endif diff --git a/src/maps/mtools.tmpl b/src/maps/mtools.tmpl deleted file mode 100644 index 0c6b409..0000000 --- a/src/maps/mtools.tmpl +++ /dev/null @@ -1,37 +0,0 @@ -/*:* - *: File: ./src/maps/mtools.tmpl - *: - *: yChat; Homepage: ychat.buetow.org; Version 0.9.0-CURRENT - *: - *: Copyright (C) 2003 Paul C. Buetow, Volker Richter - *: Copyright (C) 2004 Paul C. Buetow - *: Copyright (C) 2005 EXA Digital Solutions GbR - *: Copyright (C) 2006, 2007 Paul C. Buetow - *: - *: This program is free software; you can redistribute it and/or - *: modify it under the terms of the GNU General Public License - *: as published by the Free Software Foundation; either version 2 - *: of the License, or (at your option) any later version. - *: - *: This program is distributed in the hope that it will be useful, - *: but WITHOUT ANY WARRANTY; without even the implied warranty of - *: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *: GNU General Public License for more details. - *: - *: You should have received a copy of the GNU General Public License - *: along with this program; if not, write to the Free Software - *: Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *:*/ - -#ifndef MTOOLS_TMPL -#define MTOOLS_TMPL - -template -void -mtools::delete_obj( type_ type_obj ) -{ - if ( type_obj ) - delete type_obj; -} - -#endif diff --git a/src/maps/nhashmap.h b/src/maps/nhashmap.h deleted file mode 100644 index fcfaf36..0000000 --- a/src/maps/nhashmap.h +++ /dev/null @@ -1,46 +0,0 @@ -/*:* - *: File: ./src/maps/nhashmap.h - *: - *: yChat; Homepage: ychat.buetow.org; Version 0.9.0-CURRENT - *: - *: Copyright (C) 2003 Paul C. Buetow, Volker Richter - *: Copyright (C) 2004 Paul C. Buetow - *: Copyright (C) 2005 EXA Digital Solutions GbR - *: Copyright (C) 2006, 2007 Paul C. Buetow - *: - *: This program is free software; you can redistribute it and/or - *: modify it under the terms of the GNU General Public License - *: as published by the Free Software Foundation; either version 2 - *: of the License, or (at your option) any later version. - *: - *: This program is distributed in the hope that it will be useful, - *: but WITHOUT ANY WARRANTY; without even the implied warranty of - *: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *: GNU General Public License for more details. - *: - *: You should have received a copy of the GNU General Public License - *: along with this program; if not, write to the Free Software - *: Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *:*/ - -#ifndef NHASHMAP_H -#define NHASHMAP_H - -#include "shashmap.h" - -using namespace std; - -template -< -class obj_type, -class key_type_ = string, -class hash_type = size_hash, -class alloc_type = compare_allocator -> -struct nhashmap : public shashmap -{ - inline obj_type get_elem(key_type_ t_key); -}; - -#include "nhashmap.tmpl" -#endif diff --git a/src/maps/nhashmap.tmpl b/src/maps/nhashmap.tmpl deleted file mode 100644 index 45a40aa..0000000 --- a/src/maps/nhashmap.tmpl +++ /dev/null @@ -1,36 +0,0 @@ -/*:* - *: File: ./src/maps/nhashmap.tmpl - *: - *: yChat; Homepage: ychat.buetow.org; Version 0.9.0-CURRENT - *: - *: Copyright (C) 2003 Paul C. Buetow, Volker Richter - *: Copyright (C) 2004 Paul C. Buetow - *: Copyright (C) 2005 EXA Digital Solutions GbR - *: Copyright (C) 2006, 2007 Paul C. Buetow - *: - *: This program is free software; you can redistribute it and/or - *: modify it under the terms of the GNU General Public License - *: as published by the Free Software Foundation; either version 2 - *: of the License, or (at your option) any later version. - *: - *: This program is distributed in the hope that it will be useful, - *: but WITHOUT ANY WARRANTY; without even the implied warranty of - *: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *: GNU General Public License for more details. - *: - *: You should have received a copy of the GNU General Public License - *: along with this program; if not, write to the Free Software - *: Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *:*/ - -template -obj_type -nhashmap::get_elem(key_type_ t_key) -{ - typename hashmap::iterator iter = this->find(t_key); - - if ( iter != this->end() ) - return iter->second; - - return NULL; -} diff --git a/src/maps/shashmap.h b/src/maps/shashmap.h deleted file mode 100644 index 8c94331..0000000 --- a/src/maps/shashmap.h +++ /dev/null @@ -1,72 +0,0 @@ -/*:* - *: File: ./src/maps/shashmap.h - *: - *: yChat; Homepage: ychat.buetow.org; Version 0.9.0-CURRENT - *: - *: Copyright (C) 2003 Paul C. Buetow, Volker Richter - *: Copyright (C) 2004 Paul C. Buetow - *: Copyright (C) 2005 EXA Digital Solutions GbR - *: Copyright (C) 2006, 2007 Paul C. Buetow - *: - *: This program is free software; you can redistribute it and/or - *: modify it under the terms of the GNU General Public License - *: as published by the Free Software Foundation; either version 2 - *: of the License, or (at your option) any later version. - *: - *: This program is distributed in the hope that it will be useful, - *: but WITHOUT ANY WARRANTY; without even the implied warranty of - *: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *: GNU General Public License for more details. - *: - *: You should have received a copy of the GNU General Public License - *: along with this program; if not, write to the Free Software - *: Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *:*/ - -#ifndef SHASHMAP_H -#define SHASHMAP_H - -#include "hashmap.h" - -#include "../monitor/dump.h" - -using namespace std; - -template -< -class obj_type, -class key_type_ = string, -class hash_type = size_hash, -class alloc_type = compare_allocator -> -class shashmap : protected hashmap, - public dumpable -{ -private: - -protected: - virtual void dumpit(); - -public: - explicit shashmap(); - ~shashmap(); - virtual inline void set_elem(obj_type t_obj, key_type_ t_key); - virtual inline obj_type get_set_elem(obj_type t_obj, key_type_ t_key); - virtual inline obj_type get_or_callback_set - (obj_type (*func)(void*), void* p_void, key_type_ t_key); - virtual inline void add_elem(obj_type t_obj, key_type_ t_key); - virtual inline void add_elem_insecure(obj_type t_obj, key_type_ t_key); - virtual inline obj_type get_elem(key_type_ t_key); - virtual inline void del_elem(key_type_ t_key); - virtual inline void del_elem_insecure(key_type_ t_key); - virtual inline void clear(); - virtual inline int size(); - virtual inline bool exists(key_type_ t_key); - virtual inline vector* get_key_vector(); - virtual inline void run_func( void (*func)(obj_type) ); - virtual inline void run_func( void (*func)(obj_type, void*), void* v_arg ); - -}; - -#include "shashmap.tmpl" -#endif diff --git a/src/maps/shashmap.tmpl b/src/maps/shashmap.tmpl deleted file mode 100644 index 1613049..0000000 --- a/src/maps/shashmap.tmpl +++ /dev/null @@ -1,154 +0,0 @@ -/*:* - *: File: ./src/maps/shashmap.tmpl - *: - *: yChat; Homepage: ychat.buetow.org; Version 0.9.0-CURRENT - *: - *: Copyright (C) 2003 Paul C. Buetow, Volker Richter - *: Copyright (C) 2004 Paul C. Buetow - *: Copyright (C) 2005 EXA Digital Solutions GbR - *: Copyright (C) 2006, 2007 Paul C. Buetow - *: - *: This program is free software; you can redistribute it and/or - *: modify it under the terms of the GNU General Public License - *: as published by the Free Software Foundation; either version 2 - *: of the License, or (at your option) any later version. - *: - *: This program is distributed in the hope that it will be useful, - *: but WITHOUT ANY WARRANTY; without even the implied warranty of - *: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *: GNU General Public License for more details. - *: - *: You should have received a copy of the GNU General Public License - *: along with this program; if not, write to the Free Software - *: Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *:*/ - -template -shashmap::shashmap() -{} - -template -shashmap::~shashmap() -{} - -template -void -shashmap::add_elem(obj_type t_obj, key_type_ t_key) -{ - (*this)[t_key] = t_obj; -} - -template -void -shashmap::add_elem_insecure(obj_type t_obj, key_type_ t_key) -{ - (*this)[t_key] = t_obj; -} - -template -obj_type -shashmap::get_set_elem(obj_type t_obj, key_type_ t_key) -{ - obj_type t_ret = hashmap::get_set_elem(t_obj, t_key); - return t_ret; -} - -template -obj_type -shashmap::get_or_callback_set -(obj_type (*func)(void*), void* p_void, key_type_ t_key) -{ - obj_type t_ret = hashmap::get_or_callback_set - (func, p_void, t_key); - return t_ret; -} - -template -void -shashmap::set_elem(obj_type t_obj, key_type_ t_key) -{ - (*this)[t_key] = t_obj; -} - -template -obj_type -shashmap::get_elem(key_type_ t_key) -{ - obj_type t_ret = hashmap::get_elem(t_key); - return t_ret; -} - -template -void -shashmap::del_elem(key_type_ t_key) -{ - hashmap::erase(t_key); -} - -template -void -shashmap::del_elem_insecure(key_type_ t_key) -{ - hashmap::erase(t_key); -} - -template -vector* -shashmap::get_key_vector() -{ - vector* p_vec = hashmap::get_key_vector(); - return p_vec; -} - -template -void -shashmap::clear() -{ - hashmap::clear(); -} - -template -int -shashmap::size() -{ - int i_size = hashmap::size(); - return i_size; -} - -template -bool -shashmap::exists(key_type_ t_key) -{ - bool b_ret = hashmap::exists(t_key); - return b_ret; -} - -template -void -shashmap::run_func( void (*func)(obj_type) ) -{ - hashmap::run_func(func); -} - -template -void -shashmap::run_func( void (*func)(obj_type, void*), void* v_arg ) -{ - hashmap::run_func(func, v_arg); -} - -template -void -shashmap::dumpit() -{ - dumpable::add - ("[shashmap]"); - vector* p_vec = get_key_vector(); - - typename vector::iterator iter; - for (iter = p_vec->begin(); iter != p_vec->end(); ++iter) - dumpable::add - (*iter); - - delete p_vec; -} -- cgit v1.2.3