diff options
| author | gingerBill <bill@gingerbill.org> | 2018-01-17 13:16:59 +0000 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2018-01-17 13:16:59 +0000 |
| commit | ddebf0daf2d73faaecbfbc77892d9bdb51adcee2 (patch) | |
| tree | 487d17ad598942590e3dd3ce7e10c5d905c891d2 /core | |
| parent | 3a44c62ecf3cd7b19315c3e71087f52611d8d80e (diff) | |
| parent | 0b137e087c7a49a35ca6d3077a2f389dd13a3b10 (diff) | |
Merge branch 'master' of https://github.com/odin-lang/Odin
Diffstat (limited to 'core')
| -rw-r--r-- | core/mem.odin | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/mem.odin b/core/mem.odin index 34666a80a..95ab273a6 100644 --- a/core/mem.odin +++ b/core/mem.odin @@ -34,13 +34,12 @@ slice_ptr :: proc "contextless" (ptr: ^$T, len: int) -> []T { slice_to_bytes :: proc "contextless" (slice: $E/[]$T) -> []byte { s := transmute(raw.Slice)slice; s.len *= size_of(T); - s.cap *= size_of(T); return transmute([]byte)s; } ptr_to_bytes :: proc "contextless" (ptr: ^$T, len := 1) -> []byte { assert(len >= 0); - return transmute([]byte)raw.Slice{ptr, len*size_of(T), len*size_of(T)}; + return transmute([]byte)raw.Slice{ptr, len*size_of(T)}; } |