Skip to content
Permalink
Browse files

- fixed doubling of deprecation warnings for ZScript code

  • Loading branch information...
alexey-lysiuk committed Aug 15, 2019
1 parent 06e0c88 commit 28ea567c225226848f273da21a2d6f4790ccf5a9
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/scripting/backend/codegen.cpp
@@ -7717,7 +7717,7 @@ FxExpression *FxFunctionCall::Resolve(FCompileContext& ctx)

if (ctx.Class != nullptr)
{
PFunction *afd = FindClassMemberFunction(ctx.Class, ctx.Class, MethodName, ScriptPosition, &error, ctx.Version);
PFunction *afd = FindClassMemberFunction(ctx.Class, ctx.Class, MethodName, ScriptPosition, &error, ctx.Version, !ctx.FromDecorate);

if (afd != nullptr)
{
@@ -8119,7 +8119,7 @@ FxExpression *FxMemberFunctionCall::Resolve(FCompileContext& ctx)
if (novirtual)
{
bool error;
PFunction *afd = FindClassMemberFunction(ccls, ctx.Class, MethodName, ScriptPosition, &error, ctx.Version);
PFunction *afd = FindClassMemberFunction(ccls, ctx.Class, MethodName, ScriptPosition, &error, ctx.Version, !ctx.FromDecorate);
if ((nullptr != afd) && (afd->Variants[0].Flags & VARF_Method) && (afd->Variants[0].Flags & VARF_Virtual))
{
staticonly = false;
@@ -8426,7 +8426,7 @@ FxExpression *FxMemberFunctionCall::Resolve(FCompileContext& ctx)

isresolved:
bool error = false;
PFunction *afd = FindClassMemberFunction(cls, ctx.Class, MethodName, ScriptPosition, &error, ctx.Version);
PFunction *afd = FindClassMemberFunction(cls, ctx.Class, MethodName, ScriptPosition, &error, ctx.Version, !ctx.FromDecorate);
if (error)
{
delete this;

0 comments on commit 28ea567

Please sign in to comment.
You can’t perform that action at this time.