mirrors/cpp-httplib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-httplib.git synced 2025-05-10 01:33:53 +00:00
Code Issues Projects Releases Wiki Activity

No longer support VS 2013 and older #1325 (#1326)

Browse Source 
* Fixed a warning

* No longer support VS 2013 and older (Fix #1325)
This commit is contained in:
yhirose 2022-07-14 20:57:41 -04:00 committed by GitHub
parent 5e6f973b99
commit 37bb3c6a77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
httplib.h
View File

@ -123,15 +123,17 @@
#endif //_CRT_NONSTDC_NO_DEPRECATE #endif //_CRT_NONSTDC_NO_DEPRECATE
#if defined(_MSC_VER) #if defined(_MSC_VER)
#if _MSC_VER < 1900
#error Sorry, Visual Studio versions prior to 2015 are not supported
#endif
#pragma comment(lib, "ws2_32.lib")
#ifdef _WIN64 #ifdef _WIN64
using ssize_t = __int64; using ssize_t = __int64;
#else #else
using ssize_t = int; using ssize_t = int;
#endif #endif
#if _MSC_VER < 1900
#define snprintf _snprintf_s
#endif
#endif // _MSC_VER #endif // _MSC_VER
#ifndef S_ISREG #ifndef S_ISREG
@ -154,10 +156,6 @@ using ssize_t = int;
#define WSA_FLAG_NO_HANDLE_INHERIT 0x80 #define WSA_FLAG_NO_HANDLE_INHERIT 0x80
#endif #endif
#ifdef _MSC_VER
#pragma comment(lib, "ws2_32.lib")
#endif
#ifndef strcasecmp #ifndef strcasecmp
#define strcasecmp _stricmp #define strcasecmp _stricmp
#endif // strcasecmp #endif // strcasecmp
@ -1520,11 +1518,7 @@ inline ssize_t Stream::write_format(const char *fmt, const Args &...args) {
const auto bufsiz = 2048; const auto bufsiz = 2048;
std::array<char, bufsiz> buf{}; std::array<char, bufsiz> buf{};
#if defined(_MSC_VER) && _MSC_VER < 1900
auto sn = _snprintf_s(buf.data(), bufsiz, _TRUNCATE, fmt, args...);
#else
auto sn = snprintf(buf.data(), buf.size() - 1, fmt, args...); auto sn = snprintf(buf.data(), buf.size() - 1, fmt, args...);
#endif
if (sn <= 0) { return sn; } if (sn <= 0) { return sn; }
auto n = static_cast<size_t>(sn); auto n = static_cast<size_t>(sn);
@ -1534,14 +1528,8 @@ inline ssize_t Stream::write_format(const char *fmt, const Args &...args) {
while (n >= glowable_buf.size() - 1) { while (n >= glowable_buf.size() - 1) {
glowable_buf.resize(glowable_buf.size() * 2); glowable_buf.resize(glowable_buf.size() * 2);
#if defined(_MSC_VER) && _MSC_VER < 1900
n = static_cast<size_t>(_snprintf_s(&glowable_buf[0], glowable_buf.size(),
glowable_buf.size() - 1, fmt,
args...));
#else
n = static_cast<size_t>( n = static_cast<size_t>(
snprintf(&glowable_buf[0], glowable_buf.size() - 1, fmt, args...)); snprintf(&glowable_buf[0], glowable_buf.size() - 1, fmt, args...));
#endif
} }
return write(&glowable_buf[0], n); return write(&glowable_buf[0], n);
} else { } else {
@ -4711,7 +4699,7 @@ inline bool BufferStream::is_readable() const { return true; }
inline bool BufferStream::is_writable() const { return true; } inline bool BufferStream::is_writable() const { return true; }
inline ssize_t BufferStream::read(char *ptr, size_t size) { inline ssize_t BufferStream::read(char *ptr, size_t size) {
#if defined(_MSC_VER) && _MSC_VER <= 1900 #if defined(_MSC_VER) && _MSC_VER < 1910
auto len_read = buffer._Copy_s(ptr, size, size, position); auto len_read = buffer._Copy_s(ptr, size, size, position);
#else #else
auto len_read = buffer.copy(ptr, size, position); auto len_read = buffer.copy(ptr, size, position);

2
test/test.cc
View File

@ -4982,7 +4982,7 @@ TEST(MultipartFormDataTest, LargeData) {
TEST(MultipartFormDataTest, WithPreamble) { TEST(MultipartFormDataTest, WithPreamble) {
Server svr; Server svr;
svr.Post("/post", [&](const Request &req, Response &res) { svr.Post("/post", [&](const Request & /*req*/, Response &res) {
res.set_content("ok", "text/plain"); res.set_content("ok", "text/plain");
}); });