Skip to content

Commit 04b9552

Browse files
Magnus Auvinenbrson
authored andcommitted
---
yaml --- r: 11096 b: refs/heads/master c: a5fc0b0 h: refs/heads/master v: v3
1 parent 2b9a95d commit 04b9552

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 3e9859362b1344add0e0443e88ae3e2f17a5a865
2+
refs/heads/master: a5fc0b08de94fc2ca061968c6ae7f69aef55705f
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libcore/ptr.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,17 @@ fn null<T>() -> *T unsafe { ret unsafe::reinterpret_cast(0u); }
5757
Function: memcpy
5858
5959
Copies data from one src to dst that is not overlapping each other.
60+
Count is the number of elements to copy and not the number of bytes.
6061
*/
61-
fn memcpy<T>(dst: *T, src: *T, count: uint) unsafe { rusti::memcpy(dst, src, count); }
62+
unsafe fn memcpy<T>(dst: *T, src: *T, count: uint) { rusti::memcpy(dst, src, count); }
6263

6364
/*
6465
Function: memmove
6566
6667
Copies data from one src to dst, overlap between the two pointers may occur.
68+
Count is the number of elements to copy and not the number of bytes.
6769
*/
68-
fn memmove<T>(dst: *T, src: *T, count: uint) unsafe { rusti::memcpy(dst, src, count); }
70+
unsafe fn memmove<T>(dst: *T, src: *T, count: uint) { rusti::memcpy(dst, src, count); }
6971

7072
#[test]
7173
fn test() unsafe {

0 commit comments

Comments
 (0)