diff options
| author | Thomas Grill <xovo@users.sourceforge.net> | 2006-10-27 13:34:56 +0000 |
|---|---|---|
| committer | Thomas Grill <xovo@users.sourceforge.net> | 2006-10-27 13:34:56 +0000 |
| commit | 214066a139e6c680e8517c89a07431a9649321a0 (patch) | |
| tree | 7d07326c1f6e5bc446f766db0022eaa90c8ea603 /externals/grill/flext/source/flsupport.cpp | |
| parent | 021708ab4cee3245e2306cb107f67d85f00823c1 (diff) | |
fix for Codewarrior compilation
update docs
fixed anything/symbol message mixup (thanks to Stefano Papetti)
fixed typos, dates, contact info
added gcc branch hinting
svn path=/trunk/; revision=6170
Diffstat (limited to 'externals/grill/flext/source/flsupport.cpp')
| -rw-r--r-- | externals/grill/flext/source/flsupport.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/externals/grill/flext/source/flsupport.cpp b/externals/grill/flext/source/flsupport.cpp index eaa27a60..b77729e6 100644 --- a/externals/grill/flext/source/flsupport.cpp +++ b/externals/grill/flext/source/flsupport.cpp @@ -119,7 +119,7 @@ void *flext_root::operator new(size_t bytes) bytes += sizeof(memtest)*2; #endif char *blk; - if(bytes >= LARGEALLOC) { + if(UNLIKELY(bytes >= LARGEALLOC)) { #if FLEXT_SYS == FLEXT_SYS_MAX && defined(_SYSMEM_H_) blk = (char *)::sysmem_newptr(bytes); #else @@ -163,7 +163,7 @@ void flext_root::operator delete(void *blk) #endif size_t bytes = *(size_t *)ori; - if(bytes >= LARGEALLOC) { + if(UNLIKELY(bytes >= LARGEALLOC)) { #if FLEXT_SYS == FLEXT_SYS_MAX && defined(_SYSMEM_H_) ::sysmem_freeptr(ori); #else @@ -205,7 +205,7 @@ void *flext_root::NewAligned(size_t bytes,int bitalign) bytes += ovh+alignovh; char *blk; - if(bytes >= LARGEALLOC) { + if(UNLIKELY(bytes >= LARGEALLOC)) { #if FLEXT_SYS == FLEXT_SYS_MAX && defined(_SYSMEM_H_) blk = (char *)::sysmem_newptr(bytes); #else @@ -239,7 +239,7 @@ void flext_root::FreeAligned(void *blk) char *ori = *(char **)((char *)blk-sizeof(size_t)-sizeof(char *)); size_t bytes = *(size_t *)((char *)blk-sizeof(size_t)); - if(bytes >= LARGEALLOC) { + if(UNLIKELY(bytes >= LARGEALLOC)) { #if FLEXT_SYS == FLEXT_SYS_MAX && defined(_SYSMEM_H_) ::sysmem_freeptr(ori); #else |