From 1a7c2a786367ef5737ffcb88e94414f084b57b57 Mon Sep 17 00:00:00 2001 From: an-tao Date: Sun, 15 Aug 2021 23:27:11 +0800 Subject: [PATCH] Fix for old compiler --- drogon_ctl/create_swagger.cc | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/drogon_ctl/create_swagger.cc b/drogon_ctl/create_swagger.cc index e95d7ca398..7e109ddb6c 100644 --- a/drogon_ctl/create_swagger.cc +++ b/drogon_ctl/create_swagger.cc @@ -104,13 +104,15 @@ class StructNode } } } - return {content.substr(pos1, pos2 - pos1), content.substr(pos2 + 1)}; + return std::pair(content.substr(pos1, + pos2 - pos1), + content.substr(pos2 + 1)); } std::pair findClass(const std::string &content) { LOG_DEBUG << "findClass: " << content; if (content.empty()) - return {nullptr, ""}; + return std::pair(nullptr, ""); std::regex rx(R"(class[ \r\n]+([^ \r\n\{]+)[ \r\n\{:]+)"); std::smatch results; if (std::regex_search(content, results, rx)) @@ -118,19 +120,22 @@ class StructNode assert(results.size() > 1); auto nextPart = findContentOfClassOrNameSpace(content, results.position()); - return {std::make_shared(nextPart.first, - results[1].str(), - kClass), - nextPart.second}; + return std::pair( + std::make_shared(nextPart.first, + results[1].str(), + kClass), + nextPart.second); } - return {nullptr, ""}; + return std::pair(nullptr, ""); } std::tuple findNameSpace( const std::string &content) { LOG_DEBUG << "findNameSpace"; if (content.empty()) - return {"", nullptr, ""}; + return std::tuple("", + nullptr, + ""); std::regex rx(R"(namespace[ \r\n]+([^ \r\n]+)[ \r\n]*\{)"); std::smatch results; if (std::regex_search(content, results, rx)) @@ -143,11 +148,14 @@ class StructNode results[1].str(), kNameSpace); - return {first, npNodePtr, nextPart.second}; + return std::tuple( + first, npNodePtr, nextPart.second); } else { - return {"", nullptr, ""}; + return std::tuple("", + nullptr, + ""); } } std::vector parse(const std::string &content) @@ -221,6 +229,10 @@ class StructNode { child->print(indent + 2); } + if (type_ == kClass) + { + std::cout << content_ << "\n"; + } std::cout << ind << "}"; if (type_ == kClass) std::cout << ";";