diff options
| author | Patrick Walton <[email protected]> | 2010-10-28 10:52:59 -0700 |
|---|---|---|
| committer | Patrick Walton <[email protected]> | 2010-10-28 10:52:59 -0700 |
| commit | 429964b4393bb96b59d56c5687dd55e23a51c850 (patch) | |
| tree | 6315b0e2de71df510087f7b840467dd2fb4ee6c0 /src | |
| parent | Emit a sensible error message if one or more of the parameters isn't enough c... (diff) | |
| parent | Cast NULL to uintptr_t when calling rust_task::start(). (diff) | |
| download | rust-429964b4393bb96b59d56c5687dd55e23a51c850.tar.xz rust-429964b4393bb96b59d56c5687dd55e23a51c850.zip | |
Merge branch 'gcc-4.5.1' of http://github.com/rillian/rust
Diffstat (limited to 'src')
| -rw-r--r-- | src/rt/test/rust_test_runtime.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rt/test/rust_test_runtime.cpp b/src/rt/test/rust_test_runtime.cpp index b10be5ed..1cde532e 100644 --- a/src/rt/test/rust_test_runtime.cpp +++ b/src/rt/test/rust_test_runtime.cpp @@ -54,7 +54,7 @@ rust_task_test::worker::run() { kernel->create_domain(crate, "test"); rust_dom *domain = handle->referent(); domain->root_task->start(crate->get_exit_task_glue(), - (uintptr_t)&task_entry, NULL, 0); + (uintptr_t)&task_entry, (uintptr_t)NULL, 0); domain->start_main_loop(); kernel->destroy_domain(domain); } |