Bug 746361 - Doxygen thinks C++ class is Objective-C

doxygen · Dec 27, 2015 · 8da86f8 · 8da86f8
1 parent 303b5b5
commit 8da86f8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/scanner.l b/src/scanner.l
@@ -4093,6 +4093,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  current_root->addSubEntry( current ) ;
   					  current=new Entry;
 					  initEntry();
+					  language = current->lang = SrcLangExt_Cpp; // see bug746361
 					  insideObjC=FALSE;
 					  BEGIN( FindMembers ); 
   					}
@@ -5382,6 +5383,11 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
     					  unput(';');
 					  current->reset();
 					  initEntry();
+                                          if (insideObjC) // see bug746361
+                                          {
+					    language = current->lang = SrcLangExt_Cpp;
+                                            insideObjC = FALSE;
+                                          }
 					  if (isTypedef) // typedef of a class, put typedef keyword back
 					  {
 					    current->type.prepend("typedef");

diff --git a/src/util.cpp b/src/util.cpp
@@ -7038,7 +7038,7 @@ void initDefaultExtensionMapping()
   updateLanguageMapping(".phtml",    "php");
   updateLanguageMapping(".m",        "objective-c");
   updateLanguageMapping(".M",        "objective-c");
-  updateLanguageMapping(".mm",       "objective-c");
+  updateLanguageMapping(".mm",       "c");  // see bug746361
   updateLanguageMapping(".py",       "python");
   updateLanguageMapping(".pyw",      "python");
   updateLanguageMapping(".f",        "fortran");