gitback/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Have readStruct in stream return a value instead of taking a pointer

Browse Source
This commit is contained in:
Jimmi HC 2018-11-15 21:03:27 +01:00
parent 2a9843de95
commit f4606842d2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
std/io.zig
View File

@ -188,10 +188,12 @@ pub fn InStream(comptime ReadError: type) type {
} }
} }
pub fn readStruct(self: *Self, comptime T: type, ptr: *T) !void { pub fn readStruct(self: *Self, comptime T: type) !T {
// Only extern and packed structs have defined in-memory layout. // Only extern and packed structs have defined in-memory layout.
comptime assert(@typeInfo(T).Struct.layout != builtin.TypeInfo.ContainerLayout.Auto); comptime assert(@typeInfo(T).Struct.layout != builtin.TypeInfo.ContainerLayout.Auto);
return self.readNoEof(@sliceToBytes((*[1]T)(ptr)[0..])); var res: [1]T = undefined;
return self.readNoEof(@sliceToBytes(res[0..]));
return res[0];
} }
}; };
} }