summaryrefslogtreecommitdiffstats
path: root/src/util.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2016-09-05 10:45:40 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2016-09-05 10:45:40 (GMT)
commitd9166baf589f50e94597829b04d0cabee4573130 (patch)
treeb2f882a997d5454e32508e35b68489f4c26d9953 /src/util.cpp
parentb721f6e1707f8cc446c0d7f9956e6d4aa9f17bc9 (diff)
downloadDoxygen-d9166baf589f50e94597829b04d0cabee4573130.zip
Doxygen-d9166baf589f50e94597829b04d0cabee4573130.tar.gz
Doxygen-d9166baf589f50e94597829b04d0cabee4573130.tar.bz2
Fixed two regressions found during extensive testing
Diffstat (limited to 'src/util.cpp')
-rwxr-xr-xsrc/util.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/util.cpp b/src/util.cpp
index f1ebf8b..3593c9d 100755
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -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;
}