Changeset 8418 for code/trunk/src/libraries
- Timestamp:
- May 8, 2011, 6:53:39 PM (14 years ago)
- Location:
- code/trunk/src/libraries
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/libraries/core/Game.h
r7401 r8418 59 59 */ 60 60 #define DeclareGameState(className, stateName, bIgnoreTickTime, bGraphicsMode) \ 61 static bool BOOST_PP_CAT(bGameStateDummy_##className, __ LINE__) = orxonox::Game::declareGameState<className>(#className, stateName, bIgnoreTickTime, bGraphicsMode)61 static bool BOOST_PP_CAT(bGameStateDummy_##className, __UNIQUE_NUMBER__) = orxonox::Game::declareGameState<className>(#className, stateName, bIgnoreTickTime, bGraphicsMode) 62 62 // tolua_begin 63 63 namespace orxonox -
code/trunk/src/libraries/core/ToluaInterface.h
r7401 r8418 42 42 // Macro for declaring a tolua interface of a library/module 43 43 #define DeclareToluaInterface(libraryName) \ 44 static bool BOOST_PP_CAT(bDummy##libraryName, __ LINE__) = orxonox::LuaState::addToluaInterface(&tolua_##libraryName##_open, #libraryName); \45 static Loki::ScopeGuardImpl1<bool (*)(const std::string&), std::string> BOOST_PP_CAT(dummy##libraryName, __ LINE__)(&orxonox::LuaState::removeToluaInterface, #libraryName)44 static bool BOOST_PP_CAT(bDummy##libraryName, __UNIQUE_NUMBER__) = orxonox::LuaState::addToluaInterface(&tolua_##libraryName##_open, #libraryName); \ 45 static Loki::ScopeGuardImpl1<bool (*)(const std::string&), std::string> BOOST_PP_CAT(dummy##libraryName, __UNIQUE_NUMBER__)(&orxonox::LuaState::removeToluaInterface, #libraryName) 46 46 47 47 #endif /* _ToluaInterface_H__ */ -
code/trunk/src/libraries/core/command/ConsoleCommand.h
r8079 r8418 269 269 /// Internal macro 270 270 #define SetConsoleCommandGeneric(group, name, functor) \ 271 static orxonox::ConsoleCommand& BOOST_PP_CAT(__consolecommand_, __ LINE__) = (*orxonox::createConsoleCommand(group, name, orxonox::createExecutor(functor)))271 static orxonox::ConsoleCommand& BOOST_PP_CAT(__consolecommand_, __UNIQUE_NUMBER__) = (*orxonox::createConsoleCommand(group, name, orxonox::createExecutor(functor))) 272 272 273 273 … … 304 304 /// Internal macro 305 305 #define DeclareConsoleCommandGeneric(group, name, functor) \ 306 static orxonox::ConsoleCommand& BOOST_PP_CAT(__consolecommand_, __ LINE__) = (*orxonox::createConsoleCommand(group, name, orxonox::createExecutor(functor), false))306 static orxonox::ConsoleCommand& BOOST_PP_CAT(__consolecommand_, __UNIQUE_NUMBER__) = (*orxonox::createConsoleCommand(group, name, orxonox::createExecutor(functor), false)) 307 307 308 308 -
code/trunk/src/libraries/network/NetworkFunction.h
r7495 r8418 255 255 256 256 #define registerStaticNetworkFunction( functionPointer ) \ 257 static void* BOOST_PP_CAT( NETWORK_FUNCTION_, __ LINE__ ) = registerStaticNetworkFunctionFct( functionPointer, #functionPointer );257 static void* BOOST_PP_CAT( NETWORK_FUNCTION_, __UNIQUE_NUMBER__ ) = registerStaticNetworkFunctionFct( functionPointer, #functionPointer ); 258 258 #define registerMemberNetworkFunction( class, function ) \ 259 static void* BOOST_PP_CAT( NETWORK_FUNCTION_##class, __ LINE__ ) = registerMemberNetworkFunctionFct<class>( &class::function, #class "_" #function);259 static void* BOOST_PP_CAT( NETWORK_FUNCTION_##class, __UNIQUE_NUMBER__ ) = registerMemberNetworkFunctionFct<class>( &class::function, #class "_" #function); 260 260 // call it with functionPointer, clientID, args 261 261 #define callStaticNetworkFunction( functionPointer, ...) \
Note: See TracChangeset
for help on using the changeset viewer.