diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-05-18 09:07:42 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-05-18 09:07:42 (GMT) |
| commit | 140d4d12bbf205fb2df5dc25c588bc831497e48a (patch) | |
| tree | d318e2ae0b097fa2a9ce5e6ebefa882bb7b41ff4 | |
| parent | de1cb37e6874a46c9882a6dc022942f24fb4ef16 (diff) | |
| parent | 8759754138bc8f8411f86ce947effc8a73cef7d1 (diff) | |
| download | Doxygen-140d4d12bbf205fb2df5dc25c588bc831497e48a.zip Doxygen-140d4d12bbf205fb2df5dc25c588bc831497e48a.tar.gz Doxygen-140d4d12bbf205fb2df5dc25c588bc831497e48a.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
| -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 ) ; |