Skip to content

Commit 0c4363e

Browse files
committed
---
yaml --- r: 34146 b: refs/heads/snap-stage3 c: 7f8e302 h: refs/heads/master v: v3
1 parent 5b75db9 commit 0c4363e

File tree

9 files changed

+12
-9
lines changed

9 files changed

+12
-9
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: 20ea37b3364b2903f3373a33e04921d145050de9
4+
refs/heads/snap-stage3: 7f8e302a6a46f175b2f8709b83900288f34164ed
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class boxed_region {
3939
// private and undefined to disable copying
4040
boxed_region(const boxed_region& rhs);
4141
boxed_region& operator=(const boxed_region& rhs);
42-
42+
4343
public:
4444
boxed_region(rust_env *e, memory_region *br)
4545
: env(e)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ circular_buffer : public kernel_owned<circular_buffer> {
3939
// private and undefined to disable copying
4040
circular_buffer(const circular_buffer& rhs);
4141
circular_buffer& operator=(const circular_buffer& rhs);
42-
42+
4343
private:
4444
size_t initial_size();
4545
void grow();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class memory_region {
7373
// private and undefined to disable copying
7474
memory_region(const memory_region& rhs);
7575
memory_region& operator=(const memory_region& rhs);
76-
76+
7777
public:
7878
memory_region(rust_env *env, bool synchronized);
7979
memory_region(memory_region *parent);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class rust_sched_launcher : public kernel_owned<rust_sched_launcher> {
2727
// private and undefined to disable copying
2828
rust_sched_launcher(const rust_sched_launcher& rhs);
2929
rust_sched_launcher& operator=(const rust_sched_launcher& rhs);
30-
30+
3131
protected:
3232
rust_sched_driver driver;
3333

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ struct rust_sched_loop
8686
// private and undefined to disable copying
8787
rust_sched_loop(const rust_sched_loop& rhs);
8888
rust_sched_loop& operator=(const rust_sched_loop& rhs);
89-
89+
9090
public:
9191
rust_kernel *kernel;
9292
rust_scheduler *sched;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class rust_scheduler : public kernel_owned<rust_scheduler> {
6262
// private and undefined to disable copying
6363
rust_scheduler(const rust_scheduler& rhs);
6464
rust_scheduler& operator=(const rust_scheduler& rhs);
65-
65+
6666
public:
6767
rust_scheduler(rust_kernel *kernel, size_t max_num_threads,
6868
rust_sched_id id, bool allow_exit, bool killed,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ rust_task : public kernel_owned<rust_task>
309309
// private and undefined to disable copying
310310
rust_task(const rust_task& rhs);
311311
rust_task& operator=(const rust_task& rhs);
312-
312+
313313
public:
314314

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

branches/snap-stage3/src/rt/util/array_list.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,10 @@ array_list<T>::push(T value) {
7373
size_t new_capacity = _capacity * 2;
7474
void* buffer = realloc(_data, new_capacity * sizeof(T));
7575
if (buffer == NULL) {
76-
fprintf(stderr, "array_list::push> Out of memory allocating %ld bytes", (long int) (new_capacity * sizeof(T)));
76+
fprintf(stderr,
77+
"array_list::push> "
78+
"Out of memory allocating %ld bytes",
79+
(long int) (new_capacity * sizeof(T)));
7780
abort();
7881
}
7982
_data = (T *) buffer;

0 commit comments

Comments
 (0)