diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2012-08-11 13:06:22 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2012-08-11 13:06:22 (GMT) |
commit | 34cc61be7d0f6dafcaaa5fcdaa98ce4d31014634 (patch) | |
tree | ad481e345a35820f0142bb774556afc6de0d00fa /src/scanner.l | |
parent | 3583a7c0bea47665a06d14a64b62376eee21c528 (diff) | |
download | Doxygen-34cc61be7d0f6dafcaaa5fcdaa98ce4d31014634.zip Doxygen-34cc61be7d0f6dafcaaa5fcdaa98ce4d31014634.tar.gz Doxygen-34cc61be7d0f6dafcaaa5fcdaa98ce4d31014634.tar.bz2 |
Release-1.8.2
Diffstat (limited to 'src/scanner.l')
-rw-r--r-- | src/scanner.l | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/scanner.l b/src/scanner.l index c494902..e46c89d 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -4883,7 +4883,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" } else if (insideCS) // C# generic class { - current->name+="-g"; + //current->name+="-g"; BEGIN( CSGeneric ); } else // C++ template specialization @@ -4904,10 +4904,10 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" current->tArgLists->append(al); currentArgumentList = al; templateStr="<"; - //current->name += "<"; + current->name += "<"; fullArgString = templateStr; - //copyArgString = ¤t->name; - copyArgString = &templateStr; + copyArgString = ¤t->name; + //copyArgString = &templateStr; currentArgumentContext = ClassVar; BEGIN( ReadTempArgs ); } @@ -6421,12 +6421,13 @@ void CLanguageScanner::parseCode(CodeOutputInterface & codeOutIntf, int endLine, bool inlineFragment, MemberDef *memberDef, - bool showLineNumbers + bool showLineNumbers, + Definition *searchCtx ) { ::parseCCode(codeOutIntf,scopeName,input,isExampleBlock,exampleName, fileDef,startLine,endLine,inlineFragment,memberDef, - showLineNumbers); + showLineNumbers,searchCtx); } bool CLanguageScanner::needsPreprocessing(const QCString &extension) |