From c1acd7c00adaeca00af842344f9355b3d26ec2f5 Mon Sep 17 00:00:00 2001
From: etherealjoy <sunn.ssb@live.com>
Date: Sun, 15 Sep 2019 18:35:15 +0200
Subject: [PATCH 1/2] Fixed wstring on linux

---
 .../resources/cpp-rest-sdk-client/modelbase-source.mustache   | 2 +-
 samples/client/petstore/cpp-restsdk/client/ApiClient.cpp      | 2 +-
 samples/client/petstore/cpp-restsdk/client/ApiClient.h        | 2 +-
 .../client/petstore/cpp-restsdk/client/ApiConfiguration.cpp   | 2 +-
 samples/client/petstore/cpp-restsdk/client/ApiConfiguration.h | 2 +-
 samples/client/petstore/cpp-restsdk/client/ApiException.cpp   | 2 +-
 samples/client/petstore/cpp-restsdk/client/ApiException.h     | 2 +-
 samples/client/petstore/cpp-restsdk/client/HttpContent.cpp    | 2 +-
 samples/client/petstore/cpp-restsdk/client/HttpContent.h      | 2 +-
 samples/client/petstore/cpp-restsdk/client/IHttpBody.h        | 2 +-
 samples/client/petstore/cpp-restsdk/client/JsonBody.cpp       | 2 +-
 samples/client/petstore/cpp-restsdk/client/JsonBody.h         | 2 +-
 samples/client/petstore/cpp-restsdk/client/ModelBase.cpp      | 4 ++--
 samples/client/petstore/cpp-restsdk/client/ModelBase.h        | 2 +-
 .../client/petstore/cpp-restsdk/client/MultipartFormData.cpp  | 2 +-
 .../client/petstore/cpp-restsdk/client/MultipartFormData.h    | 2 +-
 samples/client/petstore/cpp-restsdk/client/Object.cpp         | 2 +-
 samples/client/petstore/cpp-restsdk/client/Object.h           | 2 +-
 samples/client/petstore/cpp-restsdk/client/api/PetApi.cpp     | 2 +-
 samples/client/petstore/cpp-restsdk/client/api/PetApi.h       | 2 +-
 samples/client/petstore/cpp-restsdk/client/api/StoreApi.cpp   | 2 +-
 samples/client/petstore/cpp-restsdk/client/api/StoreApi.h     | 2 +-
 samples/client/petstore/cpp-restsdk/client/api/UserApi.cpp    | 2 +-
 samples/client/petstore/cpp-restsdk/client/api/UserApi.h      | 2 +-
 .../client/petstore/cpp-restsdk/client/model/ApiResponse.cpp  | 2 +-
 .../client/petstore/cpp-restsdk/client/model/ApiResponse.h    | 2 +-
 samples/client/petstore/cpp-restsdk/client/model/Category.cpp | 2 +-
 samples/client/petstore/cpp-restsdk/client/model/Category.h   | 2 +-
 samples/client/petstore/cpp-restsdk/client/model/Order.cpp    | 2 +-
 samples/client/petstore/cpp-restsdk/client/model/Order.h      | 2 +-
 samples/client/petstore/cpp-restsdk/client/model/Pet.cpp      | 2 +-
 samples/client/petstore/cpp-restsdk/client/model/Pet.h        | 2 +-
 samples/client/petstore/cpp-restsdk/client/model/Tag.cpp      | 2 +-
 samples/client/petstore/cpp-restsdk/client/model/Tag.h        | 2 +-
 samples/client/petstore/cpp-restsdk/client/model/User.cpp     | 2 +-
 samples/client/petstore/cpp-restsdk/client/model/User.h       | 2 +-
 36 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/modelbase-source.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/modelbase-source.mustache
index 91446e73a33..47e8db7d02b 100644
--- a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/modelbase-source.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/modelbase-source.mustache
@@ -285,7 +285,7 @@ utility::string_t ModelBase::stringFromJson(const web::json::value& val)
 
 utility::datetime ModelBase::dateFromJson(const web::json::value& val)
 {
-    return val.is_null() ? utility::datetime::from_string(L"NULL", utility::datetime::ISO_8601) : utility::datetime::from_string(val.as_string(), utility::datetime::ISO_8601);
+	return val.is_null() ? utility::datetime::from_string(utility::conversions::to_string_t("NULL"), utility::datetime::ISO_8601) : utility::datetime::from_string(val.as_string(), utility::datetime::ISO_8601);	
 }
 bool ModelBase::boolFromJson(const web::json::value& val)
 {
diff --git a/samples/client/petstore/cpp-restsdk/client/ApiClient.cpp b/samples/client/petstore/cpp-restsdk/client/ApiClient.cpp
index 7322c22305c..7aa7c87fc28 100644
--- a/samples/client/petstore/cpp-restsdk/client/ApiClient.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/ApiClient.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/ApiClient.h b/samples/client/petstore/cpp-restsdk/client/ApiClient.h
index c41ffa71558..bfabf55ec9b 100644
--- a/samples/client/petstore/cpp-restsdk/client/ApiClient.h
+++ b/samples/client/petstore/cpp-restsdk/client/ApiClient.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.cpp b/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.cpp
index 6d189ae2091..0d8f3fde31c 100644
--- a/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.h b/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.h
index 12701aabdd2..45b5145ab79 100644
--- a/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.h
+++ b/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/ApiException.cpp b/samples/client/petstore/cpp-restsdk/client/ApiException.cpp
index f45ee1f0179..aae7fcd050c 100644
--- a/samples/client/petstore/cpp-restsdk/client/ApiException.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/ApiException.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/ApiException.h b/samples/client/petstore/cpp-restsdk/client/ApiException.h
index 882f9941ca7..8be47599399 100644
--- a/samples/client/petstore/cpp-restsdk/client/ApiException.h
+++ b/samples/client/petstore/cpp-restsdk/client/ApiException.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/HttpContent.cpp b/samples/client/petstore/cpp-restsdk/client/HttpContent.cpp
index 595b5368ea5..7664053f202 100644
--- a/samples/client/petstore/cpp-restsdk/client/HttpContent.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/HttpContent.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/HttpContent.h b/samples/client/petstore/cpp-restsdk/client/HttpContent.h
index aadb725cedd..2024da6764e 100644
--- a/samples/client/petstore/cpp-restsdk/client/HttpContent.h
+++ b/samples/client/petstore/cpp-restsdk/client/HttpContent.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/IHttpBody.h b/samples/client/petstore/cpp-restsdk/client/IHttpBody.h
index de53bbe061d..4bcd03e1006 100644
--- a/samples/client/petstore/cpp-restsdk/client/IHttpBody.h
+++ b/samples/client/petstore/cpp-restsdk/client/IHttpBody.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/JsonBody.cpp b/samples/client/petstore/cpp-restsdk/client/JsonBody.cpp
index d0a8630ded6..19e60971c57 100644
--- a/samples/client/petstore/cpp-restsdk/client/JsonBody.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/JsonBody.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/JsonBody.h b/samples/client/petstore/cpp-restsdk/client/JsonBody.h
index cc5132f968a..f8011a08da6 100644
--- a/samples/client/petstore/cpp-restsdk/client/JsonBody.h
+++ b/samples/client/petstore/cpp-restsdk/client/JsonBody.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp b/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp
index 1aab52acc40..05213fdf848 100644
--- a/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -296,7 +296,7 @@ utility::string_t ModelBase::stringFromJson(const web::json::value& val)
 
 utility::datetime ModelBase::dateFromJson(const web::json::value& val)
 {
-    return val.is_null() ? utility::datetime::from_string(L"NULL", utility::datetime::ISO_8601) : utility::datetime::from_string(val.as_string(), utility::datetime::ISO_8601);
+	return val.is_null() ? utility::datetime::from_string(utility::conversions::to_string_t("NULL"), utility::datetime::ISO_8601) : utility::datetime::from_string(val.as_string(), utility::datetime::ISO_8601);	
 }
 bool ModelBase::boolFromJson(const web::json::value& val)
 {
diff --git a/samples/client/petstore/cpp-restsdk/client/ModelBase.h b/samples/client/petstore/cpp-restsdk/client/ModelBase.h
index 903259b3568..91eed9bc776 100644
--- a/samples/client/petstore/cpp-restsdk/client/ModelBase.h
+++ b/samples/client/petstore/cpp-restsdk/client/ModelBase.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/MultipartFormData.cpp b/samples/client/petstore/cpp-restsdk/client/MultipartFormData.cpp
index c9dbb87ccbc..d38042f15cb 100644
--- a/samples/client/petstore/cpp-restsdk/client/MultipartFormData.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/MultipartFormData.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/MultipartFormData.h b/samples/client/petstore/cpp-restsdk/client/MultipartFormData.h
index d8eec95b333..e94e4487953 100644
--- a/samples/client/petstore/cpp-restsdk/client/MultipartFormData.h
+++ b/samples/client/petstore/cpp-restsdk/client/MultipartFormData.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/Object.cpp b/samples/client/petstore/cpp-restsdk/client/Object.cpp
index 4ff21f09375..d148cb427e8 100644
--- a/samples/client/petstore/cpp-restsdk/client/Object.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/Object.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/Object.h b/samples/client/petstore/cpp-restsdk/client/Object.h
index c688e4f28d6..191d17e2cc7 100644
--- a/samples/client/petstore/cpp-restsdk/client/Object.h
+++ b/samples/client/petstore/cpp-restsdk/client/Object.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/api/PetApi.cpp b/samples/client/petstore/cpp-restsdk/client/api/PetApi.cpp
index 93e5d8d4897..c5c68011d17 100644
--- a/samples/client/petstore/cpp-restsdk/client/api/PetApi.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/api/PetApi.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/api/PetApi.h b/samples/client/petstore/cpp-restsdk/client/api/PetApi.h
index f95c29ddd4c..422ad2afee8 100644
--- a/samples/client/petstore/cpp-restsdk/client/api/PetApi.h
+++ b/samples/client/petstore/cpp-restsdk/client/api/PetApi.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/api/StoreApi.cpp b/samples/client/petstore/cpp-restsdk/client/api/StoreApi.cpp
index e991f48b07f..a1651f3a160 100644
--- a/samples/client/petstore/cpp-restsdk/client/api/StoreApi.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/api/StoreApi.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h b/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h
index cc2420fe3ae..a13033db76a 100644
--- a/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h
+++ b/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/api/UserApi.cpp b/samples/client/petstore/cpp-restsdk/client/api/UserApi.cpp
index dadd8fdbe14..ac5933dde09 100644
--- a/samples/client/petstore/cpp-restsdk/client/api/UserApi.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/api/UserApi.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/api/UserApi.h b/samples/client/petstore/cpp-restsdk/client/api/UserApi.h
index cce86a50186..ede5f2937c7 100644
--- a/samples/client/petstore/cpp-restsdk/client/api/UserApi.h
+++ b/samples/client/petstore/cpp-restsdk/client/api/UserApi.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.cpp b/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.cpp
index 22a5325268f..2fa289ebd99 100644
--- a/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.h b/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.h
index 430d8263a82..6567d7a82c8 100644
--- a/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.h
+++ b/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/model/Category.cpp b/samples/client/petstore/cpp-restsdk/client/model/Category.cpp
index e3dacdc5a71..c181f0ba6fa 100644
--- a/samples/client/petstore/cpp-restsdk/client/model/Category.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/model/Category.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/model/Category.h b/samples/client/petstore/cpp-restsdk/client/model/Category.h
index 2f84432cfc5..d12c200ca70 100644
--- a/samples/client/petstore/cpp-restsdk/client/model/Category.h
+++ b/samples/client/petstore/cpp-restsdk/client/model/Category.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/model/Order.cpp b/samples/client/petstore/cpp-restsdk/client/model/Order.cpp
index e0c8efb0def..2d869abdd45 100644
--- a/samples/client/petstore/cpp-restsdk/client/model/Order.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/model/Order.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/model/Order.h b/samples/client/petstore/cpp-restsdk/client/model/Order.h
index c1dd6cc72a5..b678f43361e 100644
--- a/samples/client/petstore/cpp-restsdk/client/model/Order.h
+++ b/samples/client/petstore/cpp-restsdk/client/model/Order.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/model/Pet.cpp b/samples/client/petstore/cpp-restsdk/client/model/Pet.cpp
index 3f595e30214..f82d856aaac 100644
--- a/samples/client/petstore/cpp-restsdk/client/model/Pet.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/model/Pet.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/model/Pet.h b/samples/client/petstore/cpp-restsdk/client/model/Pet.h
index 875754ec678..5c8a9ddaedf 100644
--- a/samples/client/petstore/cpp-restsdk/client/model/Pet.h
+++ b/samples/client/petstore/cpp-restsdk/client/model/Pet.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/model/Tag.cpp b/samples/client/petstore/cpp-restsdk/client/model/Tag.cpp
index 20585ada362..9b46c05f0d7 100644
--- a/samples/client/petstore/cpp-restsdk/client/model/Tag.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/model/Tag.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/model/Tag.h b/samples/client/petstore/cpp-restsdk/client/model/Tag.h
index 0ff1241b09f..921d17672be 100644
--- a/samples/client/petstore/cpp-restsdk/client/model/Tag.h
+++ b/samples/client/petstore/cpp-restsdk/client/model/Tag.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/model/User.cpp b/samples/client/petstore/cpp-restsdk/client/model/User.cpp
index 33547426e0f..ace766573f3 100644
--- a/samples/client/petstore/cpp-restsdk/client/model/User.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/model/User.cpp
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/client/model/User.h b/samples/client/petstore/cpp-restsdk/client/model/User.h
index 9ff871a6108..ce0fea2d166 100644
--- a/samples/client/petstore/cpp-restsdk/client/model/User.h
+++ b/samples/client/petstore/cpp-restsdk/client/model/User.h
@@ -4,7 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 4.1.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.1.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-- 
GitLab


From 5346db8e4c2445726bf4e5a6c8a4929cd56920f0 Mon Sep 17 00:00:00 2001
From: etherealjoy <sunn.ssb@live.com>
Date: Mon, 16 Sep 2019 21:11:12 +0200
Subject: [PATCH 2/2] Removed whitespace

---
 .../cpp-rest-sdk-client/modelbase-source.mustache  | 14 +++++++-------
 .../petstore/cpp-restsdk/client/ModelBase.cpp      | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/modelbase-source.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/modelbase-source.mustache
index 47e8db7d02b..f4548d75605 100644
--- a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/modelbase-source.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/modelbase-source.mustache
@@ -118,8 +118,8 @@ std::shared_ptr<HttpContent> ModelBase::toHttpContent( const utility::string_t&
     content->setName( name );
     content->setContentDisposition( utility::conversions::to_string_t("form-data") );
     content->setContentType( contentType );
-	std::stringstream* valueAsStringStream = new std::stringstream();
-	(*valueAsStringStream) << value;
+    std::stringstream* valueAsStringStream = new std::stringstream();
+    (*valueAsStringStream) << value;
     content->setData( std::shared_ptr<std::istream>( valueAsStringStream ) );
     return content;
 }
@@ -129,8 +129,8 @@ std::shared_ptr<HttpContent> ModelBase::toHttpContent( const utility::string_t&
     content->setName( name );
     content->setContentDisposition( utility::conversions::to_string_t("form-data") );
     content->setContentType( contentType );
-	std::stringstream* valueAsStringStream = new std::stringstream();
-	(*valueAsStringStream) << value;
+    std::stringstream* valueAsStringStream = new std::stringstream();
+    (*valueAsStringStream) << value;
     content->setData( std::shared_ptr<std::istream>( valueAsStringStream) ) ;
     return content;
 }
@@ -140,8 +140,8 @@ std::shared_ptr<HttpContent> ModelBase::toHttpContent( const utility::string_t&
     content->setName( name );
     content->setContentDisposition( utility::conversions::to_string_t("form-data") );
     content->setContentType( contentType );
-	std::stringstream* valueAsStringStream = new std::stringstream();
-	(*valueAsStringStream) << value;
+    std::stringstream* valueAsStringStream = new std::stringstream();
+    (*valueAsStringStream) << value;
     content->setData( std::shared_ptr<std::istream>( valueAsStringStream ) );
     return content;
 }
@@ -285,7 +285,7 @@ utility::string_t ModelBase::stringFromJson(const web::json::value& val)
 
 utility::datetime ModelBase::dateFromJson(const web::json::value& val)
 {
-	return val.is_null() ? utility::datetime::from_string(utility::conversions::to_string_t("NULL"), utility::datetime::ISO_8601) : utility::datetime::from_string(val.as_string(), utility::datetime::ISO_8601);	
+    return val.is_null() ? utility::datetime::from_string(utility::conversions::to_string_t("NULL"), utility::datetime::ISO_8601) : utility::datetime::from_string(val.as_string(), utility::datetime::ISO_8601);   
 }
 bool ModelBase::boolFromJson(const web::json::value& val)
 {
diff --git a/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp b/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp
index 05213fdf848..940b9884d23 100644
--- a/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp
+++ b/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp
@@ -129,8 +129,8 @@ std::shared_ptr<HttpContent> ModelBase::toHttpContent( const utility::string_t&
     content->setName( name );
     content->setContentDisposition( utility::conversions::to_string_t("form-data") );
     content->setContentType( contentType );
-	std::stringstream* valueAsStringStream = new std::stringstream();
-	(*valueAsStringStream) << value;
+    std::stringstream* valueAsStringStream = new std::stringstream();
+    (*valueAsStringStream) << value;
     content->setData( std::shared_ptr<std::istream>( valueAsStringStream ) );
     return content;
 }
@@ -140,8 +140,8 @@ std::shared_ptr<HttpContent> ModelBase::toHttpContent( const utility::string_t&
     content->setName( name );
     content->setContentDisposition( utility::conversions::to_string_t("form-data") );
     content->setContentType( contentType );
-	std::stringstream* valueAsStringStream = new std::stringstream();
-	(*valueAsStringStream) << value;
+    std::stringstream* valueAsStringStream = new std::stringstream();
+    (*valueAsStringStream) << value;
     content->setData( std::shared_ptr<std::istream>( valueAsStringStream) ) ;
     return content;
 }
@@ -151,8 +151,8 @@ std::shared_ptr<HttpContent> ModelBase::toHttpContent( const utility::string_t&
     content->setName( name );
     content->setContentDisposition( utility::conversions::to_string_t("form-data") );
     content->setContentType( contentType );
-	std::stringstream* valueAsStringStream = new std::stringstream();
-	(*valueAsStringStream) << value;
+    std::stringstream* valueAsStringStream = new std::stringstream();
+    (*valueAsStringStream) << value;
     content->setData( std::shared_ptr<std::istream>( valueAsStringStream ) );
     return content;
 }
@@ -296,7 +296,7 @@ utility::string_t ModelBase::stringFromJson(const web::json::value& val)
 
 utility::datetime ModelBase::dateFromJson(const web::json::value& val)
 {
-	return val.is_null() ? utility::datetime::from_string(utility::conversions::to_string_t("NULL"), utility::datetime::ISO_8601) : utility::datetime::from_string(val.as_string(), utility::datetime::ISO_8601);	
+    return val.is_null() ? utility::datetime::from_string(utility::conversions::to_string_t("NULL"), utility::datetime::ISO_8601) : utility::datetime::from_string(val.as_string(), utility::datetime::ISO_8601);   
 }
 bool ModelBase::boolFromJson(const web::json::value& val)
 {
-- 
GitLab