Skip to content

Commit f924ec7

Browse files
author
Elliott Slaughter
committed
---
yaml --- r: 30231 b: refs/heads/incoming c: f8323ac h: refs/heads/master i: 30229: 5e2867b 30227: 44ae5de 30223: c275ee4 v: v3
1 parent 739835a commit f924ec7

File tree

4 files changed

+21
-1
lines changed

4 files changed

+21
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
9-
refs/heads/incoming: dbf6abf6bfd0bf2ac17c648d5e2c1edb68099e60
9+
refs/heads/incoming: f8323ac6156fd3234a94351a4104a1203bd83df1
1010
refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rt/rust_box_annihilator.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include "rust_globals.h"
33
#include "rust_task.h"
44
#include "rust_shape.h"
5+
#include "rust_box_annihilator.h"
56

67
class annihilator : public shape::data<annihilator,shape::ptr> {
78
friend class shape::data<annihilator,shape::ptr>;
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#ifndef RUST_BOX_ANNIHILATOR_H
2+
#define RUST_BOX_ANNIHILATOR_H
3+
4+
#include "rust_task.h"
5+
6+
void
7+
annihilate_box(rust_task *task, rust_opaque_box *box);
8+
9+
void
10+
annihilate_boxes(rust_task *task);
11+
12+
#endif

branches/incoming/src/rt/rust_builtin.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include "sync/timer.h"
88
#include "rust_abi.h"
99
#include "rust_port.h"
10+
#include "rust_box_annihilator.h"
1011

1112
#include <time.h>
1213

@@ -740,6 +741,12 @@ rust_set_exit_status(intptr_t code) {
740741
task->kernel->set_exit_status((int)code);
741742
}
742743

744+
extern "C" CDECL void
745+
rust_annihilate_box(rust_opaque_box *ptr) {
746+
rust_task *task = rust_get_current_task();
747+
annihilate_box(task, ptr);
748+
}
749+
743750
extern void log_console_on();
744751

745752
extern "C" CDECL void

0 commit comments

Comments
 (0)