Commit e4230078 authored by Martin Marinov's avatar Martin Marinov

Change the type of Progress:TickNumber to size_t to fix build errors on Linux.

parent 58b9a76a
......@@ -15,17 +15,6 @@
#ifdef PROGRESS_ON
namespace Progress {
#ifndef _MSC_VER
IOutputStream& operator<<(IOutputStream& _os, const TickNumber _i)
{
static_assert(sizeof(TickNumber) == sizeof(size_t),
"These types should be equal size");
return _os.print((size_t)_i);
}
#endif // !_MSC_VER
struct Context::LogData
{
typedef Base::OutputStreamAdaptT<std::ofstream> FileOutputStream;
......
......@@ -6,7 +6,7 @@
#ifdef PROGRESS_ON
#include <Base/Utils/Thread.hh>
#include <stdint.h>
#include <stddef.h>
namespace Base {
class IOutputStream;
......@@ -19,13 +19,8 @@ typedef Base::IOutputStream IOutputStream;
//! Progress tick counter type
typedef uint64_t TickNumber;
typedef size_t TickNumber;
#ifndef _MSC_VER
//! Streaming operator for TickNumber
IOutputStream& operator<<(IOutputStream& _os, const TickNumber _i);
#endif // !_MSC_VER
/*!
The name of the progress log file, uses the .csv format.
......
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