THRIFT-3115 Uncompileable code due to name collision with predefined used types Client: Delphi Patch: Jens Geyer
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/958a7a24 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/958a7a24 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/958a7a24 Branch: refs/heads/master Commit: 958a7a242a59bc2d3965399483fbbb0dbeafa0e8 Parents: 5ec2121 Author: Jens Geyer <[email protected]> Authored: Sun Apr 26 16:00:27 2015 +0200 Committer: Jens Geyer <[email protected]> Committed: Sun Apr 26 17:47:50 2015 +0200 ---------------------------------------------------------------------- compiler/cpp/src/generate/t_delphi_generator.cc | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/958a7a24/compiler/cpp/src/generate/t_delphi_generator.cc ---------------------------------------------------------------------- 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 @@ void t_delphi_generator::create_keywords() { 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;
