Permalink
Browse files

Fixed two regressions found during extensive testing

  • Loading branch information...
Dimitri van Heesch
Dimitri van Heesch committed Sep 5, 2016
1 parent b721f6e commit d9166baf589f50e94597829b04d0cabee4573130
Showing with 13 additions and 5 deletions.
  1. +8 −2 src/doxygen.cpp
  2. +5 −3 src/util.cpp
View
@@ -2052,10 +2052,16 @@ static void findUsingDeclarations(EntryNav *rootNav)
// file scope).
QCString name = substitute(root->name,".","::"); //Java/C# scope->internal
usingCd = getResolvedClass(nd,fd,name);
usingCd = getClass(name); // try direct lookup first, this is needed to get
// builtin STL classes to properly resolve, e.g.
// vector -> std::vector
if (usingCd==0)
{
usingCd = Doxygen::hiddenClasses->find(name);
usingCd = getResolvedClass(nd,fd,name); // try via resolving (see also bug757509)
}
if (usingCd==0)
{
usingCd = Doxygen::hiddenClasses->find(name); // check if it is already hidden
}
//printf("%s -> %p\n",root->name.data(),usingCd);
View
@@ -1887,9 +1887,10 @@ QCString removeRedundantWhiteSpace(const QCString &s)
{
if (g_charAroundSpace.charMap[(uchar)pc].before &&
g_charAroundSpace.charMap[(uchar)nc].after &&
!(pc==',' && nc=='.'))
// remove spaces/tabs
{
!(pc==',' && nc=='.') &&
(osp<8 || (osp>=8 && isId(nc))) // e.g. "operator >>" -> "operator>>", but not "operator int" -> operatorint"
)
{ // keep space
*dst++=' ';
}
}
@@ -1915,6 +1916,7 @@ QCString removeRedundantWhiteSpace(const QCString &s)
pc=c;
}
*dst++='\0';
//printf("removeRedundantWhitespace(%s)->%s\n",s.data(),growBuf);
return growBuf;
}

0 comments on commit d9166ba

Please sign in to comment.