diff options
| -rw-r--r-- | src/scanner.l | 2 | ||||
| -rw-r--r-- | src/util.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/scanner.l b/src/scanner.l index d2c7072..cad997e 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -6651,7 +6651,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) docBlock+=indent; } } -<DocCopyBlock>^{B}*"*"+/{BN}+"*"{BN}* { // start of a comment line with two *'s +<DocCopyBlock>^{B}*"*"+/{B}+"*"{BN}* { // start of a comment line with two *'s if (docBlockName=="code") { QCString indent; diff --git a/src/util.cpp b/src/util.cpp index 9a0e513..3a3bfd3 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1895,7 +1895,7 @@ QCString removeRedundantWhiteSpace(const QCString &s) if (g_charAroundSpace.charMap[(uchar)pc].before && g_charAroundSpace.charMap[(uchar)nc].after && !(pc==',' && nc=='.') && - (osp<8 || (osp>=8 && pc!='"' && isId(nc)) || (osp>=8 && pc!='"' && nc!='"')) + (osp<8 || (osp>=8 && isId(pc) && isId(nc))) // e.g. 'operator >>' -> 'operator>>', // 'operator "" _x' -> 'operator""_x', // but not 'operator int' -> 'operatorint' |