Repository: thrift Updated Branches: refs/heads/master 1a74d9c0b -> f31eba9d4
THRIFT-2360 Json Generator remove C++11 dependency Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/f31eba9d Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/f31eba9d Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/f31eba9d Branch: refs/heads/master Commit: f31eba9d459bb927be3af7f608a3c4e8cd0174e0 Parents: 1a74d9c Author: Roger Meier <[email protected]> Authored: Mon Oct 13 00:53:49 2014 +0200 Committer: Roger Meier <[email protected]> Committed: Mon Oct 13 00:53:49 2014 +0200 ---------------------------------------------------------------------- compiler/cpp/src/generate/t_json_generator.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/f31eba9d/compiler/cpp/src/generate/t_json_generator.cc ---------------------------------------------------------------------- diff --git a/compiler/cpp/src/generate/t_json_generator.cc b/compiler/cpp/src/generate/t_json_generator.cc index d17088f..794e69e 100644 --- a/compiler/cpp/src/generate/t_json_generator.cc +++ b/compiler/cpp/src/generate/t_json_generator.cc @@ -104,7 +104,7 @@ void t_json_generator::init_generator() { string t_json_generator::escapeJsonString(const string& input) { std::ostringstream ss; - for (auto iter = input.cbegin(); iter != input.cend(); iter++) { + for (std::string::const_iterator iter = input.begin(); iter != input.end(); iter++) { switch (*iter) { case '\\': ss << "\\\\"; break; case '"': ss << "\\\""; break; @@ -400,7 +400,7 @@ void t_json_generator::generate_field(t_field * field){ write_key("type", get_type_name(field->get_type())); if (field->has_doc()) write_key("doc", field->get_doc()); switch (field->get_req()) { - case t_field::e_req::T_REQUIRED: + case t_field::T_REQUIRED: write_key("required", "true"); break; default: @@ -416,9 +416,9 @@ string t_json_generator::get_const_value(t_const_value* tvalue){ switch (tvalue->get_type()) { case t_const_value::CV_INTEGER: - return std::to_string(tvalue->get_integer()); + return tvalue->get_string(); case t_const_value::CV_DOUBLE: - return std::to_string(tvalue->get_double()); + return tvalue->get_string(); case t_const_value::CV_STRING: return tvalue->get_string(); case t_const_value::CV_LIST:
