From 5e108035659e204a4a917e2f1ee39f556fbf32af Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Tue, 3 Dec 2013 17:42:22 +0000
Subject: [PATCH] Added new keywords to CppTokeniserFunctions

---
 .../juce_CPlusPlusCodeTokeniserFunctions.h       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniserFunctions.h b/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniserFunctions.h
index ec18615cd5..29605122cd 100644
--- a/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniserFunctions.h
+++ b/modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniserFunctions.h
@@ -46,33 +46,33 @@ struct CppTokeniserFunctions
     static bool isReservedKeyword (String::CharPointerType token, const int tokenLength) noexcept
     {
         static const char* const keywords2Char[] =
-            { "if", "do", "or", "id", 0 };
+            { "if", "do", "or", "id", nullptr };
 
         static const char* const keywords3Char[] =
-            { "for", "int", "new", "try", "xor", "and", "asm", "not", 0 };
+            { "for", "int", "new", "try", "xor", "and", "asm", "not", nullptr };
 
         static const char* const keywords4Char[] =
             { "bool", "void", "this", "true", "long", "else", "char",
-              "enum", "case", "goto", "auto", 0 };
+              "enum", "case", "goto", "auto", nullptr };
 
         static const char* const keywords5Char[] =
             {  "while", "bitor", "break", "catch", "class", "compl", "const", "false",
-                "float", "short", "throw", "union", "using", "or_eq", 0 };
+               "float", "short", "throw", "union", "using", "or_eq", "final", nullptr };
 
         static const char* const keywords6Char[] =
             { "return", "struct", "and_eq", "bitand", "delete", "double", "extern",
               "friend", "inline", "not_eq", "public", "sizeof", "static", "signed",
-              "switch", "typeid", "wchar_t", "xor_eq", 0};
+              "switch", "typeid", "wchar_t", "xor_eq", nullptr };
 
         static const char* const keywords7Char[] =
-            { "default", "mutable", "private", "typedef", "nullptr", "virtual", 0 };
+            { "default", "mutable", "private", "typedef", "nullptr", "virtual", nullptr };
 
         static const char* const keywordsOther[] =
-            { "noexcept", "const_cast", "continue", "explicit", "namespace",
+            { "noexcept", "const_cast", "continue", "explicit", "namespace", "override",
               "operator", "protected", "register", "reinterpret_cast", "static_cast",
               "template", "typename", "unsigned", "volatile", "constexpr",
               "@implementation", "@interface", "@end", "@synthesize", "@dynamic", "@public",
-              "@private", "@property", "@protected", "@class", 0 };
+              "@private", "@property", "@protected", "@class", nullptr };
 
         const char* const* k;