diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-05-18 09:07:21 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-18 09:07:21 (GMT) |
| commit | 8759754138bc8f8411f86ce947effc8a73cef7d1 (patch) | |
| tree | 8702e6a6a8de26eebf24ee0bdcd7fcd3926107fd /src | |
| parent | bfd35110cc752ab3c51929b59ea829068a5a395b (diff) | |
| parent | 788440279e0f0fdc7dce27ec266d7d5c11bcda1c (diff) | |
| download | Doxygen-8759754138bc8f8411f86ce947effc8a73cef7d1.zip Doxygen-8759754138bc8f8411f86ce947effc8a73cef7d1.tar.gz Doxygen-8759754138bc8f8411f86ce947effc8a73cef7d1.tar.bz2 | |
Merge pull request #6977 from mrhatch97/fix-cpp17-namespaces
Fixes #6765 - Fixed C++17-namespace assignment bug
Diffstat (limited to 'src')
| -rw-r--r-- | src/scanner.l | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/scanner.l b/src/scanner.l index d3902b3..5395e49 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -3941,6 +3941,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) else { current->endBodyLine = yyLineNr; + Entry * original_root = current_root; // save root this namespace is in if (current->section == Entry::NAMESPACE_SEC && current->type == "namespace") { int split_point; @@ -4005,6 +4006,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) ) { // namespaces and interfaces and java classes ends with a closing bracket without semicolon current->reset(); + current_root = original_root; // restore scope from before namespace descent initEntry(); memspecEntry = 0; BEGIN( FindMembers ) ; |