Skip to content

U
uniset2
Commit d50d65ef authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

codegen: fix initialization order in constructor

parent c5934d47
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
Utilities/codegen/ctl-cpp-common.xsl
View file @ d50d65ef
...@@ -688,7 +688,6 @@ static const std::string init3_str( const std::string& s1, const std::string ...@@ -688,7 +688,6 @@ static const std::string init3_str( const std::string& s1, const std::string
<xsl:value-of select="$CLASSNAME"/>_SK::<xsl:value-of select="$CLASSNAME"/>_SK( ObjectId id, xmlNode* cnode, const std::string&amp; _argprefix ): <xsl:value-of select="$CLASSNAME"/>_SK::<xsl:value-of select="$CLASSNAME"/>_SK( ObjectId id, xmlNode* cnode, const std::string&amp; _argprefix ):
<xsl:if test="normalize-space($BASECLASS)!=''"><xsl:value-of select="normalize-space($BASECLASS)"/>(id),</xsl:if> <xsl:if test="normalize-space($BASECLASS)!=''"><xsl:value-of select="normalize-space($BASECLASS)"/>(id),</xsl:if>
<xsl:if test="normalize-space($BASECLASS)=''">UniSetObject(id),</xsl:if> <xsl:if test="normalize-space($BASECLASS)=''">UniSetObject(id),</xsl:if>
argprefix( (_argprefix.empty() ? myname+"-" : _argprefix) ),
// Инициализация идентификаторов (имена берутся из конф. файла) // Инициализация идентификаторов (имена берутся из конф. файла)
<xsl:for-each select="//smap/item"> <xsl:for-each select="//smap/item">
<xsl:if test="normalize-space(@vartype)!='io'"> <xsl:if test="normalize-space(@vartype)!='io'">
...@@ -715,6 +714,7 @@ prev_m_<xsl:value-of select="normalize-space(@name)"/>(false), ...@@ -715,6 +714,7 @@ prev_m_<xsl:value-of select="normalize-space(@name)"/>(false),
</xsl:for-each> </xsl:for-each>
sleep_msec(<xsl:call-template name="settings"><xsl:with-param name="varname" select="'sleep-msec'"/></xsl:call-template>), sleep_msec(<xsl:call-template name="settings"><xsl:with-param name="varname" select="'sleep-msec'"/></xsl:call-template>),
active(true), active(true),
argprefix( (_argprefix.empty() ? myname+"-" : _argprefix) ),
<xsl:if test="normalize-space($TESTMODE)!=''"> <xsl:if test="normalize-space($TESTMODE)!=''">
isTestMode(false), isTestMode(false),
idTestMode_S(uniset_conf()->getSensorID("TestMode_S")), idTestMode_S(uniset_conf()->getSensorID("TestMode_S")),
...@@ -1160,7 +1160,6 @@ forceOut(false) ...@@ -1160,7 +1160,6 @@ forceOut(false)
<xsl:value-of select="$CLASSNAME"/>_SK::<xsl:value-of select="$CLASSNAME"/>_SK( ObjectId id, xmlNode* cnode, const string&amp; _argprefix ): <xsl:value-of select="$CLASSNAME"/>_SK::<xsl:value-of select="$CLASSNAME"/>_SK( ObjectId id, xmlNode* cnode, const string&amp; _argprefix ):
<xsl:if test="normalize-space($BASECLASS)!=''"><xsl:value-of select="normalize-space($BASECLASS)"/>(id),</xsl:if> <xsl:if test="normalize-space($BASECLASS)!=''"><xsl:value-of select="normalize-space($BASECLASS)"/>(id),</xsl:if>
<xsl:if test="normalize-space($BASECLASS)=''">UniSetObject(id),</xsl:if> <xsl:if test="normalize-space($BASECLASS)=''">UniSetObject(id),</xsl:if>
argprefix( (_argprefix.empty() ? myname+"-" : _argprefix) ),
// Инициализация идентификаторов (имена берутся из конф. файла) // Инициализация идентификаторов (имена берутся из конф. файла)
<xsl:for-each select="//sensors/item"> <xsl:for-each select="//sensors/item">
<xsl:call-template name="setvar"> <xsl:call-template name="setvar">
...@@ -1175,6 +1174,7 @@ argprefix( (_argprefix.empty() ? myname+"-" : _argprefix) ), ...@@ -1175,6 +1174,7 @@ argprefix( (_argprefix.empty() ? myname+"-" : _argprefix) ),
</xsl:for-each> </xsl:for-each>
sleep_msec(<xsl:call-template name="settings-alone"><xsl:with-param name="varname" select="'sleep-msec'"/></xsl:call-template>), sleep_msec(<xsl:call-template name="settings-alone"><xsl:with-param name="varname" select="'sleep-msec'"/></xsl:call-template>),
active(true), active(true),
argprefix( (_argprefix.empty() ? myname+"-" : _argprefix) ),
<xsl:if test="normalize-space($TESTMODE)!=''"> <xsl:if test="normalize-space($TESTMODE)!=''">
isTestMode(false), isTestMode(false),
idTestMode_S(uniset_conf()->getSensorID("TestMode_S")), idTestMode_S(uniset_conf()->getSensorID("TestMode_S")),
......
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