| commit | 4dd54b6d4ab6603175226810de853a2499ae97a3 | [log] [tgz] |
|---|---|---|
| author | Jens Geyer <jensg@apache.org> | Thu Mar 21 19:59:45 2013 +0200 |
| committer | Jens Geyer <jensg@apache.org> | Thu Mar 21 19:59:45 2013 +0200 |
| tree | cb3ad4660a02dd5521aaed2b7871f040a10b84ec | |
| parent | 7af5868e57b35d5d5e9427484f884cc6af002bbd [diff] | |
| parent | 552440e6e522499d974800c98c5f4dd869dc29c7 [diff] |
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
diff --git a/compiler/cpp/src/generate/t_delphi_generator.cc b/compiler/cpp/src/generate/t_delphi_generator.cc index 2c43a31..d27676c 100644 --- a/compiler/cpp/src/generate/t_delphi_generator.cc +++ b/compiler/cpp/src/generate/t_delphi_generator.cc
@@ -338,6 +338,7 @@ delphi_keywords["automated"] = 1; delphi_keywords["at"] = 1; delphi_keywords["on"] = 1; + delphi_keywords["result"] = 1; delphi_reserved_method["create"] = 1; delphi_reserved_method["free"] = 1;