From a05b846fe3e58d3cc60ad821e13a1cae10fb52ea Mon Sep 17 00:00:00 2001 From: an-tao Date: Sat, 6 Oct 2018 23:32:53 +0800 Subject: [PATCH] Including some header files for linux --- lib/inc/drogon/HttpViewData.h | 6 ++++-- lib/src/Utilities.cc | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/inc/drogon/HttpViewData.h b/lib/inc/drogon/HttpViewData.h index d92971da..5484ddcf 100755 --- a/lib/inc/drogon/HttpViewData.h +++ b/lib/inc/drogon/HttpViewData.h @@ -21,6 +21,8 @@ #include #include #include +#include +#include typedef std::unordered_map ViewDataMap; namespace drogon @@ -69,7 +71,7 @@ namespace drogon va_copy(backup_ap, ap); auto result=vsnprintf((char *)strBuffer.data(), strBuffer.size(), format, backup_ap); va_end(backup_ap); - if ((result >= 0) && (result < strBuffer.size())) { + if ((result >= 0) && ((std::string::size_type)result < strBuffer.size())) { strBuffer.resize(result); } else @@ -86,7 +88,7 @@ namespace drogon auto result=vsnprintf((char *)strBuffer.data(), strBuffer.size(), format, backup_ap); va_end(backup_ap); - if ((result >= 0) && (result < strBuffer.size())) { + if ((result >= 0) && ((std::string::size_type)result < strBuffer.size())) { strBuffer.resize(result); break; } diff --git a/lib/src/Utilities.cc b/lib/src/Utilities.cc index 24099d7e..560ca04a 100755 --- a/lib/src/Utilities.cc +++ b/lib/src/Utilities.cc @@ -4,6 +4,8 @@ #include #include #include +#include +#include namespace drogon{ static const std::string base64_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" @@ -320,7 +322,7 @@ namespace drogon{ va_copy(backup_ap, ap); auto result=vsnprintf((char *)strBuffer.data(), strBuffer.size(), format, backup_ap); va_end(backup_ap); - if ((result >= 0) && (result < strBuffer.size())) { + if ((result >= 0) && ((std::string::size_type)result < strBuffer.size())) { strBuffer.resize(result); } else @@ -337,7 +339,7 @@ namespace drogon{ auto result=vsnprintf((char *)strBuffer.data(), strBuffer.size(), format, backup_ap); va_end(backup_ap); - if ((result >= 0) && (result < strBuffer.size())) { + if ((result >= 0) && ((std::string::size_type)result < strBuffer.size())) { strBuffer.resize(result); break; }