THRIFT-3115 Uncompileable code due to name collision with predefined used types
Client: Delphi
Patch: Jens Geyer
diff --git a/compiler/cpp/src/generate/t_delphi_generator.cc b/compiler/cpp/src/generate/t_delphi_generator.cc
index 65ece6c..c435a31 100644
--- a/compiler/cpp/src/generate/t_delphi_generator.cc
+++ b/compiler/cpp/src/generate/t_delphi_generator.cc
@@ -623,7 +623,13 @@
delphi_keywords["automated"] = 1;
delphi_keywords["at"] = 1;
delphi_keywords["on"] = 1;
+
+ // reserved/predefined variables and types (lowercase!)
delphi_keywords["result"] = 1;
+ delphi_keywords["tbytes"] = 1;
+ delphi_keywords["tobject"] = 1;
+ delphi_keywords["tclass"] = 1;
+ delphi_keywords["tinterfacedobject"] = 1;
delphi_reserved_method["create"] = 1;
delphi_reserved_method["free"] = 1;