diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-11-10 10:17:36 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-11-10 10:17:36 (GMT) |
| commit | 255ef4dc267bffe35fe102b0191f9647eb566b7a (patch) | |
| tree | e427c39dd030fbdd9bbf64ae13748c2cf66b9517 | |
| parent | 12793dea5c66309505d0dab9dd82db35e5124e9e (diff) | |
| parent | 4884295c6a3bc9af6e01c1688a3173ac6c3bc315 (diff) | |
| download | Doxygen-255ef4dc267bffe35fe102b0191f9647eb566b7a.zip Doxygen-255ef4dc267bffe35fe102b0191f9647eb566b7a.tar.gz Doxygen-255ef4dc267bffe35fe102b0191f9647eb566b7a.tar.bz2 | |
Merge branch 'albert-github-feature/issue_7295'
| -rw-r--r-- | src/scanner.l | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/src/scanner.l b/src/scanner.l index 33ea4d4..abc0c3b 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -3910,16 +3910,24 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) if (current->section == Entry::NAMESPACE_SEC && current->type == "namespace") { int split_point; + // save documentation values + QCString doc = current->doc; + int docLine = current->docLine; + QCString docFile = current->docFile; + QCString brief = current->brief; + int briefLine = current->briefLine; + QCString briefFile = current->briefFile; + // reset documentation values + current->doc = ""; + current->docLine = 0; + current->docFile = ""; + current->brief = ""; + current->briefLine = 0; + current->briefFile = ""; while ((split_point = current->name.find("::")) != -1) { std::unique_ptr<Entry> new_current = std::make_unique<Entry>(*current); current->program = ""; - new_current->doc = ""; - new_current->docLine = 0; - new_current->docFile = ""; - new_current->brief = ""; - new_current->briefLine = 0; - new_current->briefFile = ""; new_current->name = current->name.mid(split_point + 2); current->name = current->name.left(split_point); if (!current_root->name.isEmpty()) current->name.prepend(current_root->name+"::"); @@ -3929,6 +3937,13 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) current_root = tmp; current.swap(new_current); } + // restore documentation values + current->doc = doc; + current->docLine = docLine; + current->docFile = docFile; + current->brief = brief; + current->briefLine = briefLine; + current->briefFile = briefFile; } QCString &cn = current->name; QCString rn = current_root->name.copy(); |