Merge pull request #2738 from minggo/develop-test

declare _functions as it is initialized
This commit is contained in:
minggo 2013-06-03 21:55:17 -07:00
commit 3689c81536
1 changed files with 3 additions and 3 deletions

View File

@ -271,9 +271,6 @@ protected:
int m_nScriptHandler;
/** function that will be called */
std::function<void()> _function;
union
{
SEL_CallFunc m_pCallFunc;
@ -281,6 +278,9 @@ protected:
SEL_CallFuncND m_pCallFuncND;
SEL_CallFuncO m_pCallFuncO;
};
/** function that will be called */
std::function<void()> _function;
};
/**