summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format/TokenAnnotator.h
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2013-02-14 08:42:54 +0000
committerDaniel Jasper <djasper@google.com>2013-02-14 08:42:54 +0000
commiteead02b1b51770872c50c7c6176210fdab4a78f9 (patch)
treec5c3368ec0403a9bf3071f06970932f8e2ccc9b0 /clang/lib/Format/TokenAnnotator.h
parent70247a807b3f6fa6f5996fd2184d6276c8e1d881 (diff)
downloadbcm5719-llvm-eead02b1b51770872c50c7c6176210fdab4a78f9.tar.gz
bcm5719-llvm-eead02b1b51770872c50c7c6176210fdab4a78f9.zip
Align superclasses for multiple inheritence.
This fixes llvm.org/PR15179. Before: class ColorChooserMac : public content::ColorChooser, public content::WebContentsObserver { }; After: class ColorChooserMac : public content::ColorChooser, public content::WebContentsObserver { }; llvm-svn: 175147
Diffstat (limited to 'clang/lib/Format/TokenAnnotator.h')
-rw-r--r--clang/lib/Format/TokenAnnotator.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/Format/TokenAnnotator.h b/clang/lib/Format/TokenAnnotator.h
index 506f271dc5d..5ce84af96a0 100644
--- a/clang/lib/Format/TokenAnnotator.h
+++ b/clang/lib/Format/TokenAnnotator.h
@@ -34,6 +34,7 @@ enum TokenType {
TT_ConditionalExpr,
TT_CtorInitializerColon,
TT_ImplicitStringLiteral,
+ TT_InheritanceColon,
TT_LineComment,
TT_ObjCArrayLiteral,
TT_ObjCBlockLParen,
OpenPOWER on IntegriCloud