From c752987457f50c1adf5051e1fd8167a5637f1e34 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Tue, 26 Oct 2004 20:03:50 +0000 Subject: "" svn path=/trunk/; revision=2169 --- externals/grill/flext/source/flsupport.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'externals/grill/flext/source/flsupport.cpp') diff --git a/externals/grill/flext/source/flsupport.cpp b/externals/grill/flext/source/flsupport.cpp index 85d9720d..b4c3d09f 100644 --- a/externals/grill/flext/source/flsupport.cpp +++ b/externals/grill/flext/source/flsupport.cpp @@ -168,7 +168,7 @@ void flext_root::operator delete(void *blk) void *flext_root::NewAligned(size_t bytes,int bitalign) { const size_t ovh = sizeof(size_t)+sizeof(char *); - const unsigned long alignovh = bitalign/8-1; + const size_t alignovh = bitalign/8-1; bytes += ovh+alignovh; char *blk; @@ -195,7 +195,7 @@ void *flext_root::NewAligned(size_t bytes,int bitalign) } FLEXT_ASSERT(blk); - char *ablk = reinterpret_cast((reinterpret_cast(blk)+ovh+alignovh) & ~alignovh); + char *ablk = reinterpret_cast((reinterpret_cast(blk)+ovh+alignovh) & ~alignovh); *(char **)(ablk-sizeof(size_t)-sizeof(char *)) = blk; *(size_t *)(ablk-sizeof(size_t)) = bytes; return ablk; @@ -236,7 +236,7 @@ void flext_root::FreeAligned(void *blk) /*! \todo there is probably also a shortcut for Max and jMax \todo size checking */ -void flext::GetAString(const t_atom &a,char *buf,int szbuf) +void flext::GetAString(const t_atom &a,char *buf,size_t szbuf) { #if FLEXT_SYS == FLEXT_SYS_PD atom_string(const_cast(&a),buf,szbuf); @@ -287,5 +287,5 @@ void flext_root::error(const char *fmt,...) AnyMap::AnyMap() {} AnyMap::~AnyMap() {} -AnyMap::iterator AnyMap::find(unsigned int k) { return Parent::find(k); } -unsigned int &AnyMap::operator [](unsigned int k) { return Parent::operator [](k); } +AnyMap::iterator AnyMap::find(AnyMapType k) { return Parent::find(k); } +AnyMapType &AnyMap::operator [](AnyMapType k) { return Parent::operator [](k); } -- cgit v1.2.1