diff options
| author | Petr Prikryl <prikryl@atlas.cz> | 2013-05-21 07:46:52 (GMT) |
|---|---|---|
| committer | Petr Prikryl <prikryl@atlas.cz> | 2013-05-21 07:46:52 (GMT) |
| commit | 4a5d43a48adacf55b641397207191b31052f4aad (patch) | |
| tree | a333e755d0cd2def9b861b41a8e4c55e9f6dd338 | |
| parent | 46dba7a8eeddec521852ea94423da52fe6fd0e66 (diff) | |
| parent | eb193634226ed778dbf5f27f21c6c459213f6158 (diff) | |
| download | Doxygen-4a5d43a48adacf55b641397207191b31052f4aad.zip Doxygen-4a5d43a48adacf55b641397207191b31052f4aad.tar.gz Doxygen-4a5d43a48adacf55b641397207191b31052f4aad.tar.bz2 | |
Merge branch 'master' of https://github.com/doxygen/doxygen.git
| -rw-r--r-- | src/scanner.l | 7 | ||||
| -rw-r--r-- | src/sqlite3gen.cpp | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/scanner.l b/src/scanner.l index 6bbf1c4..9a3d27f 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -624,6 +624,11 @@ IDLATTR ("["[^\]]*"]"){BN}* TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?) RAWBEGIN (u|U|L|u8)?R\"[^ \t\(\)\\]{0,16}"(" RAWEND ")"[^ \t\(\)\\]{0,16}\" +ARITHOP "+"|"-"|"/"|"*"|"%"|"--"|"++" +ASSIGNOP "="|"*="|"/="|"%="|"+="|"-="|"<<="|">>="|"&="|"^="|"|=" +LOGICOP "=="|"!="|">"|"<"|">="|"<="|"&&"|"||"|"!" +BITOP "&"|"|"|"^"|"<<"|">>"|"~" +OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) %option noyywrap @@ -1938,7 +1943,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" BEGIN(Using); } <Using>"namespace"{BN}+ { lineCount(); BEGIN(UsingDirective); } -<Using>{ID}{BN}*({BN}*("::"|"."){BN}*{ID})* { +<Using>({ID}{BN}*("::"|"."){BN}*)*({ID}|{OPERATOR}) { lineCount(); current->name=yytext; current->fileName = yyFileName; diff --git a/src/sqlite3gen.cpp b/src/sqlite3gen.cpp index 931341d..5d88385 100644 --- a/src/sqlite3gen.cpp +++ b/src/sqlite3gen.cpp @@ -888,7 +888,7 @@ static void generateSqlite3ForMember(sqlite3*db,MemberDef *md,Definition *def) } if (isFunc) { - LockingPtr<ArgumentList> al = md->argumentList(); + ArgumentList *al = md->argumentList(); if (al!=0 && al->constSpecifier) { bindIntParameter(i_s_memberdef,":const",al->constSpecifier); @@ -984,7 +984,7 @@ static void generateSqlite3ForMember(sqlite3*db,MemberDef *md,Definition *def) << memberOutputFileBase(rmd) << "_1" << rmd->anchor() << "\">" << convertToXML(rmd->name()) << "</reimplements>" << endl; } - LockingPtr<MemberList> rbml = md->reimplementedBy(); + MemberList *rbml = md->reimplementedBy(); if (rbml!=0) { MemberListIterator mli(*rbml); @@ -998,8 +998,8 @@ static void generateSqlite3ForMember(sqlite3*db,MemberDef *md,Definition *def) #endif if (isFunc) //function { - LockingPtr<ArgumentList> declAl = md->declArgumentList(); - LockingPtr<ArgumentList> defAl = md->argumentList(); + ArgumentList *declAl = md->declArgumentList(); + ArgumentList *defAl = md->argumentList(); if (declAl!=0 && declAl->count()>0) { ArgumentListIterator declAli(*declAl); @@ -1128,7 +1128,7 @@ static void generateSqlite3ForMember(sqlite3*db,MemberDef *md,Definition *def) // + cross-references // The cross-references in initializers only work when both the src and dst // are defined. - LockingPtr<MemberSDict> mdict = md->getReferencesMembers(); + MemberSDict *mdict = md->getReferencesMembers(); // references if (mdict!=0) { |