diff --git a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_helpers.cc b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_helpers.cc index 6e6229db86..bb5b46b251 100644 --- a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_helpers.cc +++ b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_helpers.cc @@ -78,18 +78,67 @@ static bool stripNonfunctionalCodegen = false; // collide with pre-existing code (which should be cleaned up on-demand as // needed) const std::set kKeywords = { - "DEBUG", "FALSE", "FILE", "NO", "NO_DATA", - "NULL", "OVERFLOW", "TRUE", "TYPE_BOOL", "YES", - "and", "auto", "break", "case", "class", - "const", "continue", "copy", "default", "delete", - "description", "do", "double", "else", "enum", - "explicit", "float", "for", "hash", "id", - "if", "inline", "int", "long", "namespace", - "new", "not", "operator", "or", "private", - "protected", "public", "return", "signed", "specialCalendars", - "static", "struct", "switch", "template", "text", - "this", "throw", "try", "union", "unsigned", - "virtual", "void", "volatile", "while", + "DEBUG", + "FALSE", + "FILE", + "NO", + "NO_DATA", + "NULL", + "OVERFLOW", + "TRUE", + "TYPE_BOOL", + "YES", + "and", + "auto", + "break", + "case", + "class", + "concept", + "const", + "continue", + "copy", + "default", + "delete", + "description", + "do", + "double", + "else", + "enum", + "explicit", + "float", + "for", + "hash", + "id", + "if", + "inline", + "int", + "long", + "mutable", + "namespace", + "new", + "not", + "operator", + "or", + "private", + "protected", + "public", + "return", + "signed", + "specialCalendars", + "static", + "struct", + "switch", + "template", + "text", + "this", + "throw", + "try", + "union", + "unsigned", + "virtual", + "void", + "volatile", + "while", };