temporary fix to UNIQUE_NAME for VC7.1

This commit is contained in:
Chris Danford
2006-10-21 05:56:53 +00:00
parent 31a444d8d5
commit 7680b543b3
+7 -3
View File
@@ -121,9 +121,13 @@ void ShowWarning( const char *file, int line, const char *message ); // don't pu
/* Use UNIQUE_NAME to get the line number concatenated to x. This is useful for
* generating unique identifiers in other macros. */
#define UNIQUE_NAME3(x,line) x##line
#define UNIQUE_NAME2(x,line) UNIQUE_NAME3(x, line)
#define UNIQUE_NAME(x) UNIQUE_NAME2(x, __LINE__)
/* XXX: VC2003 expanding __LINE__ to nothing in the first version. Investigate why. -Chris */
//#define UNIQUE_NAME3(x,line) x##line
//#define UNIQUE_NAME2(x,line) UNIQUE_NAME3(x, line)
//#define UNIQUE_NAME(x) UNIQUE_NAME2(x, __LINE__)
#define UNIQUE_NAME3(x) x
#define UNIQUE_NAME2(x) UNIQUE_NAME3(x)
#define UNIQUE_NAME(x) UNIQUE_NAME2(x)
template <bool> struct CompileAssert;
template <> struct CompileAssert<true> { };