Index: tools/clang/plugins/tests/overridden_methods.txt |
diff --git a/tools/clang/plugins/tests/overridden_methods.txt b/tools/clang/plugins/tests/overridden_methods.txt |
index 67349d23a8b718bb6f246d0aa57fb567fdde3610..199876b058a0ea0962dd77ae0ec4dd0590578787 100644 |
--- a/tools/clang/plugins/tests/overridden_methods.txt |
+++ b/tools/clang/plugins/tests/overridden_methods.txt |
@@ -1,66 +1,66 @@ |
In file included from overridden_methods.cpp:5: |
-./overridden_methods.h:48:28: warning: [chromium-style] Overriding method must be marked with OVERRIDE. |
+./overridden_methods.h:48:28: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'. |
virtual void SomeMethod(); |
^ |
- OVERRIDE |
-./overridden_methods.h:52:34: warning: [chromium-style] Overriding method must be marked with OVERRIDE. |
+ override |
+./overridden_methods.h:52:34: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'. |
virtual void SomeInlineMethod() {} |
^ |
- OVERRIDE |
-./overridden_methods.h:56:39: warning: [chromium-style] Overriding method must be marked with OVERRIDE. |
+ override |
+./overridden_methods.h:56:39: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'. |
virtual void SomeConstMethod() const {} |
^ |
- OVERRIDE |
-./overridden_methods.h:58:53: warning: [chromium-style] Overriding method must be marked with OVERRIDE. |
+ override |
+./overridden_methods.h:58:53: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'. |
virtual void SomeMethodWithExceptionSpec() throw() {} |
^ |
- OVERRIDE |
-./overridden_methods.h:61:67: warning: [chromium-style] Overriding method must be marked with OVERRIDE. |
+ override |
+./overridden_methods.h:61:67: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'. |
virtual void SomeConstMethodWithExceptionSpec() const throw(int) {} |
^ |
- OVERRIDE |
-./overridden_methods.h:63:39: warning: [chromium-style] Overriding method must be marked with OVERRIDE. |
+ override |
+./overridden_methods.h:63:39: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'. |
virtual void SomeNonPureBaseMethod() {} |
^ |
- OVERRIDE |
-./overridden_methods.h:65:39: warning: [chromium-style] Overriding method must be marked with OVERRIDE. |
+ override |
+./overridden_methods.h:65:39: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'. |
virtual void SomeMethodWithComment(); // This is a comment. |
^ |
- OVERRIDE |
-./overridden_methods.h:67:46: warning: [chromium-style] Overriding method must be marked with OVERRIDE. |
+ override |
+./overridden_methods.h:67:46: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'. |
virtual void SomeMethodWithCommentAndBody() {} // This is a comment. |
^ |
- OVERRIDE |
-overridden_methods.cpp:24:28: warning: [chromium-style] Overriding method must be marked with OVERRIDE. |
+ override |
+overridden_methods.cpp:24:28: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'. |
virtual void SomeMethod(); |
^ |
- OVERRIDE |
-overridden_methods.cpp:28:34: warning: [chromium-style] Overriding method must be marked with OVERRIDE. |
+ override |
+overridden_methods.cpp:28:34: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'. |
virtual void SomeInlineMethod() {} |
^ |
- OVERRIDE |
-overridden_methods.cpp:32:39: warning: [chromium-style] Overriding method must be marked with OVERRIDE. |
+ override |
+overridden_methods.cpp:32:39: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'. |
virtual void SomeConstMethod() const {} |
^ |
- OVERRIDE |
-overridden_methods.cpp:34:53: warning: [chromium-style] Overriding method must be marked with OVERRIDE. |
+ override |
+overridden_methods.cpp:34:53: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'. |
virtual void SomeMethodWithExceptionSpec() throw() {} |
^ |
- OVERRIDE |
-overridden_methods.cpp:37:67: warning: [chromium-style] Overriding method must be marked with OVERRIDE. |
+ override |
+overridden_methods.cpp:37:67: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'. |
virtual void SomeConstMethodWithExceptionSpec() const throw(int) {} |
^ |
- OVERRIDE |
-overridden_methods.cpp:39:39: warning: [chromium-style] Overriding method must be marked with OVERRIDE. |
+ override |
+overridden_methods.cpp:39:39: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'. |
virtual void SomeNonPureBaseMethod() {} |
^ |
- OVERRIDE |
-overridden_methods.cpp:41:39: warning: [chromium-style] Overriding method must be marked with OVERRIDE. |
+ override |
+overridden_methods.cpp:41:39: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'. |
virtual void SomeMethodWithComment(); // This is a comment. |
^ |
- OVERRIDE |
-overridden_methods.cpp:43:46: warning: [chromium-style] Overriding method must be marked with OVERRIDE. |
+ override |
+overridden_methods.cpp:43:46: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'. |
virtual void SomeMethodWithCommentAndBody() {} // This is a comment. |
^ |
- OVERRIDE |
+ override |
16 warnings generated. |