Skip to content

Commit 15610bf

Browse files
committed
---
yaml --- r: 53086 b: refs/heads/dist-snap c: 2e06147 h: refs/heads/master v: v3
1 parent 3fe5931 commit 15610bf

File tree

5 files changed

+1
-13
lines changed

5 files changed

+1
-13
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
99
refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
10-
refs/heads/dist-snap: f2f4edd8a7bc73d2923e783220fe2a3e9aec18dd
10+
refs/heads/dist-snap: 2e0614750c398c9aac2f4064addb2fa95ba32282
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1313
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/rt/rust_exchange_alloc.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ rust_exchange_alloc::malloc(size_t size) {
2727
return value;
2828
}
2929

30-
void *
31-
rust_exchange_alloc::calloc(size_t size) {
32-
return this->malloc(size);
33-
}
34-
3530
void *
3631
rust_exchange_alloc::realloc(void *ptr, size_t size) {
3732
void *new_ptr = ::realloc(ptr, size);

branches/dist-snap/src/rt/rust_exchange_alloc.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
class rust_exchange_alloc {
1818
public:
1919
void *malloc(size_t size);
20-
void *calloc(size_t size);
2120
void *realloc(void *mem, size_t size);
2221
void free(void *mem);
2322
};

branches/dist-snap/src/rt/rust_kernel.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,6 @@ rust_kernel::malloc(size_t size, const char *tag) {
7979
return exchange_alloc.malloc(size);
8080
}
8181

82-
void *
83-
rust_kernel::calloc(size_t size, const char *tag) {
84-
return exchange_alloc.calloc(size);
85-
}
86-
8782
void *
8883
rust_kernel::realloc(void *mem, size_t size) {
8984
return exchange_alloc.realloc(mem, size);

branches/dist-snap/src/rt/rust_kernel.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ class rust_kernel {
133133
void fatal(char const *fmt, ...);
134134

135135
void *malloc(size_t size, const char *tag);
136-
void *calloc(size_t size, const char *tag);
137136
void *realloc(void *mem, size_t size);
138137
void free(void *mem);
139138
rust_exchange_alloc *region() { return &exchange_alloc; }

0 commit comments

Comments
 (0)