Skip to content

Commit 611bd2c

Browse files
jesse99brson
authored andcommitted
---
yaml --- r: 34141 b: refs/heads/snap-stage3 c: e8d2d55 h: refs/heads/master i: 34139: 166062b v: v3
1 parent 3effbe1 commit 611bd2c

File tree

9 files changed

+42
-1
lines changed

9 files changed

+42
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: eca23da98b7b0a9998ef2307a2ae63f30b1f955d
4+
refs/heads/snap-stage3: e8d2d559002d6f1cb0a12553674b9b0383224512
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/rt/boxed_region.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ class boxed_region {
3535
return v;
3636
}
3737

38+
private:
39+
// private and undefined to disable copying
40+
boxed_region(const boxed_region& rhs);
41+
boxed_region& operator=(const boxed_region& rhs);
42+
3843
public:
3944
boxed_region(rust_env *e, memory_region *br)
4045
: env(e)

branches/snap-stage3/src/rt/circular_buffer.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ circular_buffer : public kernel_owned<circular_buffer> {
3535
bool is_empty();
3636
size_t size();
3737

38+
private:
39+
// private and undefined to disable copying
40+
circular_buffer(const circular_buffer& rhs);
41+
circular_buffer& operator=(const circular_buffer& rhs);
42+
3843
private:
3944
size_t initial_size();
4045
void grow();

branches/snap-stage3/src/rt/memory_region.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ class memory_region {
6969
void release_alloc(void *mem);
7070
void claim_alloc(void *mem);
7171

72+
private:
73+
// private and undefined to disable copying
74+
memory_region(const memory_region& rhs);
75+
memory_region& operator=(const memory_region& rhs);
76+
7277
public:
7378
memory_region(rust_env *env, bool synchronized);
7479
memory_region(memory_region *parent);

branches/snap-stage3/src/rt/rust_sched_launcher.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ class rust_sched_launcher : public kernel_owned<rust_sched_launcher> {
2323
private:
2424
rust_sched_loop sched_loop;
2525

26+
private:
27+
// private and undefined to disable copying
28+
rust_sched_launcher(const rust_sched_launcher& rhs);
29+
rust_sched_launcher& operator=(const rust_sched_launcher& rhs);
30+
2631
protected:
2732
rust_sched_driver driver;
2833

branches/snap-stage3/src/rt/rust_sched_loop.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,11 @@ struct rust_sched_loop
8282

8383
void pump_loop();
8484

85+
private:
86+
// private and undefined to disable copying
87+
rust_sched_loop(const rust_sched_loop& rhs);
88+
rust_sched_loop& operator=(const rust_sched_loop& rhs);
89+
8590
public:
8691
rust_kernel *kernel;
8792
rust_scheduler *sched;

branches/snap-stage3/src/rt/rust_scheduler.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ class rust_scheduler : public kernel_owned<rust_scheduler> {
5858
// Called when refcount reaches zero
5959
void delete_this();
6060

61+
private:
62+
// private and undefined to disable copying
63+
rust_scheduler(const rust_scheduler& rhs);
64+
rust_scheduler& operator=(const rust_scheduler& rhs);
65+
6166
public:
6267
rust_scheduler(rust_kernel *kernel, size_t max_num_threads,
6368
rust_sched_id id, bool allow_exit, bool killed,

branches/snap-stage3/src/rt/rust_signal.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ class rust_signal {
1616
public:
1717
virtual void signal() = 0;
1818
virtual ~rust_signal() {}
19+
rust_signal() {}
20+
21+
private:
22+
// private and undefined to disable copying
23+
rust_signal(const rust_signal& rhs);
24+
rust_signal& operator=(const rust_signal& rhs);
1925
};
2026

2127
#endif /* RUST_SIGNAL_H */

branches/snap-stage3/src/rt/rust_task.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,11 @@ rust_task : public kernel_owned<rust_task>
305305
void wakeup_inner(rust_cond *from);
306306
bool blocked_on(rust_cond *cond);
307307

308+
private:
309+
// private and undefined to disable copying
310+
rust_task(const rust_task& rhs);
311+
rust_task& operator=(const rust_task& rhs);
312+
308313
public:
309314

310315
// Only a pointer to 'name' is kept, so it must live as long as this task.

0 commit comments

Comments
 (0)