diff options
author | Craig Topper <craig.topper@gmail.com> | 2015-10-18 05:14:41 +0000 |
---|---|---|
committer | Craig Topper <craig.topper@gmail.com> | 2015-10-18 05:14:41 +0000 |
commit | 835316e4fec8db554066692bd12142f81c8d7aa6 (patch) | |
tree | 089ddca2c876b566a4db63a34cb0fb61977a8c84 /pp-trace | |
parent | 776233f9a374ec45b35893c9656449e70d4b3ec8 (diff) |
Make a bunch of static arrays const.
git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@250641 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'pp-trace')
-rw-r--r-- | pp-trace/PPCallbacksTracker.cpp | 35 | ||||
-rw-r--r-- | pp-trace/PPCallbacksTracker.h | 2 |
2 files changed, 20 insertions, 17 deletions
diff --git a/pp-trace/PPCallbacksTracker.cpp b/pp-trace/PPCallbacksTracker.cpp index 8a370549..e0d23dd8 100644 --- a/pp-trace/PPCallbacksTracker.cpp +++ b/pp-trace/PPCallbacksTracker.cpp @@ -56,35 +56,38 @@ static std::string getSourceLocationString(clang::Preprocessor &PP, // Enum string tables. // FileChangeReason strings. -static const char *FileChangeReasonStrings[] = { +static const char *const FileChangeReasonStrings[] = { "EnterFile", "ExitFile", "SystemHeaderPragma", "RenameFile" }; // CharacteristicKind strings. -static const char *CharacteristicKindStrings[] = { "C_User", "C_System", - "C_ExternCSystem" }; +static const char *const CharacteristicKindStrings[] = { "C_User", "C_System", + "C_ExternCSystem" }; // MacroDirective::Kind strings. -static const char *MacroDirectiveKindStrings[] = { "MD_Define", "MD_Undefine", - "MD_Visibility" }; +static const char *const MacroDirectiveKindStrings[] = { + "MD_Define","MD_Undefine", "MD_Visibility" +}; // PragmaIntroducerKind strings. -static const char *PragmaIntroducerKindStrings[] = { "PIK_HashPragma", - "PIK__Pragma", - "PIK___pragma" }; +static const char *const PragmaIntroducerKindStrings[] = { "PIK_HashPragma", + "PIK__Pragma", + "PIK___pragma" }; // PragmaMessageKind strings. -static const char *PragmaMessageKindStrings[] = { "PMK_Message", "PMK_Warning", - "PMK_Error" }; +static const char *const PragmaMessageKindStrings[] = { + "PMK_Message", "PMK_Warning", "PMK_Error" +}; // ConditionValueKind strings. -static const char *ConditionValueKindStrings[] = {"CVK_NotEvaluated", - "CVK_False", "CVK_True"}; +static const char *const ConditionValueKindStrings[] = { + "CVK_NotEvaluated", "CVK_False", "CVK_True" +}; // Mapping strings. -static const char *MappingStrings[] = { "0", "MAP_IGNORE", - "MAP_REMARK", "MAP_WARNING", - "MAP_ERROR", "MAP_FATAL" }; +static const char *const MappingStrings[] = { "0", "MAP_IGNORE", + "MAP_REMARK", "MAP_WARNING", + "MAP_ERROR", "MAP_FATAL" }; // PPCallbacksTracker functions. @@ -453,7 +456,7 @@ void PPCallbacksTracker::appendArgument(const char *Name, // Append an enum argument to the top trace item. void PPCallbacksTracker::appendArgument(const char *Name, int Value, - const char *Strings[]) { + const char *const Strings[]) { appendArgument(Name, Strings[Value]); } diff --git a/pp-trace/PPCallbacksTracker.h b/pp-trace/PPCallbacksTracker.h index 8c2e6bb5..f91d1bc2 100644 --- a/pp-trace/PPCallbacksTracker.h +++ b/pp-trace/PPCallbacksTracker.h @@ -179,7 +179,7 @@ public: void appendArgument(const char *Name, const clang::Token &Value); /// \brief Append an enum argument to the top trace item. - void appendArgument(const char *Name, int Value, const char *Strings[]); + void appendArgument(const char *Name, int Value, const char *const Strings[]); /// \brief Append a FileID argument to the top trace item. void appendArgument(const char *Name, clang::FileID Value); |