Merge branch 'master' of https://github.com/doxygen/doxygen.git

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; 

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)
   {