diff options
Diffstat (limited to 'src/maps')
| -rw-r--r-- | src/maps/CVS/Entries | 18 | ||||
| -rw-r--r-- | src/maps/hmap.tmpl | 4 | ||||
| -rw-r--r-- | src/maps/mtools.h | 26 | ||||
| -rw-r--r-- | src/maps/mtools.tmpl | 29 | ||||
| -rw-r--r-- | src/maps/nmap.h | 3 | ||||
| -rw-r--r-- | src/maps/smap.h | 2 | ||||
| -rw-r--r-- | src/maps/smap.tmpl | 4 |
7 files changed, 11 insertions, 75 deletions
diff --git a/src/maps/CVS/Entries b/src/maps/CVS/Entries index f7c7407..b0587e6 100644 --- a/src/maps/CVS/Entries +++ b/src/maps/CVS/Entries @@ -1,11 +1,9 @@ -/hash.cpp/1.1/Wed Feb 16 21:28:55 2005// -/hash.h/1.1/Wed Feb 16 21:28:55 2005// -/hashmap.h/1.7/Thu Feb 17 00:29:37 2005// -/hashmap.tmpl/1.3/Wed Feb 16 23:16:58 2005// -/mtools.h/1.6/Wed Feb 16 23:16:58 2005// -/mtools.tmpl/1.5/Wed Feb 16 23:16:58 2005// -/nhashmap.h/1.1/Wed Feb 16 22:36:32 2005// -/nhashmap.tmpl/1.1/Wed Feb 16 22:36:32 2005// -/shashmap.h/1.3/Wed Feb 16 23:16:58 2005// -/shashmap.tmpl/1.3/Wed Feb 16 23:16:58 2005// +/hmap.h/1.7/Thu Nov 18 13:41:47 2004// +/hmap.tmpl/1.7/Fri Jan 7 21:00:19 2005// +/mtools.h/1.4/Fri Jan 7 21:00:19 2005// +/mtools.tmpl/1.3/Thu Nov 18 13:41:47 2004// +/nmap.h/1.4/Fri Jan 7 21:00:19 2005// +/nmap.tmpl/1.3/Thu Nov 18 13:41:47 2004// +/smap.h/1.9/Fri Jan 7 21:00:19 2005// +/smap.tmpl/1.8/Fri Jan 7 21:00:19 2005// D diff --git a/src/maps/hmap.tmpl b/src/maps/hmap.tmpl index dcd0426..cc2ec24 100644 --- a/src/maps/hmap.tmpl +++ b/src/maps/hmap.tmpl @@ -286,8 +286,4 @@ hmap<obj_type, key_type>::get_size() return size; } - - - #endif - diff --git a/src/maps/mtools.h b/src/maps/mtools.h index c506674..6062191 100644 --- a/src/maps/mtools.h +++ b/src/maps/mtools.h @@ -1,27 +1,3 @@ -/*:* - *: File: ./src/maps/mtools.h - *: - *: yChat; Homepage: www.yChat.org; Version 0.7.9.5-RELEASE - *: - *: Copyright (C) 2003 Paul C. Buetow, Volker Richter - *: Copyright (C) 2004 Paul C. Buetow - *: Copyright (C) 2005 EXA Digital Solutions GbR - *: - *: 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 @@ -32,4 +8,4 @@ struct mtools }; #include "mtools.tmpl" -#endif +#endif diff --git a/src/maps/mtools.tmpl b/src/maps/mtools.tmpl index 3fb4a5f..dd3f89e 100644 --- a/src/maps/mtools.tmpl +++ b/src/maps/mtools.tmpl @@ -1,36 +1,11 @@ -/*:* - *: File: ./src/maps/mtools.tmpl - *: - *: yChat; Homepage: www.yChat.org; Version 0.7.9.5-RELEASE - *: - *: Copyright (C) 2003 Paul C. Buetow, Volker Richter - *: Copyright (C) 2004 Paul C. Buetow - *: Copyright (C) 2005 EXA Digital Solutions GbR - *: - *: 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 <class type_> void -mtools<type_>::delete_obj( type_ type_obj ) -{ +mtools<type_>::delete_obj( type_ type_obj ) { if ( type_obj ) - delete type_obj; + delete type_obj; } #endif diff --git a/src/maps/nmap.h b/src/maps/nmap.h index 56d30f5..e29da3b 100644 --- a/src/maps/nmap.h +++ b/src/maps/nmap.h @@ -19,7 +19,4 @@ class nmap : public smap<obj_type, key_type> }; #include "nmap.tmpl" - #endif - - diff --git a/src/maps/smap.h b/src/maps/smap.h index 2096139..a3ee89d 100644 --- a/src/maps/smap.h +++ b/src/maps/smap.h @@ -13,7 +13,6 @@ template <class obj_type, class key_type> class smap : public hmap<obj_type, key_type> { - private: pthread_mutex_t mut_smap; @@ -53,5 +52,4 @@ class smap : public hmap<obj_type, key_type> }; #include "smap.tmpl" - #endif diff --git a/src/maps/smap.tmpl b/src/maps/smap.tmpl index 5ec7d38..670b84d 100644 --- a/src/maps/smap.tmpl +++ b/src/maps/smap.tmpl @@ -15,7 +15,6 @@ smap<obj_type, key_type>::~smap() pthread_mutex_destroy( &mut_smap ); } - template <class obj_type, class key_type> void smap<obj_type, key_type>::lock_mutex() { pthread_mutex_lock( &mut_smap ); @@ -165,7 +164,6 @@ void smap<obj_type, key_type>::make_empty_insecure( void (*func)(key_type) ) hmap<obj_type,key_type>::make_empty( func ); } - template <class obj_type, class key_type> void smap<obj_type, key_type>::add_elem_insecure( const obj_type &x, const key_type &k ) { @@ -214,6 +212,4 @@ smap<obj_type, key_type>::get_key_vector_insecure() return hmap<obj_type,key_type>::get_key_vector(); } - #endif - |