Commit bff4ea56 authored by Pavel Vainerman's avatar Pavel Vainerman

(UNetExchange): [ fixed ] error: overflow in implicit constant conversion [-Werror=overflow]

parent d3c36df6
......@@ -156,19 +156,19 @@ class UNetExchange:
private:
UNetExchange();
bool initPause;
timeout_t initPause;
UniSetTypes::uniset_rwmutex mutex_start;
PassiveTimer ptHeartBeat;
UniSetTypes::ObjectId sidHeartBeat;
int maxHeartBeat;
timeout_t maxHeartBeat;
IOController::IOStateList::iterator itHeartBeat;
UniSetTypes::ObjectId test_id;
int steptime; /*!< периодичность вызова step, [мсек] */
timeout_t steptime; /*!< периодичность вызова step, [мсек] */
std::atomic_bool activated;
int activateTimeout;
timeout_t activateTimeout;
struct ReceiverInfo
{
......
......@@ -41,7 +41,7 @@ class UNetSender
virtual ~UNetSender();
typedef int sendfactor_t;
typedef size_t sendfactor_t;
struct UItem
{
......@@ -166,7 +166,7 @@ class UNetSender
std::shared_ptr< ThreadCreator<UNetSender> > s_thr; // send thread
unsigned long ncycle = { 0 }; /*!< номер цикла посылки */
size_t ncycle = { 0 }; /*!< номер цикла посылки */
};
// -----------------------------------------------------------------------------
......
......@@ -118,13 +118,13 @@ class UniExchange:
void updateLocalData();
void initIterators();
int polltime = { 200 };
timeout_t polltime = { 200 };
PassiveTimer ptUpdate;
bool init_ok = { false };
SList mymap;
size_t maxIndex = { 0 };
int smReadyTimeout = { 15000 }; // msec
timeout_t smReadyTimeout = { 15000 }; // msec
private:
};
......
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