From 7680b543b39ab92b942063057368d8018c795cbf Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 21 Oct 2006 05:56:53 +0000 Subject: [PATCH] temporary fix to UNIQUE_NAME for VC7.1 --- stepmania/src/global.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/stepmania/src/global.h b/stepmania/src/global.h index c6c1a6f947..748f2fb663 100644 --- a/stepmania/src/global.h +++ b/stepmania/src/global.h @@ -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 struct CompileAssert; template <> struct CompileAssert { };