diff --git a/tools/scan-build/ccc-analyzer b/tools/scan-build/ccc-analyzer
index aca411f..7b45962 100755
--- a/tools/scan-build/ccc-analyzer
+++ b/tools/scan-build/ccc-analyzer
@@ -66,7 +66,9 @@
 
 sub GetPPExt {
   my $Lang = shift;
+  if ($Lang =~ /objective-c\+\+/) { return ".mm" };
   if ($Lang =~ /objective-c/) { return ".mi"; }
+  if ($Lang =~ /c\+\+/) { return ".ii"; }
   return ".i";
 }