Bug 731985 - Variadic macros failing to expand if trailing ... is empty

doxygen · Jun 24, 2014 · 070c355 · 070c355
1 parent e24e777
commit 070c355
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/pre.l b/src/pre.l
@@ -886,8 +886,9 @@ static bool replaceFunctionMacro(const QCString &expr,QCString *rest,int pos,int
   }
 
   // PHASE 2: apply the macro function
-  if (argCount==def->nargs || 
-      (argCount>def->nargs && def->varArgs)) // matching parameters lists
+  if (argCount==def->nargs || // same number of arguments
+      (argCount>=def->nargs-1 && def->varArgs)) // variadic macro with at least as many
+                                                // params as the non-variadic part (see bug731985)
   {
     uint k=0;
     // substitution of all formal arguments