Skip to content

Commit 9ad76f4

Browse files
committed
---
yaml --- r: 11619 b: refs/heads/master c: 3a4c96a h: refs/heads/master i: 11617: df64816 11615: 8061df7 v: v3
1 parent 3084fd7 commit 9ad76f4

File tree

4 files changed

+9
-12
lines changed

4 files changed

+9
-12
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: 5bf185b4995975a98bdf1855a0da01bb29ec202d
2+
refs/heads/master: 3a4c96a196b7b4578b3beec26df22975e2f1bb43
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rt/memory_region.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class memory_region {
6060
void *calloc(size_t size, const char *tag);
6161
void *realloc(void *mem, size_t size);
6262
void free(void *mem);
63-
virtual ~memory_region();
63+
~memory_region();
6464
};
6565

6666
inline void *operator new(size_t size, memory_region &region,

trunk/src/rt/rust_srv.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ rust_srv::rust_srv(rust_env *env) :
66
local_region(this, false) {
77
}
88

9-
rust_srv::~rust_srv() {}
10-
119
void
1210
rust_srv::free(void *p) {
1311
::free(p);

trunk/src/rt/rust_srv.h

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,22 @@ class rust_srv {
88
public:
99
rust_env *env;
1010
memory_region local_region;
11-
virtual void log(char const *msg);
12-
virtual void fatal(char const *expression,
11+
void log(char const *msg);
12+
void fatal(char const *expression,
1313
char const *file,
1414
size_t line,
1515
char const *format,
1616
...);
17-
virtual void warning(char const *expression,
17+
void warning(char const *expression,
1818
char const *file,
1919
size_t line,
2020
char const *format,
2121
...);
22-
virtual void free(void *);
23-
virtual void *malloc(size_t);
24-
virtual void *realloc(void *, size_t);
22+
void free(void *);
23+
void *malloc(size_t);
24+
void *realloc(void *, size_t);
2525
rust_srv(rust_env *);
26-
virtual ~rust_srv();
27-
virtual rust_srv *clone();
26+
rust_srv *clone();
2827
};
2928

3029
#endif /* RUST_SRV_H */

0 commit comments

Comments
 (0)