diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2022-09-20 22:02:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-20 22:02:36 -0400 |
| commit | 62ecc154d9ad065aee57d81afd3a478dd8360fb7 (patch) | |
| tree | 52f17b58d87a2ef83f2a1607f0aecbee31c33661 /lib/std/json.zig | |
| parent | 521c753fda3cd5ebb79752287ef3c87d84f8d5c3 (diff) | |
| parent | eef653904916dc19540458199366807f8837bf98 (diff) | |
| download | zig-62ecc154d9ad065aee57d81afd3a478dd8360fb7.tar.gz zig-62ecc154d9ad065aee57d81afd3a478dd8360fb7.zip | |
Merge pull request #12904 from Vexu/ptrcast
stage2: pointer casting fixes and improvements
Diffstat (limited to 'lib/std/json.zig')
| -rw-r--r-- | lib/std/json.zig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/std/json.zig b/lib/std/json.zig index 548a3db94e..87fe1c9dea 100644 --- a/lib/std/json.zig +++ b/lib/std/json.zig @@ -1560,7 +1560,7 @@ fn parseInternal( } } if (field.is_comptime) { - if (!try parsesTo(field.field_type, @ptrCast(*const field.field_type, field.default_value.?).*, tokens, child_options)) { + if (!try parsesTo(field.field_type, @ptrCast(*align(1) const field.field_type, field.default_value.?).*, tokens, child_options)) { return error.UnexpectedValue; } } else { @@ -1587,7 +1587,7 @@ fn parseInternal( if (!fields_seen[i]) { if (field.default_value) |default_ptr| { if (!field.is_comptime) { - const default = @ptrCast(*const field.field_type, default_ptr).*; + const default = @ptrCast(*align(1) const field.field_type, default_ptr).*; @field(r, field.name) = default; } } else { @@ -1667,7 +1667,7 @@ fn parseInternal( } if (ptrInfo.sentinel) |some| { - const sentinel_value = @ptrCast(*const ptrInfo.child, some).*; + const sentinel_value = @ptrCast(*align(1) const ptrInfo.child, some).*; try arraylist.append(sentinel_value); const output = arraylist.toOwnedSlice(); return output[0 .. output.len - 1 :sentinel_value]; |