Commit 085e4d60 authored by Pavel Vainerman's avatar Pavel Vainerman

Версия с исправлением ошибки в ModbusSlave и в codegen

parent 7c949bdb
......@@ -413,7 +413,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preSysCommand( const SystemMessage*
// -----------------------------------------------------------------------------
UniSetTypes::SimpleInfo* <xsl:value-of select="$CLASSNAME"/>_SK::getInfo()
{
UniSetTypes::SimpleInfo_var i = <xsl:if test="normalize-space($BASECLASS)=''">UniSetObject::getInfo();</xsl:if>
<xsl:if test="not(normalize-space($BASECLASS)='')">UniSetTypes::SimpleInfo_var i = <xsl:value-of select="$BASECLASS"/>::getInfo();</xsl:if>
<xsl:if test="normalize-space($BASECLASS)=''">UniSetTypes::SimpleInfo_var i = UniSetObject::getInfo();</xsl:if>
ostringstream inf;
......
......@@ -13,7 +13,7 @@
Name: libuniset2
Version: 2.1
Release: alt6
Release: alt7
Summary: UniSet - library for building distributed industrial control systems
......@@ -455,6 +455,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
# ..
%changelog
* Fri Jun 05 2015 Pavel Vainerman <pv@altlinux.ru> 2.1-alt7
- (ModbusSlave): fixed bug in read0x function (for float and precision)
* Thu Jun 04 2015 Pavel Vainerman <pv@altlinux.ru> 2.1-alt6
- (smonit): print supplier, change print format
- (admin): add getChangedTime function
......
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