Borland C++: Fixed compiler errors

This commit is contained in:
Daniel Marjamäki 2010-04-17 07:25:53 +02:00
parent 1b8799e7ef
commit 3bab5f6bd6
1 changed files with 8 additions and 8 deletions

View File

@ -57,12 +57,12 @@ class TimerResultsIntf
public: public:
virtual ~TimerResultsIntf() { } virtual ~TimerResultsIntf() { }
virtual void AddResults(const std::string& str, clock_t clocks) = 0; virtual void AddResults(const std::string& str, std::clock_t clocks) = 0;
}; };
struct TimerResultsData struct TimerResultsData
{ {
clock_t _clocks; std::clock_t _clocks;
unsigned int _numberOfResults; unsigned int _numberOfResults;
TimerResultsData() TimerResultsData()
@ -81,7 +81,7 @@ public:
void ShowResults() void ShowResults()
{ {
clock_t overallClocks = 0; std::clock_t overallClocks = 0;
std::map<std::string, struct TimerResultsData>::const_iterator I = _results.begin(); std::map<std::string, struct TimerResultsData>::const_iterator I = _results.begin();
const std::map<std::string, struct TimerResultsData>::const_iterator E = _results.end(); const std::map<std::string, struct TimerResultsData>::const_iterator E = _results.end();
@ -101,7 +101,7 @@ public:
std::cout << "Overall time: " << secOverall << "s" << std::endl; std::cout << "Overall time: " << secOverall << "s" << std::endl;
} }
virtual void AddResults(const std::string& str, clock_t clocks) virtual void AddResults(const std::string& str, std::clock_t clocks)
{ {
_results[str]._clocks += clocks; _results[str]._clocks += clocks;
_results[str]._numberOfResults++; _results[str]._numberOfResults++;
@ -124,7 +124,7 @@ public:
, _timerResults(timerResults) , _timerResults(timerResults)
{ {
if (showtimeMode != SHOWTIME_NONE) if (showtimeMode != SHOWTIME_NONE)
_start = clock(); _start = std::clock();
} }
~Timer() ~Timer()
@ -136,8 +136,8 @@ public:
{ {
if ((_showtimeMode != SHOWTIME_NONE) && !_stopped) if ((_showtimeMode != SHOWTIME_NONE) && !_stopped)
{ {
const clock_t end = clock(); const std::clock_t end = std::clock();
const clock_t diff = end - _start; const std::clock_t diff = end - _start;
if (_showtimeMode == SHOWTIME_FILE) if (_showtimeMode == SHOWTIME_FILE)
{ {
@ -159,7 +159,7 @@ private:
const std::string _str; const std::string _str;
const unsigned int _showtimeMode; const unsigned int _showtimeMode;
clock_t _start; std::clock_t _start;
bool _stopped; bool _stopped;
TimerResultsIntf* _timerResults; TimerResultsIntf* _timerResults;
}; };