--- a/e32tools/elf2e32/source/deflatecompress.cpp Wed Oct 27 19:38:12 2010 +0800
+++ b/e32tools/elf2e32/source/deflatecompress.cpp Thu Oct 28 11:19:23 2010 +0800
@@ -30,13 +30,12 @@
const TInt KDeflateHashShift=24;
#define COMPILE_TIME_ASSERT(e) \
- switch (0) \
- { \
- case 0: \
- case e: \
- ; \
- }
-
+ switch (0) \
+ { \
+ case 0: \
+ case e: \
+ ; \
+ }
/**
Class HDeflateHash
@@ -136,23 +135,21 @@
{
#if __GNUC__ >= 4
// Try to detect if the class' layout has changed.
- COMPILE_TIME_ASSERT( sizeof(HDeflateHash) == 1028 );
- COMPILE_TIME_ASSERT( sizeof(TOffset) == 2 );
- COMPILE_TIME_ASSERT( offsetof(HDeflateHash, iHash) < offsetof(HDeflateHash, iOffset) );
+ COMPILE_TIME_ASSERT( sizeof(HDeflateHash) == 1028 );
+ COMPILE_TIME_ASSERT( sizeof(TOffset) == 2 );
+ COMPILE_TIME_ASSERT( offsetof(HDeflateHash, iHash) < offsetof(HDeflateHash, iOffset) );
// Compute the size of the class, including rounding it up to a multiple of 4
// bytes.
-
- unsigned n = sizeof(TInt) * 256 + sizeof(TOffset) * Min(aLinks, KDeflateMaxDistance);
-
- while (n & 0x1f)
- {
- n++;
- }
+ unsigned n = sizeof(TInt) * 256 + sizeof(TOffset) * Min(aLinks, KDeflateMaxDistance);
+ while (n & 0x1f)
+ {
+ n++;
+ }
// Allocate the raw memory ...
- void* p = ::operator new(n);
+ void* p = ::operator new(n);
// ... And create the object in that memory.
- return new(p) HDeflateHash;
+ return new(p) HDeflateHash;
#else
return new(new char[_FOFF(HDeflateHash,iOffset[Min(aLinks,KDeflateMaxDistance)])]) HDeflateHash;
#endif