From c17679060b8a25b538b72c6321661a167c71449f Mon Sep 17 00:00:00 2001 From: Ruslan Date: Mon, 2 May 2022 20:26:03 -0700 Subject: [PATCH] Fix for cpp-rest-sdk-client generator producing uncompilable code if there is a "-" (or other characters like a space etc.) in a property name of an object. (#12288) --- .../cpp-rest-sdk-client/model-source.mustache | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/model-source.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/model-source.mustache index 05861c89f2a..e8d2ea96a40 100644 --- a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/model-source.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/model-source.mustache @@ -188,9 +188,9 @@ bool {{classname}}::fromJson(const web::json::value& val) const web::json::value& fieldValue = val.at(utility::conversions::to_string_t(U("{{baseName}}"))); if(!fieldValue.is_null()) { - {{{dataType}}} refVal_{{baseName}}; - ok &= ModelBase::fromJson(fieldValue, refVal_{{baseName}}); - {{setter}}(refVal_{{baseName}}); + {{{dataType}}} refVal_{{setter}}; + ok &= ModelBase::fromJson(fieldValue, refVal_{{setter}}); + {{setter}}(refVal_{{setter}}); } }{{/isInherited}}{{/vars}} return ok; @@ -223,9 +223,9 @@ bool {{classname}}::fromMultiPart(std::shared_ptr multipart, {{#vars}} if(multipart->hasContent(utility::conversions::to_string_t(U("{{baseName}}")))) { - {{{dataType}}} refVal_{{baseName}}; - ok &= ModelBase::fromHttpContent(multipart->getContent(utility::conversions::to_string_t(U("{{baseName}}"))), refVal_{{baseName}} ); - {{setter}}(refVal_{{baseName}}); + {{{dataType}}} refVal_{{setter}}; + ok &= ModelBase::fromHttpContent(multipart->getContent(utility::conversions::to_string_t(U("{{baseName}}"))), refVal_{{setter}} ); + {{setter}}(refVal_{{setter}}); } {{/vars}} return ok;