Commit f15984b2 authored by Pavel Vainerman's avatar Pavel Vainerman

Исправил ошибку в LT_Object (неправильно использование remove_if)

parent befbf2ee
......@@ -8,7 +8,7 @@
Name: libuniset2
Version: 2.0
Release: alt0.7
Release: alt0.8
Summary: UniSet - library for building distributed industrial control systems
......@@ -333,6 +333,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
%exclude %_pkgconfigdir/libUniSet2.pc
%changelog
* Mon Feb 03 2014 Pavel Vainerman <pv@altlinux.ru> 2.0-alt0.8
- fixed bug in LT_Object
* Sun Feb 02 2014 Pavel Vainerman <pv@altlinux.ru> 2.0-alt0.7
- refactoring DBInterface (rename to MySQLInterface, add MySQLResult class,..)
......
......@@ -74,7 +74,7 @@ DBServer_MySQL::DBServer_MySQL():
msg << "(DBServer_MySQL): init failed! Unknown ID!" << endl;
throw Exception(msg.str());
}
mqbuf.setName(myname + "_qbufMutex");
}
//--------------------------------------------------------------------------------------------
......
......@@ -84,6 +84,8 @@ void TestProc::timerInfo( const TimerMessage *tm )
state^=true;
out_lamp_c = ( state ? lmpBLINK : lmpOFF );
mylog2 << myname << ": state=" << state << " lmp=" << out_lamp_c << endl;
askTimer(tmCheckWorking,0); // test remove timer
askTimer(tmCheckWorking,checkTime); // reset timer
}
else if( tm->id == tmCheckWorking )
......
/home/pv/Projects/uniset/Utilities/scripts/uniset-start.sh
\ No newline at end of file
../../../Utilities/scripts/uniset2-functions.sh
\ No newline at end of file
../../../Utilities/scripts/uniset2-start.sh
\ No newline at end of file
/home/pv/Projects/uniset/Utilities/scripts/uniset-start.sh
\ No newline at end of file
../../../Utilities/scripts/uniset2-functions.sh
\ No newline at end of file
../../../Utilities/scripts/uniset2-start.sh
\ No newline at end of file
......@@ -163,7 +163,7 @@ timeout_t LT_Object::askTimer( UniSetTypes::TimerId timerid, timeout_t timeMS, c
uinfo << "(LT_askTimer): поступил отказ по таймеру id="<< timerid << endl;
{ // lock
uniset_rwmutex_wrlock lock(lstMutex);
tlst.erase( std::remove_if(tlst.begin(),tlst.end(),Timer_eq(timerid)) );
tlst.erase( std::remove_if(tlst.begin(),tlst.end(),Timer_eq(timerid)), tlst.end() );
} // unlock
}
......
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