Commit 1b356292 authored by Pavel Vainerman's avatar Pavel Vainerman

(codegen): назвал функцию получения указателя на значение по objectId - valptr

parent ae78e4d3
...@@ -330,8 +330,10 @@ ...@@ -330,8 +330,10 @@
VMonitor vmon; VMonitor vmon;
<xsl:if test="normalize-space($VARMAP)='1'"> <xsl:if test="normalize-space($VARMAP)='1'">
/*! Получить указатель на переменную храняющую значение, по идентификатору */ /*! Получить указатель на переменную храняющую значение, по идентификатору
long* pvar( UniSetTypes::ObjectId id ); * \return nullptr если элемент не найден
*/
long* valptr( UniSetTypes::ObjectId id );
</xsl:if> </xsl:if>
</xsl:template> </xsl:template>
...@@ -365,7 +367,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::processingMessage( UniSetTypes::Voi ...@@ -365,7 +367,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::processingMessage( UniSetTypes::Voi
case Message::SysCommand: case Message::SysCommand:
preSysCommand( reinterpret_cast&lt;SystemMessage*&gt;(_msg) ); preSysCommand( reinterpret_cast&lt;SystemMessage*&gt;(_msg) );
break; break;
default: default:
break; break;
} }
...@@ -462,7 +464,7 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::checkTestMode() ...@@ -462,7 +464,7 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::checkTestMode()
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
</xsl:if> </xsl:if>
<xsl:if test="normalize-space($VARMAP)='1'"> <xsl:if test="normalize-space($VARMAP)='1'">
long* <xsl:value-of select="$CLASSNAME"/>_SK::getVariable( UniSetTypes::ObjectId id ) long* <xsl:value-of select="$CLASSNAME"/>_SK::valptr( UniSetTypes::ObjectId id )
{ {
auto i = vmap.find(id); auto i = vmap.find(id);
if( i!= vmap.end() ) if( i!= vmap.end() )
......
...@@ -10,7 +10,7 @@ TestGen::TestGen( UniSetTypes::ObjectId id, xmlNode* confnode ): ...@@ -10,7 +10,7 @@ TestGen::TestGen( UniSetTypes::ObjectId id, xmlNode* confnode ):
vmonit(int_var); vmonit(int_var);
vmonit(bool_var); vmonit(bool_var);
long* i = getVariable(input2_s); long* i = valptr(input2_s);
if( !i ) if( !i )
cerr << "input2_s NOT FOUND!!!" << endl; cerr << "input2_s NOT FOUND!!!" << endl;
else else
......
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