ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolve [-Wdeprecated-declarations]

This commit is contained in:
Minty-Meeo 2023-03-23 11:01:13 -05:00 committed by get
parent 528f7c90e9
commit 244918acb8
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/Common/HttpRequest.cpp
View File

@ -33,8 +33,8 @@ public:
Response Fetch(const std::string& url, Method method, const Headers& headers, const u8* payload, Response Fetch(const std::string& url, Method method, const Headers& headers, const u8* payload,
size_t size, AllowedReturnCodes codes = AllowedReturnCodes::Ok_Only); size_t size, AllowedReturnCodes codes = AllowedReturnCodes::Ok_Only);
static int CurlProgressCallback(Impl* impl, double dlnow, double dltotal, double ulnow, static int CurlProgressCallback(Impl* impl, curl_off_t dltotal, curl_off_t dlnow,
double ultotal); curl_off_t ultotal, curl_off_t ulnow);
std::string EscapeComponent(const std::string& string); std::string EscapeComponent(const std::string& string);
private: private:
@ -95,11 +95,12 @@ HttpRequest::Response HttpRequest::Post(const std::string& url, const std::strin
reinterpret_cast<const u8*>(payload.data()), payload.size(), codes); reinterpret_cast<const u8*>(payload.data()), payload.size(), codes);
} }
int HttpRequest::Impl::CurlProgressCallback(Impl* impl, double dlnow, double dltotal, double ulnow, int HttpRequest::Impl::CurlProgressCallback(Impl* impl, curl_off_t dltotal, curl_off_t dlnow,
double ultotal) curl_off_t ultotal, curl_off_t ulnow)
{ {
// Abort if callback isn't true // Abort if callback isn't true
return !impl->m_callback(dlnow, dltotal, ulnow, ultotal); return !impl->m_callback(static_cast<s64>(dltotal), static_cast<s64>(dlnow),
static_cast<s64>(ultotal), static_cast<s64>(ulnow));
} }
HttpRequest::Impl::Impl(std::chrono::milliseconds timeout_ms, ProgressCallback callback) HttpRequest::Impl::Impl(std::chrono::milliseconds timeout_ms, ProgressCallback callback)
@ -116,7 +117,7 @@ HttpRequest::Impl::Impl(std::chrono::milliseconds timeout_ms, ProgressCallback c
if (m_callback) if (m_callback)
{ {
curl_easy_setopt(m_curl.get(), CURLOPT_PROGRESSDATA, this); curl_easy_setopt(m_curl.get(), CURLOPT_PROGRESSDATA, this);
curl_easy_setopt(m_curl.get(), CURLOPT_PROGRESSFUNCTION, CurlProgressCallback); curl_easy_setopt(m_curl.get(), CURLOPT_XFERINFOFUNCTION, CurlProgressCallback);
} }
// Set up error buffer // Set up error buffer

3
Source/Core/Common/HttpRequest.h
View File

@ -25,8 +25,7 @@ public:
}; };
// Return false to abort the request // Return false to abort the request
using ProgressCallback = using ProgressCallback = std::function<bool(s64 dltotal, s64 dlnow, s64 ultotal, s64 ulnow)>;
std::function<bool(double dlnow, double dltotal, double ulnow, double ultotal)>;
explicit HttpRequest(std::chrono::milliseconds timeout_ms = std::chrono::milliseconds{3000}, explicit HttpRequest(std::chrono::milliseconds timeout_ms = std::chrono::milliseconds{3000},
ProgressCallback callback = nullptr); ProgressCallback callback = nullptr);

2
Source/Core/UpdaterCommon/UpdaterCommon.cpp
View File

@ -58,7 +58,7 @@ void LogToFile(const char* fmt, ...)
va_end(args); va_end(args);
} }
bool ProgressCallback(double total, double now, double, double) bool ProgressCallback(s64 total, s64 now, s64, s64)
{ {
UI::SetCurrentProgress(static_cast<int>(now), static_cast<int>(total)); UI::SetCurrentProgress(static_cast<int>(now), static_cast<int>(total));
return true; return true;