diff options
author | Thomas Grill <xovo@users.sourceforge.net> | 2005-04-16 21:35:06 +0000 |
---|---|---|
committer | Thomas Grill <xovo@users.sourceforge.net> | 2005-04-16 21:35:06 +0000 |
commit | a7389a1405e6c160989e3d7097813b55e08e0f8d (patch) | |
tree | 9234122a98f9b8f41699e58e168feb10dda6bf03 /externals/grill/flext/source/flmap.h | |
parent | 0792fe88f2ad1d4f0bbc2c02c0fe6bb5782c31b6 (diff) |
updated templates
changed template parameter of TableMap
fixes for OSX
fixed problems with symbol binding
svn path=/trunk/; revision=2771
Diffstat (limited to 'externals/grill/flext/source/flmap.h')
-rw-r--r-- | externals/grill/flext/source/flmap.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/externals/grill/flext/source/flmap.h b/externals/grill/flext/source/flmap.h index 4c3a1c9e..57e806e1 100644 --- a/externals/grill/flext/source/flmap.h +++ b/externals/grill/flext/source/flmap.h @@ -248,12 +248,12 @@ public: inline int size() const { return TableAnyMap::size(); } - inline void insert(K k,T *t) { TableAnyMap::insert(*(size_t *)&k,t); } + inline void insert(K k,T t) { TableAnyMap::insert(*(size_t *)&k,(void *)t); } - inline T *find(K k) const { return (T *)TableAnyMap::find(*(size_t *)&k); } + inline T find(K k) const { return (T)TableAnyMap::find(*(size_t *)&k); } inline void erase(K k) { TableAnyMap::erase(*(size_t *)&k); } - inline T *remove(K k) { return (T *)TableAnyMap::remove(*(size_t *)&k); } + inline T remove(K k) { return (T)TableAnyMap::remove(*(size_t *)&k); } class iterator : TableAnyMap::iterator @@ -266,7 +266,7 @@ public: inline iterator &operator =(const iterator &it) { TableAnyMap::operator =(it); return *this; } inline operator bool() const {return TableAnyMap::iterator::operator bool(); } - inline T *data() const { return (T *)TableAnyMap::iterator::data(); } + inline T data() const { return (T)TableAnyMap::iterator::data(); } inline K key() const { return (K)TableAnyMap::iterator::key(); } inline iterator &operator ++() { TableAnyMap::iterator::operator ++(); return *this; } @@ -294,7 +294,7 @@ protected: virtual void Free(void *ptr) { // FLEXT_ASSERT(ptr); - delete (T *)ptr; + delete (T)ptr; } }; |