You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2012/12/15 03:18:35 UTC
[1/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/thrift
Updated Branches:
refs/heads/master ce52ae7f8 -> b03039208
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/b0303920
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/b0303920
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/b0303920
Branch: refs/heads/master
Commit: b03039208092ff96f69f49f5ea939855129e504f
Parents: aa4d3ae ce52ae7
Author: Jens Geyer <je...@apache.org>
Authored: Sat Dec 15 03:18:26 2012 +0100
Committer: Jens Geyer <je...@apache.org>
Committed: Sat Dec 15 03:18:26 2012 +0100
----------------------------------------------------------------------
compiler/cpp/src/generate/t_csharp_generator.cc | 244 ++++++++++++------
1 files changed, 167 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/b0303920/compiler/cpp/src/generate/t_csharp_generator.cc
----------------------------------------------------------------------
diff --cc compiler/cpp/src/generate/t_csharp_generator.cc
index ea1371b,c718353..3bba2b7
--- a/compiler/cpp/src/generate/t_csharp_generator.cc
+++ b/compiler/cpp/src/generate/t_csharp_generator.cc
@@@ -48,9 -48,9 +48,11 @@@ class t_csharp_generator : public t_oop
std::map<std::string, std::string>::const_iterator iter;
iter = parsed_options.find("async");
+ async_ = (iter != parsed_options.end());
+ iter = parsed_options.find("asyncctp");
async_ctp_ = (iter != parsed_options.end());
+ iter = parsed_options.find("nullable");
+ nullable_ = (iter != parsed_options.end());
iter = parsed_options.find("serial");
serialize_ = (iter != parsed_options.end());
@@@ -149,8 -153,8 +155,9 @@@
std::string namespace_name_;
std::ofstream f_service_;
std::string namespace_dir_;
+ bool async_;
bool async_ctp_;
+ bool nullable_;
bool serialize_;
bool wcf_;
std::string wcf_namespace_;
@@@ -2052,9 -2122,9 +2141,10 @@@ std::string t_csharp_generator::get_enu
}
THRIFT_REGISTER_GENERATOR(csharp, "C#",
-" async: Adds Async CTP support.\n"
+" async: Adds Async support using Task.Run.\n"
+" asyncctp: Adds Async CTP support using TaskEx.Run.\n"
" wcf: Adds bindings for WCF to generated classes.\n"
" serial: Add serialization support to generated classes.\n"
+ " nullable: Use nullable types for properties.\n"
)