Commit 33884f31 authored by qiancheng xu's avatar qiancheng xu

Fix the problem: Can't call std::max because minwindef.h defines “max”.

Change the return type of function AgentsSource::ResetRemainingAgents().
parent 9487e442
Pipeline #15311 passed with stages
in 19 minutes and 22 seconds
......@@ -18,7 +18,7 @@
//
// Created by laemmel on 31.03.16.
//
#define NOMINMAX
#include "PedDistributionParser.h"
#include "../tinyxml/tinyxml.h"
#include <cstdarg> // va_start and va_end
......
......@@ -165,7 +165,7 @@ int AgentsSource::GetRemainingAgents() const
return _remainingAgents;
}
int AgentsSource::ResetRemainingAgents()
void AgentsSource::ResetRemainingAgents()
{
_remainingAgents = _chunkAgents;
}
......
......@@ -131,7 +131,7 @@ public:
int GetMaxAgents() const;
int GetChunkAgents() const;
int GetRemainingAgents() const;
int ResetRemainingAgents();
void ResetRemainingAgents();
void UpdateRemainingAgents(int remaining);
float GetPercent() const;
float GetRate() const;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment