Changeset 2946

Timestamp:

May 1, 2009, 10:20:02 PM (16 years ago)

Author:

rgrieder

Message:

Fixed a bug when using the LINE macro in Game.h
If you want to concatenate LINE to form a variable name, use:
MACRO_CONCATENATE(dummyvar##myParam1, LINE)

Location:

code/trunk/src

Files:

• OrxonoxConfig.h.in (modified) (1 diff)
• SpecialConfig.h.in (modified) (2 diffs)
• core/Game.h (modified) (1 diff)

code/trunk/src/OrxonoxConfig.h.in

@@ -142 +142 @@
 
 /*---------------------------------
+ * Special Macros
+ *-------------------------------*/
+#define MACRO_CONCATENATE_AUX(a, b) a##b
+#define MACRO_CONCATENATE(a, b) MACRO_CONCATENATE_AUX(a, b)
+#define MACRO_QUOTEME_AUX(x) #x
+#define MACRO_QUOTEME(x) MACRO_QUOTEME_AUX(x)
+
+
+/*---------------------------------
  * Includes
  *-------------------------------*/

code/trunk/src/SpecialConfig.h.in

@@ -40 +40 @@
 #define _SpecialConfig_H__
 
+#include "OrxonoxConfig.h"
+
 /* Set whether we must suffix "ceguilua/" for the CEGUILua.h include */
 #cmakedefine CEGUILUA_USE_INTERNAL_LIBRARY
@@ -53 +55 @@
 /* Using MSVC or XCode IDE */
 #cmakedefine CMAKE_CONFIGURATION_TYPES
-
-/* Macros used in the next section */
-#define MACRO_CONCATENATE(str1, str2) str1##str2
-#define MACRO_QUOTEME_AUX(x) #x
-#define MACRO_QUOTEME(x) MACRO_QUOTEME_AUX(x)
 
 /* Handle default ConfigValues */

code/trunk/src/core/Game.h

@@ -44 +44 @@
 
 #define AddGameState(classname, name) \
-    static bool bGameStateDummy_##classname##__LINE__ = orxonox::Game::addGameState(new classname(name))
+    static bool MACRO_CONCATENATE(bGameStateDummy_##classname, __LINE__) = orxonox::Game::addGameState(new classname(name))
 
 namespace orxonox