inconsistent #if

This commit is contained in:
David Rose 2006-03-20 01:02:11 +00:00
parent aee05dc054
commit 4ddb69b56f

View File

@ -496,8 +496,8 @@ $[cdefine USE_MEMORY_NOWRAPPERS]
#define VC6_STYLE_ALLOCATOR #define VC6_STYLE_ALLOCATOR
#define MODERN_STYLE_ALLOCATOR #define MODERN_STYLE_ALLOCATOR
#define NO_STYLE_ALLOCATOR #define NO_STYLE_ALLOCATOR
#if $[eq $[OPTIMIZE], 4] #if $[not $[DO_MEMORY_USAGE]]
// In optimize level 4, we never try to use custom allocators. // Without DO_MEMORY_USAGE, we never try to use custom allocators.
#set NO_STYLE_ALLOCATOR 1 #set NO_STYLE_ALLOCATOR 1
#elif $[eq $[STL_ALLOCATOR], OLD] #elif $[eq $[STL_ALLOCATOR], OLD]
// "OLD": Irix 6.2-era STL. // "OLD": Irix 6.2-era STL.