cosmetic fix: removed warning about double ';' after command static xyz inside a anonymous namespace is not really needed, so i removed the namespace to get rid of the compiler warning. it's more convinient for the developer to put ';' after that REGISTER_COMMAND_PARSER
Mathias Gumz akira at fluxbox dot org
1 files changed,
5 insertions(+),
15 deletions(-)
jump to
M
src/FbTk/CommandParser.hh
→
src/FbTk/CommandParser.hh
@@ -33,9 +33,7 @@ namespace FbTk {
// helper for registering a function to parse arguments #define REGISTER_COMMAND_PARSER(name, parser, type) \ - namespace { \ - static const bool p_register_command_##type_##name = FbTk::CommandParser<type>::instance().registerCommand(#name, &parser); \ - } + static const bool p_register_command_##type_##name = FbTk::CommandParser<type>::instance().registerCommand(#name, &parser) // include some basic Command<void> creators template <typename ClassName, typename Type>@@ -45,9 +43,7 @@ return new ClassName();
} #define REGISTER_COMMAND(name, classname, type) \ - namespace { \ - static const bool p_register_##type_##name = FbTk::CommandParser<type>::instance().registerCommand(#name, &FbTk::CommandCreator<classname, type>); \ - } + static const bool p_register_##type_##name = FbTk::CommandParser<type>::instance().registerCommand(#name, &FbTk::CommandCreator<classname, type>) template <typename ClassName, typename Type> Command<Type> *CommandCreatorWithArgs(const string &name, const string &args,@@ -56,9 +52,7 @@ return new ClassName(args);
} #define REGISTER_COMMAND_WITH_ARGS(name, classname, type) \ - namespace { \ - static const bool p_register_##type_##name = FbTk::CommandParser<type>::instance().registerCommand(#name, &FbTk::CommandCreatorWithArgs<classname, type>); \ - } + static const bool p_register_##type_##name = FbTk::CommandParser<type>::instance().registerCommand(#name, &FbTk::CommandCreatorWithArgs<classname, type>) template <typename ClassName, typename Type> Command<Type> *UntrustedCommandCreator(const string &name, const string &args,@@ -68,9 +62,7 @@ return new ClassName();
} #define REGISTER_UNTRUSTED_COMMAND(name, classname, type) \ - namespace { \ - static const bool p_register_##type_##name = FbTk::CommandParser<type>::instance().registerCommand(#name, &FbTk::UntrustedCommandCreator<classname, type>); \ - } + static const bool p_register_##type_##name = FbTk::CommandParser<type>::instance().registerCommand(#name, &FbTk::UntrustedCommandCreator<classname, type>) template <typename ClassName, typename Type> Command<Type> *UntrustedCommandCreatorWithArgs(const string &name,@@ -80,9 +72,7 @@ return new ClassName(args);
} #define REGISTER_UNTRUSTED_COMMAND_WITH_ARGS(name, classname, type) \ - namespace { \ - static const bool p_register_##type_##name = FbTk::CommandParser<type>::instance().registerCommand(#name, &FbTk::UntrustedCommandCreatorWithArgs<classname, type>); \ - } + static const bool p_register_##type_##name = FbTk::CommandParser<type>::instance().registerCommand(#name, &FbTk::UntrustedCommandCreatorWithArgs<classname, type>) template <typename Type> class CommandParser {