From 4291a087b8cb912a51f9ce03f37cff63b5a40467 Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 14 Nov 2019 00:48:26 +0100 Subject: [PATCH] [skip ci] fix more -Wgnu-zero-variadic-macro-arguments --- src/Gui/Command.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Gui/Command.h b/src/Gui/Command.h index 61d22f6fcf0e..cf7f53034ad2 100644 --- a/src/Gui/Command.h +++ b/src/Gui/Command.h @@ -444,12 +444,13 @@ class GuiExport Command : public CommandBase /// Print to Python console the current calling source file and line number static void printCaller(const char *file, int line); - //FIXME: ISO C++11 requires at least one argument for the "..." in a variadic macro + // ISO C++11 requires at least one argument for the "..." in a variadic macro + // https://en.wikipedia.org/wiki/Variadic_macro#Example /** Convenience macro to run a command with printf like formatter * * @sa Command::_doCommand() */ -#define doCommand(_type,...) _doCommand(__FILE__,__LINE__,_type,##__VA_ARGS__) +#define doCommand(...) _doCommand(__FILE__,__LINE__,__VA_ARGS__) /** Run a command with printf like formatter * @@ -516,7 +517,7 @@ class GuiExport Command : public CommandBase /** @name Methods for copying visiual properties */ //@{ /// Convenience macro to copy visual properties -#define copyVisual(...) _copyVisual(__FILE__,__LINE__,## __VA_ARGS__) +#define copyVisual(...) _copyVisual(__FILE__,__LINE__,__VA_ARGS__) static void _copyVisual(const char *file, int line, const char* to, const char* attr, const char* from); static void _copyVisual(const char *file, int line, const char* to, const char* attr_to, const char* from, const char* attr_from); static void _copyVisual(const char *file, int line, const App::DocumentObject *to, const char *attr, const App::DocumentObject *from);