[commit] r1113 - trunk/GME/Core

[GMESRC Repository Notifications]

Author: ksmyth
Date: Wed Dec 29 12:13:46 2010
New Revision: 1113

Log:
BinAttrUnion can be smaller under Release and _SECURE_SCL=0

Modified:
   trunk/GME/Core/CoreBinFile.h

Modified: trunk/GME/Core/CoreBinFile.h
==============================================================================
--- trunk/GME/Core/CoreBinFile.h	Wed Dec 29 11:48:16 2010	(r1112)
+++ trunk/GME/Core/CoreBinFile.h	Wed Dec 29 12:13:46 2010	(r1113)
@@ -109,7 +109,12 @@
 		// FIXME
 	}
 	// BinAttrUnion is guaranteed to have enough space to contain any BinAttr<*>
+	// (Ideally we'd do union { char [sizeof(BinAttrBase) - sizeof(BinAttr<*>) }, but that requires method definitions for BinAttr<*>::* to be separated from the declaration)
+#ifdef _DEBUG
 	int pad[5];
+#else
+	int pad[4];
+#endif
 };
 
 typedef std::vector<BinAttrUnion> binattrs_type;