loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Fix compilation on Windows (#6608)

Browse Source
This commit is contained in:
sunn 2020-06-10 16:09:04 +02:00 committed by GitHub
parent 9fdcbec64b
commit 31d05f3f48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/modelbase-source.mustache vendored
View File

@ -222,10 +222,9 @@ bool ModelBase::fromString( const utility::string_t& val, std::shared_ptr<HttpCo
{ {
outVal = std::shared_ptr<HttpContent>(new HttpContent()); outVal = std::shared_ptr<HttpContent>(new HttpContent());
} }
std::shared_ptr<utility::stringstream_t> ssptr = std::make_shared<utility::stringstream_t>(val);
if(outVal != nullptr) if(outVal != nullptr)
{ {
outVal->setData(ssptr); outVal->setData(std::shared_ptr<std::istream>(new std::stringstream(utility::conversions::to_utf8string(val))));
} }
else else
{ {

10
samples/client/petstore/cpp-restsdk/PetApiTests.cpp
View File

@ -4,10 +4,10 @@
#include <thread> #include <thread>
#include <functional> #include <functional>
OAIPetApiTests::OAIPetApiTests(std::string host, std::string basePath){ OAIPetApiTests::OAIPetApiTests(utility::string_t host, utility::string_t basePath){
apiconfiguration = std::make_shared<ApiConfiguration>(); apiconfiguration = std::make_shared<ApiConfiguration>();
apiconfiguration->setBaseUrl(host + basePath); apiconfiguration->setBaseUrl(host + basePath);
apiconfiguration->setUserAgent(U("OpenAPI Client")); apiconfiguration->setUserAgent(utility::conversions::to_string_t("OpenAPI Client"));
apiclient = std::make_shared<ApiClient>(apiconfiguration); apiclient = std::make_shared<ApiClient>(apiconfiguration);
api = std::make_shared<PetApi>(apiclient); api = std::make_shared<PetApi>(apiclient);
} }
@ -25,8 +25,8 @@ void OAIPetApiTests::runTests(){
void OAIPetApiTests::testAddPet(){ void OAIPetApiTests::testAddPet(){
auto req = std::make_shared<Pet>(); auto req = std::make_shared<Pet>();
req->setId(12345); req->setId(12345);
req->setName("cpprest-pet"); req->setName(utility::conversions::to_string_t("cpprest-pet"));
req->setStatus(U("123")); req->setStatus(utility::conversions::to_string_t("123"));
std::function<void()> responseCallback = []() std::function<void()> responseCallback = []()
{ {
@ -49,7 +49,7 @@ void OAIPetApiTests::testAddPet(){
void OAIPetApiTests::testFindPetsByStatus(){ void OAIPetApiTests::testFindPetsByStatus(){
auto req = std::vector<utility::string_t>(); auto req = std::vector<utility::string_t>();
req.push_back(U("123")); req.push_back(utility::conversions::to_string_t("123"));
auto reqTask = api->findPetsByStatus(req) auto reqTask = api->findPetsByStatus(req)
.then([=](std::vector<std::shared_ptr<Pet>> pets) .then([=](std::vector<std::shared_ptr<Pet>> pets)
{ {

2
samples/client/petstore/cpp-restsdk/PetApiTests.h
View File

@ -14,7 +14,7 @@ using namespace org::openapitools::client::api;
class OAIPetApiTests class OAIPetApiTests
{ {
public: public:
explicit OAIPetApiTests(std::string host = U("http://petstore.swagger.io"), std::string basePath = U("/v2")); explicit OAIPetApiTests(utility::string_t host = utility::conversions::to_string_t("http://petstore.swagger.io"), utility::string_t basePath = utility::conversions::to_string_t("/v2"));
virtual ~OAIPetApiTests(); virtual ~OAIPetApiTests();
public: public:

3
samples/client/petstore/cpp-restsdk/client/ModelBase.cpp
View File

@ -233,10 +233,9 @@ bool ModelBase::fromString( const utility::string_t& val, std::shared_ptr<HttpCo
{ {
outVal = std::shared_ptr<HttpContent>(new HttpContent()); outVal = std::shared_ptr<HttpContent>(new HttpContent());
} }
std::shared_ptr<utility::stringstream_t> ssptr = std::make_shared<utility::stringstream_t>(val);
if(outVal != nullptr) if(outVal != nullptr)
{ {
outVal->setData(ssptr); outVal->setData(std::shared_ptr<std::istream>(new std::stringstream(utility::conversions::to_utf8string(val))));
} }
else else
{ {