Fixed VS compilation (MAX_PRIORITY is a #define somewhere), and while

it can probably be disabled, it's just annoying to search the reason for
a rather incomprehensible error message all over again.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14622 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2013-12-03 23:54:11 +00:00
parent 697a7cf111
commit 7c2e48e2c6
3 changed files with 5 additions and 4 deletions

View File

@ -712,7 +712,7 @@ namespace Online{
{
if(isRegisteredUser())
{
HTTPRequest * request = new HTTPRequest(true, HTTPManager::MAX_PRIORITY);
HTTPRequest * request = new HTTPRequest(true, HTTPManager::HTTP_MAX_PRIORITY);
request->setURL((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
request->setParameter("action", std::string("client-quit"));
request->setParameter("token", getToken());

View File

@ -142,7 +142,7 @@ namespace Online{
// thread here to cancel properly.
//cancelAllDownloads(); FIXME if used this way it also cancels the client-quit action
CurrentUser::get()->onSTKQuit();
addRequest(new Request(true, MAX_PRIORITY, Request::RT_QUIT));
addRequest(new Request(true, HTTP_MAX_PRIORITY, Request::RT_QUIT));
} // stopNetworkThread
@ -154,7 +154,8 @@ namespace Online{
void HTTPManager::cancelAllDownloads()
{
m_abort.setAtomic(true);
//FIXME doesn't get called at the moment. When using this again, be sure that MAX_PRIORITY requests still get executed.
// FIXME doesn't get called at the moment. When using this again,
// be sure that HTTP_MAX_PRIORITY requests still get executed.
} // cancelAllDownloads

View File

@ -82,7 +82,7 @@ namespace Online{
~HTTPManager();
public:
static const int MAX_PRIORITY = 9999;
static const int HTTP_MAX_PRIORITY = 9999;
// singleton
static HTTPManager* get();