diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-11-10 09:42:17 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-11-10 09:42:17 (GMT) |
| commit | 1029932fa15285662f2f161ec786bf6192b31139 (patch) | |
| tree | b2f13fb8f210e3a6e480506d898cd494a5180835 | |
| parent | 12793dea5c66309505d0dab9dd82db35e5124e9e (diff) | |
| parent | 2734b80f2dcaac9dc6be842969d42414c7a37447 (diff) | |
| download | Doxygen-1029932fa15285662f2f161ec786bf6192b31139.zip Doxygen-1029932fa15285662f2f161ec786bf6192b31139.tar.gz Doxygen-1029932fa15285662f2f161ec786bf6192b31139.tar.bz2 | |
Merge branch 'feature/issue_7295' of https://github.com/albert-github/doxygen into albert-github-feature/issue_7295
| -rw-r--r-- | src/scanner.l | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/scanner.l b/src/scanner.l index 33ea4d4..e9ca1c7 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -3910,6 +3910,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) if (current->section == Entry::NAMESPACE_SEC && current->type == "namespace") { int split_point; + Entry *first_current = current; while ((split_point = current->name.find("::")) != -1) { std::unique_ptr<Entry> new_current = std::make_unique<Entry>(*current); @@ -3929,6 +3930,22 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) current_root = tmp; current.swap(new_current); } + // put documentation in the right entity + if (first_current!=current) + { + current->doc = first_current->doc; + current->docLine = first_current->docLine; + current->docFile = first_current->docFile; + current->brief = first_current->brief; + current->briefLine = first_current->briefLine; + current->briefFile = first_current->briefFile; + first_current->doc = ""; + first_current->docLine = 0; + first_current->docFile = ""; + first_current->brief = ""; + first_current->briefLine = 0; + first_current->briefFile = ""; + } } QCString &cn = current->name; QCString rn = current_root->name.copy(); |