Commit fc2f3d3e authored by David Gobbi's avatar David Gobbi Committed by Kitware Robot
Browse files

Merge topic 'wrap-null-as-nullptr_t'

2941cb4c

 Make wrappers guess type of NULL as nullptr_t.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !1088
parents 5ef1a7f0 2941cb4c
Pipeline #4273 failed with stage
......@@ -11526,7 +11526,7 @@ unsigned int guess_constant_type(const char *valstring)
return VTK_PARSE_BOOL;
}
if (strcmp(valstring, "nullptr") == 0)
if (strcmp(valstring, "nullptr") == 0 || strcmp(valstring, "NULL") == 0)
{
return VTK_PARSE_NULLPTR_T;
}
......
......@@ -4123,7 +4123,7 @@ unsigned int guess_constant_type(const char *valstring)
return VTK_PARSE_BOOL;
}
if (strcmp(valstring, "nullptr") == 0)
if (strcmp(valstring, "nullptr") == 0 || strcmp(valstring, "NULL") == 0)
{
return VTK_PARSE_NULLPTR_T;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment