Skip to content

Commit

Permalink
Merge pull request HaxeFoundation#752 from HaxeFoundation/array_null
Browse files Browse the repository at this point in the history
propagate nullness of Array<T> to Array<Dynamic>
  • Loading branch information
hughsando authored Apr 10, 2023
2 parents b7e7a44 + 1765d2e commit c9ee076
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion include/cpp/VirtualArray.h
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES VirtualArray_obj : public hx::ArrayCommon
// Build dynamic array from foreign array
template<typename SOURCE_>
VirtualArray::VirtualArray( const Array<SOURCE_> &inRHS )
: super( new VirtualArray_obj( inRHS.mPtr, true) )
: super( !inRHS.mPtr ? 0 : new VirtualArray_obj( inRHS.mPtr, true) )
{
}

Expand Down
2 changes: 0 additions & 2 deletions src/Enum.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ void EnumBase_obj::__boot()
#if (HXCPP_API_LEVEL >= 330)
DynamicArray EnumBase_obj::_hx_getParameters()
{
if (mFixedFields==0)
return null();
Array<Dynamic> result = Array_obj<Dynamic>::__new(mFixedFields);
cpp::Variant *fixed = _hx_getFixed();
for(int i=0;i<mFixedFields;i++)
Expand Down

0 comments on commit c9ee076

Please sign in to comment.