From a3848bbd7872b6800ee5095361fb40b72e7b1c17 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Sat, 12 Sep 2020 09:41:43 -0700 Subject: [PATCH] Generics error fix --- IDEHelper/Compiler/BfDefBuilder.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/IDEHelper/Compiler/BfDefBuilder.cpp b/IDEHelper/Compiler/BfDefBuilder.cpp index dd95b538..7121dc59 100644 --- a/IDEHelper/Compiler/BfDefBuilder.cpp +++ b/IDEHelper/Compiler/BfDefBuilder.cpp @@ -1661,7 +1661,8 @@ void BfDefBuilder::Visit(BfTypeDeclaration* typeDeclaration) int outerGenericSize = 0; if (mCurTypeDef->mOuterType != NULL) outerGenericSize = (int)mCurTypeDef->mOuterType->mGenericParamDefs.size(); - ParseGenericParams(typeDeclaration->mGenericParams, typeDeclaration->mGenericConstraintsDeclaration, mCurTypeDef->mGenericParamDefs, &mCurTypeDef->mExternalConstraints, outerGenericSize, !mCurTypeDef->mGenericParamDefs.IsEmpty()); + bool isGeneric = (outerGenericSize != NULL) || (typeDeclaration->mGenericParams != NULL); + ParseGenericParams(typeDeclaration->mGenericParams, typeDeclaration->mGenericConstraintsDeclaration, mCurTypeDef->mGenericParamDefs, &mCurTypeDef->mExternalConstraints, outerGenericSize, isGeneric); BF_ASSERT(mCurTypeDef->mNameEx == NULL);