summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2019-02-04 21:19:56 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2019-02-04 21:19:56 (GMT)
commit2802e2b4ee8158dba3f3584037e99907c6db7ec4 (patch)
treef073bb3c064b91f8b5a68a5a8db26ecf910a2ddd
parentf94be126ea4a5f45bbf2cd66a9758bf603a71d8b (diff)
downloadDoxygen-2802e2b4ee8158dba3f3584037e99907c6db7ec4.zip
Doxygen-2802e2b4ee8158dba3f3584037e99907c6db7ec4.tar.gz
Doxygen-2802e2b4ee8158dba3f3584037e99907c6db7ec4.tar.bz2
Issue 6814: Further finetuning for inconsistent whitespace removal for operators in 1.8.15
-rw-r--r--src/util.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/util.cpp b/src/util.cpp
index 3a3bfd3..53b176d 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1847,7 +1847,8 @@ QCString removeRedundantWhiteSpace(const QCString &s)
case '*':
if (i>0 && pc!=' ' && pc!='\t' && pc!=':' &&
pc!='*' && pc!='&' && pc!='(' && pc!='/' &&
- pc!='.' && (osp<9 || !(pc=='>' && osp==11)))
+ pc!='.' && osp<9
+ )
// avoid splitting &&, **, .*, operator*, operator->*
{
*dst++=' ';
@@ -1855,7 +1856,7 @@ QCString removeRedundantWhiteSpace(const QCString &s)
*dst++=c;
break;
case '&':
- if (i>0 && isId(pc))
+ if (i>0 && isId(pc) && osp<9)
{
if (nc != '=')
// avoid splitting operator&=