Skip to content

Commit 366d49c

Browse files
committed
[MERGE #5974 @MikeHolman] Fix ChakraFull build break
Merge pull request #5974 from MikeHolman:fixbuild trace callback isn't defined in chakrafull, so remove reference to it
2 parents 833c7f5 + 8a6f69d commit 366d49c

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

lib/Jsrt/JsrtExternalObject.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,18 +163,19 @@ JsrtExternalObject* JsrtExternalObject::Copy(bool deepCopy)
163163
JsrtExternalType* type = this->GetExternalType();
164164
int inlineSlotSize = this->GetInlineSlotSize();
165165

166+
#ifdef _CHAKRACOREBUILD
166167
if (type->GetJsTraceCallback() != nullptr)
167168
{
168169
return RecyclerNewTrackedPlus(recycler, inlineSlotSize, JsrtExternalObject, this, deepCopy);
169170
}
170-
else if (type->GetJsFinalizeCallback() != nullptr)
171+
#endif
172+
173+
if (type->GetJsFinalizeCallback() != nullptr)
171174
{
172175
return RecyclerNewFinalizedPlus(recycler, inlineSlotSize, JsrtExternalObject, this, deepCopy);
173176
}
174-
else
175-
{
176-
return RecyclerNewPlus(recycler, inlineSlotSize, JsrtExternalObject, this, deepCopy);
177-
}
177+
178+
return RecyclerNewPlus(recycler, inlineSlotSize, JsrtExternalObject, this, deepCopy);
178179
}
179180

180181
void JsrtExternalObject::Mark(Recycler * recycler)

0 commit comments

Comments
 (0)