Commit ac4ee7d1 authored by Pavel Vainerman's avatar Pavel Vainerman

Исправления по результатам компиляции в travis-ci.org

parent e959c3a8
...@@ -274,7 +274,7 @@ AC_SUBST(COV_CFLAGS) ...@@ -274,7 +274,7 @@ AC_SUBST(COV_CFLAGS)
AM_CONDITIONAL(HAVE_COVERAGE, test ${buildgcov} = true) AM_CONDITIONAL(HAVE_COVERAGE, test ${buildgcov} = true)
AM_CONDITIONAL(HAVE_TESTS, test ${buildtests} = true) AM_CONDITIONAL(HAVE_TESTS, test ${buildtests} = true)
# -Weffc++ # -Weffc++ -Wno-unused-variable"
CXX_EXTRA_FLAGS="-Wnon-virtual-dtor -Wctor-dtor-privacy -Woverloaded-virtual -Werror" CXX_EXTRA_FLAGS="-Wnon-virtual-dtor -Wctor-dtor-privacy -Woverloaded-virtual -Werror"
# export # export
......
...@@ -475,11 +475,11 @@ class MBSlave: ...@@ -475,11 +475,11 @@ class MBSlave:
void readConfiguration(); void readConfiguration();
bool check_item( UniXML::iterator& it ); bool check_item( UniXML::iterator& it );
ModbusRTU::mbErrCode real_write( RegMap& rmap, const ModbusRTU::ModbusData reg, ModbusRTU::ModbusData val, const int fn = 0 ); ModbusRTU::mbErrCode real_write( RegMap& rmap, const ModbusRTU::ModbusData regOKOK, ModbusRTU::ModbusData val, const int fn = 0 );
ModbusRTU::mbErrCode real_write( RegMap& rmap, const ModbusRTU::ModbusData reg, ModbusRTU::ModbusData* dat, int& i, int count, const int fn = 0 ); ModbusRTU::mbErrCode real_write( RegMap& rmap, const ModbusRTU::ModbusData regOKOK, ModbusRTU::ModbusData* dat, int& i, int count, const int fn = 0 );
ModbusRTU::mbErrCode real_read( RegMap& rmap, const ModbusRTU::ModbusData reg, ModbusRTU::ModbusData& val, const int fn = 0 ); ModbusRTU::mbErrCode real_read( RegMap& rmap, const ModbusRTU::ModbusData regOKOK, ModbusRTU::ModbusData& val, const int fn = 0 );
ModbusRTU::mbErrCode much_real_read( RegMap& rmap, const ModbusRTU::ModbusData reg, ModbusRTU::ModbusData* dat, int count, const int fn = 0 ); ModbusRTU::mbErrCode much_real_read( RegMap& rmap, const ModbusRTU::ModbusData regOKOK, ModbusRTU::ModbusData* dat, int count, const int fn = 0 );
ModbusRTU::mbErrCode much_real_write( RegMap& rmap, const ModbusRTU::ModbusData reg, ModbusRTU::ModbusData* dat, int count, const int fn = 0 ); ModbusRTU::mbErrCode much_real_write( RegMap& rmap, const ModbusRTU::ModbusData regOKOK, ModbusRTU::ModbusData* dat, int count, const int fn = 0 );
ModbusRTU::mbErrCode real_read_it( RegMap& rmap, RegMap::iterator& it, ModbusRTU::ModbusData& val ); ModbusRTU::mbErrCode real_read_it( RegMap& rmap, RegMap::iterator& it, ModbusRTU::ModbusData& val );
ModbusRTU::mbErrCode real_bitreg_read_it( std::shared_ptr<BitRegProperty>& bp, ModbusRTU::ModbusData& val ); ModbusRTU::mbErrCode real_bitreg_read_it( std::shared_ptr<BitRegProperty>& bp, ModbusRTU::ModbusData& val );
......
...@@ -55,7 +55,7 @@ class UniSetManager_LT: ...@@ -55,7 +55,7 @@ class UniSetManager_LT:
/*! функция вызываемая из потока */ /*! функция вызываемая из потока */
virtual void callback(); virtual void callback();
int sleepTime; timeout_t sleepTime;
LT_Object lt; LT_Object lt;
private: private:
}; };
......
...@@ -181,11 +181,9 @@ class UniSetObject: ...@@ -181,11 +181,9 @@ class UniSetObject:
void setID(UniSetTypes::ObjectId id); void setID(UniSetTypes::ObjectId id);
void setMaxSizeOfMessageQueue( size_t s )
void setMaxSizeOfMessageQueue( unsigned int s )
{ {
if( s >= 0 ) SizeOfMessageQueue = s;
SizeOfMessageQueue = s;
} }
inline unsigned int getMaxSizeOfMessageQueue() inline unsigned int getMaxSizeOfMessageQueue()
...@@ -193,10 +191,9 @@ class UniSetObject: ...@@ -193,10 +191,9 @@ class UniSetObject:
return SizeOfMessageQueue; return SizeOfMessageQueue;
} }
void setMaxCountRemoveOfMessage( unsigned int m ) void setMaxCountRemoveOfMessage( size_t m )
{ {
if( m >= 0 ) MaxCountRemoveOfMessage = m;
MaxCountRemoveOfMessage = m;
} }
inline unsigned int getMaxCountRemoveOfMessage() inline unsigned int getMaxCountRemoveOfMessage()
...@@ -270,7 +267,7 @@ class UniSetObject: ...@@ -270,7 +267,7 @@ class UniSetObject:
void init_object(); void init_object();
pid_t msgpid; // pid потока обработки сообщений pid_t msgpid; // pid потока обработки сообщений
bool reg; bool regOK = { false };
std::atomic_bool active; std::atomic_bool active;
bool threadcreate; bool threadcreate;
...@@ -290,13 +287,13 @@ class UniSetObject: ...@@ -290,13 +287,13 @@ class UniSetObject:
mutable UniSetTypes::uniset_rwmutex refmutex; mutable UniSetTypes::uniset_rwmutex refmutex;
/*! размер очереди сообщений (при превышении происходит очистка) */ /*! размер очереди сообщений (при превышении происходит очистка) */
unsigned int SizeOfMessageQueue; size_t SizeOfMessageQueue;
/*! сколько сообщений удалять при очисте*/ /*! сколько сообщений удалять при очисте */
unsigned int MaxCountRemoveOfMessage; size_t MaxCountRemoveOfMessage;
// статистическая информация // статистическая информация
unsigned long stMaxQueueMessages; /*<! Максимальное число сообщений хранившихся в очереди */ size_t stMaxQueueMessages; /*<! Максимальное число сообщений хранившихся в очереди */
unsigned long stCountOfQueueFull; /*!< количество переполнений очереди сообщений */ size_t stCountOfQueueFull; /*!< количество переполнений очереди сообщений */
std::atomic_bool a_working; std::atomic_bool a_working;
std::mutex m_working; std::mutex m_working;
......
...@@ -49,7 +49,7 @@ using namespace UniSetTypes; ...@@ -49,7 +49,7 @@ using namespace UniSetTypes;
// ------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------
UniSetObject::UniSetObject(): UniSetObject::UniSetObject():
msgpid(0), msgpid(0),
reg(false), regOK(false),
active(0), active(0),
threadcreate(false), threadcreate(false),
myid(UniSetTypes::DefaultObjectId), myid(UniSetTypes::DefaultObjectId),
...@@ -69,7 +69,7 @@ UniSetObject::UniSetObject(): ...@@ -69,7 +69,7 @@ UniSetObject::UniSetObject():
// ------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------
UniSetObject::UniSetObject( ObjectId id ): UniSetObject::UniSetObject( ObjectId id ):
msgpid(0), msgpid(0),
reg(false), regOK(false),
active(0), active(0),
threadcreate(true), threadcreate(true),
myid(id), myid(id),
...@@ -102,7 +102,7 @@ UniSetObject::UniSetObject( ObjectId id ): ...@@ -102,7 +102,7 @@ UniSetObject::UniSetObject( ObjectId id ):
UniSetObject::UniSetObject( const string& name, const string& section ): UniSetObject::UniSetObject( const string& name, const string& section ):
msgpid(0), msgpid(0),
reg(false), regOK(false),
active(0), active(0),
threadcreate(true), threadcreate(true),
myid(UniSetTypes::DefaultObjectId), myid(UniSetTypes::DefaultObjectId),
...@@ -382,7 +382,7 @@ void UniSetObject::registered() ...@@ -382,7 +382,7 @@ void UniSetObject::registered()
объект станет недоступен другим, а знать об этом не будет!!! объект станет недоступен другим, а знать об этом не будет!!!
*/ */
ucrit << myname << "(registered): replace object (ObjectNameAlready)" << endl; ucrit << myname << "(registered): replace object (ObjectNameAlready)" << endl;
reg = true; regOK = true;
unregister(); unregister();
} }
} }
...@@ -399,7 +399,7 @@ void UniSetObject::registered() ...@@ -399,7 +399,7 @@ void UniSetObject::registered()
throw ORepFailed(err.c_str()); throw ORepFailed(err.c_str());
} }
reg = true; regOK = true;
} }
// ------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------
void UniSetObject::unregister() void UniSetObject::unregister()
...@@ -410,7 +410,7 @@ void UniSetObject::unregister() ...@@ -410,7 +410,7 @@ void UniSetObject::unregister()
if( myid == UniSetTypes::DefaultObjectId ) if( myid == UniSetTypes::DefaultObjectId )
{ {
uinfo << myname << "(unregister): myid=DefaultObjectId \n"; uinfo << myname << "(unregister): myid=DefaultObjectId \n";
reg = false; regOK = false;
return; return;
} }
...@@ -420,7 +420,7 @@ void UniSetObject::unregister() ...@@ -420,7 +420,7 @@ void UniSetObject::unregister()
if( !oref ) if( !oref )
{ {
uwarn << myname << "(unregister): oref NULL!" << endl; uwarn << myname << "(unregister): oref NULL!" << endl;
reg = false; regOK = false;
return; return;
} }
} }
...@@ -437,7 +437,7 @@ void UniSetObject::unregister() ...@@ -437,7 +437,7 @@ void UniSetObject::unregister()
uwarn << myname << ": don`t registration in object repository" << endl; uwarn << myname << ": don`t registration in object repository" << endl;
} }
reg = false; regOK = false;
} }
// ------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------
CORBA::Boolean UniSetObject::exist() CORBA::Boolean UniSetObject::exist()
......
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