Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/72976880 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/72976880 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/72976880 Branch: refs/heads/master Commit: 729768807290feb4677305beebc799ec50e0e17a Parents: 8d22c10 240df17 Author: Henrique Mendonça <[email protected]> Authored: Wed Jun 5 12:51:02 2013 +0200 Committer: Henrique Mendonça <[email protected]> Committed: Wed Jun 5 12:51:02 2013 +0200 ---------------------------------------------------------------------- .gitignore | 2 +- Makefile.am | 1 - Vagrantfile | 41 ------ compiler/cpp/src/generate/t_as3_generator.cc | 4 +- compiler/cpp/src/generate/t_csharp_generator.cc | 37 +++++- compiler/cpp/src/generate/t_delphi_generator.cc | 109 +++++++++++++-- compiler/cpp/src/generate/t_javame_generator.cc | 4 +- compiler/cpp/src/thriftl.ll | 5 +- configure.ac | 9 ++ contrib/Vagrantfile | 59 ++++++++ contrib/fb303/java/build.xml | 2 + lib/as3/build.xml | 2 + lib/cpp/src/thrift/Thrift.cpp | 19 +++ lib/cpp/src/thrift/protocol/TCompactProtocol.h | 8 +- lib/cpp/src/thrift/protocol/TCompactProtocol.tcc | 45 ++++--- lib/cpp/src/thrift/server/TNonblockingServer.cpp | 8 +- lib/cpp/src/thrift/transport/TServerSocket.cpp | 10 +- lib/cpp/src/thrift/transport/TServerSocket.h | 3 + lib/delphi/src/Thrift.TypeRegistry.pas | 84 +++++++++++ .../test/codegen/run-Pascal-Codegen-Tests.bat.tmpl | 2 +- lib/delphi/test/typeregistry/TestTypeRegistry.dpr | 89 ++++++++++++ lib/java/build.xml | 5 +- 22 files changed, 453 insertions(+), 95 deletions(-) ----------------------------------------------------------------------
