commit 465e75bc5a41aa899b673c0a3ff59d6da871fbe6 (tree)
parent 891c93c118a85ce16225ed2e97676cdae2abe657
Author: Andrew Kelley <superjoe30@gmail.com>
Date: Thu, 11 Jan 2018 02:51:17 -0500
Merge pull request #682 from zig-lang/fix-endian
Fix endian swap parameters
Diffstat:
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/std/endian.zig b/std/endian.zig
@@ -2,11 +2,11 @@ const mem = @import("mem.zig");
const builtin = @import("builtin");
pub fn swapIfLe(comptime T: type, x: T) -> T {
- return swapIf(false, T, x);
+ return swapIf(builtin.Endian.Little, T, x);
}
pub fn swapIfBe(comptime T: type, x: T) -> T {
- return swapIf(true, T, x);
+ return swapIf(builtin.Endian.Big, T, x);
}
pub fn swapIf(endian: builtin.Endian, comptime T: type, x: T) -> T {
@@ -15,6 +15,11 @@ pub fn swapIf(endian: builtin.Endian, comptime T: type, x: T) -> T {
pub fn swap(comptime T: type, x: T) -> T {
var buf: [@sizeOf(T)]u8 = undefined;
- mem.writeInt(buf[0..], x, false);
+ mem.writeInt(buf[0..], x, builtin.Endian.Little);
return mem.readInt(buf, T, builtin.Endian.Big);
}
+
+test "swap" {
+ const debug = @import("debug/index.zig");
+ debug.assert(swap(u32, 0xDEADBEEF) == 0xEFBEADDE);
+}