Changeset 6454

Timestamp:

Jan 22, 2010, 2:51:06 PM (14 years ago)

Author:

rgrieder

Message:

3 build fixes for MSVC.

Location:

code/branches/consolecommands2/src/libraries

Files:

• core/ConsoleCommand.cc (modified) (1 diff)
• core/ConsoleCommand.h (modified) (2 diffs)
• util/VA_NARGS.h (modified) (2 diffs)

code/branches/consolecommands2/src/libraries/core/ConsoleCommand.cc

@@ -78 +78 @@
 {
     _SetConsoleCommand("BaseObject", "setName", &BaseObject::setName, (BaseObject*)0);
-    _ConsoleCommand::_ConsoleCommandManipulator test = _ModifyConsoleCommand("BaseObject", "setName").setFunction(&BaseObject::setActive);
+    _ConsoleCommand::_ConsoleCommandManipulator test(_ModifyConsoleCommand("BaseObject", "setName").setFunction(&BaseObject::setActive));
 
     _ConsoleCommand::_ConsoleCommand(const std::string& group, const std::string& name, Functor* functor, State::Enum state) : Executor(functor, name), functionHeader_(functor->getHeaderIdentifier())

code/branches/consolecommands2/src/libraries/core/ConsoleCommand.h

@@ -33 +33 @@
 
 #include <boost/preprocessor/cat.hpp>
+#include <boost/preprocessor/facilities/expand.hpp>
 
 #include "util/VA_NARGS.h"
@@ -158 +159 @@
 
 #define _SetConsoleCommand(...) \
-    BOOST_PP_CAT(_SetConsoleCommand, ORXONOX_VA_NARGS(__VA_ARGS__))(__VA_ARGS__)
+    BOOST_PP_EXPAND(BOOST_PP_CAT(_SetConsoleCommand, ORXONOX_VA_NARGS(__VA_ARGS__))(__VA_ARGS__))
 #define _SetConsoleCommand2(name, functionpointer) \
     _SetConsoleCommandGeneric("", name, orxonox::createFunctor(functionpointer))

code/branches/consolecommands2/src/libraries/util/VA_NARGS.h

@@ -32 +32 @@
 */
 
+#include <boost/preprocessor/facilities/expand.hpp>
+
 /**
     @brief Returns the number of arguments passed to a variadic macro. Important: The number of arguments must be greater than zero (ORXONOX_VA_NARGS() returns 1).
@@ -42 +44 @@
 
 #define ORXONOX_VA_NARGS_CONCAT(...) \
-    ORXONOX_VA_NARGS_INTERN(__VA_ARGS__)
+    BOOST_PP_EXPAND(ORXONOX_VA_NARGS_INTERN(__VA_ARGS__))
 
 #define ORXONOX_VA_NARGS_INTERN( \