bearbecueLe 13/06/2017 à 06:12
<<<<<<< HEAD
||||||| merged common ancestors
// otherwise, keep the result type we've got from the construction
if (m_ResultType == SCompilerTypeID::VoidType)
{
_ThrowErrorAtLine("cannot construct a 'void' variable.");
success = false;
}
=======
// otherwise, keep the result type we've got from the construction
if (m_ResultType == SCompilerTypeID::VoidType)
{
_ThrowErrorAtLine("Cannot construct a 'void' variable.");
success = false;
}
>>>>>>> origin/release/v1.12.0