From ec19e8f4079f84c59386de52ddea4c7d9448f04e Mon Sep 17 00:00:00 2001 From: Ralph Langendam Date: Wed, 7 Jun 2017 12:37:45 +0200 Subject: [PATCH] Fixed minor compiler error and warning (#5762) * 5762 Fixed minor compiler error and warning * 5762 Regenerated cpprest petstore client --- .../src/main/resources/cpprest/apiclient-source.mustache | 2 +- .../src/main/resources/cpprest/modelbase-source.mustache | 2 +- samples/client/petstore/cpprest/.swagger-codegen/VERSION | 1 + samples/client/petstore/cpprest/ApiClient.cpp | 2 +- samples/client/petstore/cpprest/ModelBase.cpp | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 samples/client/petstore/cpprest/.swagger-codegen/VERSION diff --git a/modules/swagger-codegen/src/main/resources/cpprest/apiclient-source.mustache b/modules/swagger-codegen/src/main/resources/cpprest/apiclient-source.mustache index dc2bddb8db3..59ca1c180f8 100644 --- a/modules/swagger-codegen/src/main/resources/cpprest/apiclient-source.mustache +++ b/modules/swagger-codegen/src/main/resources/cpprest/apiclient-source.mustache @@ -122,7 +122,7 @@ pplx::task ApiClient::callApi( web::json::value body_data = web::json::value::object(); for (auto& kvp : formParams) { - body_data[U(kvp.first)] = ModelBase::toJson(kvp.second); + body_data[kvp.first] = ModelBase::toJson(kvp.second); } request.set_body(body_data); } diff --git a/modules/swagger-codegen/src/main/resources/cpprest/modelbase-source.mustache b/modules/swagger-codegen/src/main/resources/cpprest/modelbase-source.mustache index d578f192758..6df224f185a 100644 --- a/modules/swagger-codegen/src/main/resources/cpprest/modelbase-source.mustache +++ b/modules/swagger-codegen/src/main/resources/cpprest/modelbase-source.mustache @@ -273,7 +273,7 @@ int32_t ModelBase::int32_tFromJson(web::json::value& val) } float ModelBase::floatFromJson(web::json::value& val) { - return val.as_double(); + return static_cast(val.as_double()); } utility::string_t ModelBase::stringFromJson(web::json::value& val) { diff --git a/samples/client/petstore/cpprest/.swagger-codegen/VERSION b/samples/client/petstore/cpprest/.swagger-codegen/VERSION new file mode 100644 index 00000000000..7fea99011a6 --- /dev/null +++ b/samples/client/petstore/cpprest/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/cpprest/ApiClient.cpp b/samples/client/petstore/cpprest/ApiClient.cpp index aeed9ef42ae..69de9e34f95 100644 --- a/samples/client/petstore/cpprest/ApiClient.cpp +++ b/samples/client/petstore/cpprest/ApiClient.cpp @@ -134,7 +134,7 @@ pplx::task ApiClient::callApi( web::json::value body_data = web::json::value::object(); for (auto& kvp : formParams) { - body_data[U(kvp.first)] = ModelBase::toJson(kvp.second); + body_data[kvp.first] = ModelBase::toJson(kvp.second); } request.set_body(body_data); } diff --git a/samples/client/petstore/cpprest/ModelBase.cpp b/samples/client/petstore/cpprest/ModelBase.cpp index 07f44a15a0e..a311d7d1707 100644 --- a/samples/client/petstore/cpprest/ModelBase.cpp +++ b/samples/client/petstore/cpprest/ModelBase.cpp @@ -285,7 +285,7 @@ int32_t ModelBase::int32_tFromJson(web::json::value& val) } float ModelBase::floatFromJson(web::json::value& val) { - return val.as_double(); + return static_cast(val.as_double()); } utility::string_t ModelBase::stringFromJson(web::json::value& val) {